Merge branch 'develop' into test-with-7.7-20200130

Author: Chris Wiechmann

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

@@ -8,6 +8,7 @@
 import com.axway.apim.apiimport.actions.CreateNewAPI;
 import com.axway.apim.apiimport.actions.RecreateToUpdateAPI;
 import com.axway.apim.apiimport.actions.UpdateExistingAPI;
+import com.axway.apim.apiimport.lib.APIImportParams;
 import com.axway.apim.lib.APIPropertiesExport;
 import com.axway.apim.lib.CommandParameters;
 import com.axway.apim.lib.errorHandling.AppException;
@@ -29,7 +30,7 @@ public class APIImportManager {
 	 * @throws AppException is the desired state can't be replicated into the API-Manager.
 	 */
 	public void applyChanges(APIChangeState changeState) throws AppException {
-		CommandParameters commands = CommandParameters.getInstance();
+		APIImportParams commands = APIImportParams.getInstance();
 		if(!APIManagerAdapter.hasAdminAccount() && changeState.isAdminAccountNeeded() ) {
 			if(commands.allowOrgAdminsToPublish()) {
 				LOG.debug("Desired API-State set to published using OrgAdmin account only. Going to create a publish request. "
@@ -47,6 +48,10 @@ public void applyChanges(APIChangeState changeState) throws AppException {
 			CreateNewAPI createAPI = new CreateNewAPI();
 			createAPI.execute(changeState, false);
 		// Otherwise an existing API exists
+		} else if(commands.isForceUpdate()) {
+			LOG.info("Re-Creating API as the ForceUpdate flag is set");
+			RecreateToUpdateAPI recreate = new RecreateToUpdateAPI();
+			recreate.execute(changeState);
 		} else {
 			if(!changeState.hasAnyChanges()) {
 				APIPropertiesExport.getInstance().setProperty("feApiId", changeState.getActualAPI().getId());

modules/apis/src/main/java/com/axway/apim/apiimport/lib/APIImportCLIOptions.java

@@ -69,6 +69,10 @@ public APIImportCLIOptions(String[] args) throws ParseException {
 		option.setRequired(false);
 		option.setArgName("APIDetails.properties");
 		options.addOption(option);
+		
+		option = new Option("forceUpdate", "If set, the API is Re-Created even if the Desired- and Actual-State are equal.");
+		option.setRequired(false);
+		options.addOption(option);
 	}
 
 	@Override

modules/apis/src/main/java/com/axway/apim/apiimport/lib/APIImportParams.java

@@ -26,4 +26,13 @@ public boolean isUseFEAPIDefinition() {
 		if(getValue("useFEAPIDefinition")==null) return false;
 		return Boolean.parseBoolean(getValue("useFEAPIDefinition"));
 	}
+	
+	public boolean isForceUpdate() {
+		try {
+			if(hasOption("forceUpdate")) {
+				return true;
+			} 
+		} catch (Exception ignore) {}
+		return false;
+	}
 }

modules/apis/src/test/java/com/axway/apim/test/organizations/IgnoreClientOrgsTestIT.java

@@ -21,8 +21,8 @@ public void run() {
 		description("This test makes sure, no organizations have been granted permission.");
 
 		variable("apiNumber", RandomNumberFunction.getRandomNumber(3, true));
-		variable("apiPath", "/grant_invalid_org-api-${apiNumber}");
-		variable("apiName", "Grant to invalid orgs API-${apiNumber}");
+		variable("apiPath", "/ignore_client_orgs-api-${apiNumber}");
+		variable("apiName", "Ignore Client orgs API-${apiNumber}");
 
 		variable("testOrgName", "Org without permission ${apiNumber}");