Fixing the way config fields are ignored

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerConfigAdapter.java

@@ -49,14 +49,14 @@ public APIManagerConfigAdapter() {}
 
 
 	/**
-	 * Config fields that are introduced with a certain API-Manager version. 
+	 * Config fields that were introduced with a certain API-Manager version. 
 	 * This list is mainly used to filter out fields, when using an older API-Manager version.
 	 */
 	protected static enum ConfigFields {
-		version77 ("7.7.0", new String[] {"userNameRegex", "apiImportTimeout", "apiImportMimeValidation", "apiImportEditable", "lockUserAccount" }),
-		version762 ("7.6.2", new String[] {
-				"changePasswordOnFirstLogin", "passwordExpiryEnabled", "passwordLifetimeDays", "applicationScopeRestrictions", "strictCertificateChecking", 
-				"serverCertificateVerification", "advisoryBannerEnabled", "advisoryBannerText"
+		version7720200130 ("7.7.20200130", new String[] {"apiImportTimeout", "apiImportMimeValidation", "apiImportEditable", "lockUserAccount" }),
+		version77 ("7.7.0", new String[] {
+				"userNameRegex", "changePasswordOnFirstLogin", "passwordExpiryEnabled", "passwordLifetimeDays",  
+				"applicationScopeRestrictions", "strictCertificateChecking", "serverCertificateVerification", "advisoryBannerEnabled", "advisoryBannerText"
 				});
 
 		private String[] ignoreFields;

modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerConfigAdapterTest.java

@@ -15,10 +15,22 @@ public void testCorrectFieldsAreIgnored() {
 		Assert.assertNotNull(ignoreFields);
 		Assert.assertEquals(ignoreFields.length, 0);
 
+		APIManagerAdapter.apiManagerVersion = "7.7.20200730";
+		ignoreFields = APIManagerConfigAdapter.ConfigFields.getIgnoredFields();
+		// Same for July, as fields have been added in January release
+		Assert.assertNotNull(ignoreFields);
+		Assert.assertEquals(ignoreFields.length, 0);
+		
+		APIManagerAdapter.apiManagerVersion = "7.7.0";
+		ignoreFields = APIManagerConfigAdapter.ConfigFields.getIgnoredFields();
+		// 7.7.0 plain already supports some new settings
+		Assert.assertNotNull(ignoreFields);
+		Assert.assertEquals(ignoreFields.length, 4); // Only brand new fields are returned to be ignored
+		
 		APIManagerAdapter.apiManagerVersion = "7.6.2";
 		ignoreFields = APIManagerConfigAdapter.ConfigFields.getIgnoredFields();
 		Assert.assertNotNull(ignoreFields);
-		// Five config fields, based on all known fields are not supported by an API-Manager 7.6.2
-		Assert.assertEquals(ignoreFields.length, 5);
+		// 7.6.2 doesn't support all of the new fields
+		Assert.assertEquals(ignoreFields.length, 13);
 	}
 }