Error-Handling improved

if Custom-Property configuration is invalid.

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/lib/CoreParameters.java

@@ -82,7 +82,7 @@ public static Mode valueOfDefault(String key) {
 
 	private Boolean replaceHostInSwagger = true;
 
-	private Boolean rollback = false;
+	private Boolean rollback = true;
 
 	private String confDir;
 
@@ -280,11 +280,12 @@ public void setReplaceHostInSwagger(Boolean replaceHostInSwagger) {
 		this.replaceHostInSwagger = replaceHostInSwagger;
 	}
 
-	public boolean isRollback() {
+	public Boolean isRollback() {
 		return rollback;
 	}
 
-	public void setRollback(boolean rollback) {
+	public void setRollback(Boolean rollback) {
+		if(rollback==null) return;
 		this.rollback = rollback;
 	}
 

modules/apis/src/main/java/com/axway/apim/apiimport/APIImportConfigAdapter.java

@@ -533,15 +533,19 @@ private void validateCustomProperties(API apiConfig) throws AppException {
 				if(propType!=null && ( propType.asText().equals("select") || propType.asText().equals("switch") )) {
 					boolean valueFound = false;
 					ArrayNode selectOptions = (ArrayNode)configuredProp.get("options");
+					if(selectOptions==null) {
+						LOG.warn("Skipping custom property validation, as the custom-property: '" + propertyKey + "' with type: " + propType.asText() + " has no options configured. Please check your custom properties configuration.");
+						break;
+					}
 					for(JsonNode option : selectOptions) {
 						if(option.at("/value").asText().equals(propertyValue)) {
 							valueFound = true;
 							break;
 						}
 					}
 					if(!valueFound) {
-						ErrorState.getInstance().setError("The value: '" + propertyValue + "' isn't configured for custom property: '" + propertyKey + "'", ErrorCode.CANT_READ_CONFIG_FILE, false);
-						throw new AppException("The value: '" + propertyValue + "' isn't configured for custom property: '" + propertyKey + "'", ErrorCode.CANT_READ_CONFIG_FILE);
+						ErrorState.getInstance().setError("The value: '" + propertyValue + "' is not a valid option for custom property: '" + propertyKey + "'", ErrorCode.CANT_READ_CONFIG_FILE, false);
+						throw new AppException("The value: '" + propertyValue + "' is not a valid option for custom property: '" + propertyKey + "'", ErrorCode.CANT_READ_CONFIG_FILE);
 					}
 				}
 			}