Merge pull request #51 from Axway-API-Management-Plus/develop

Prepare to release 1.2.1

Author: Chris Wiechmann

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

@@ -51,6 +51,7 @@
 import com.axway.apim.api.model.APIQuota;
 import com.axway.apim.api.model.Image;
 import com.axway.apim.api.model.Organization;
+import com.axway.apim.api.model.OutboundProfile;
 import com.axway.apim.api.model.Profile;
 import com.axway.apim.api.model.QuotaRestriction;
 import com.axway.apim.api.model.apps.ClientApplication;
@@ -352,9 +353,15 @@ private <ProfileType> void _translateMethodIds(Map<String, ProfileType> profiles
 				}
 				ProfileType profileWithType = profiles.get(key);
 				Profile profile = (Profile)profileWithType;
-				profile.setApiMethodId(method.getId());
-				profile.setApiMethodName(method.getName());
-				profile.setApiId(method.getVirtualizedApiId());
+				if(profile instanceof OutboundProfile) {
+					profile.setApiMethodId(method.getApiMethodId());
+					profile.setApiMethodName(method.getName());
+					profile.setApiId(method.getApiId());
+				} else {
+					profile.setApiMethodId(method.getId());
+					profile.setApiMethodName(method.getName());
+					profile.setApiId(method.getVirtualizedApiId());
+				}
 				if(mode==METHOD_TRANSLATION.AS_NAME) {
 					updatedEntries.put(method.getName(), profileWithType);
 				} else {

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

@@ -51,8 +51,8 @@ public void testTranslateMethodToName() throws AppException, IOException {
 		Map<String, OutboundProfile> outboundProfiles = api.getOutboundProfiles();
 		Assert.assertNotNull(outboundProfiles.get("_default"), "Expected to find default outbound profile");
 		Assert.assertNotNull(outboundProfiles.get("deletePet").getApiMethodId(), "deletePet");
-		Assert.assertEquals(outboundProfiles.get("deletePet").getApiId(), "72745ed9-f75b-428c-959c-b483eea497a1");
-		Assert.assertEquals(outboundProfiles.get("deletePet").getApiMethodId(), "132712e4-c132-4298-bfa0-f6f5c811ad65");
+		Assert.assertEquals(outboundProfiles.get("deletePet").getApiId(), "10f02b84-fa4a-4cb6-a0c9-da6974c77005");
+		Assert.assertEquals(outboundProfiles.get("deletePet").getApiMethodId(), "db89e373-f678-4990-88ca-891e434c34db");
 		Assert.assertEquals(outboundProfiles.get("deletePet").getApiMethodName(), "deletePet");
 
 		Assert.assertEquals(api.getInboundProfiles().size(), 2);

modules/apis/src/test/java/com/axway/apim/test/methodLevel/OutboundMethodLevelTestIT.java

@@ -45,15 +45,19 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 			.validate("$.[?(@.path=='${apiPath}')].name", "${apiName}")
 			.validate("$.[?(@.path=='${apiPath}')].state", "${state}")
 			.validate("$.[?(@.path=='${apiPath}')].authenticationProfiles[?(@.name=='${outboundProfileName}')].type", "http_basic")
-			.extractFromPayload("$.[?(@.path=='${apiPath}')].id", "apiId"));
+			.extractFromPayload("$.[?(@.path=='${apiPath}')].id", "apiId")
+			.extractFromPayload("$.[?(@.path=='${apiPath}')].apiId", "backendApiId")
+			);
 
 		http(builder -> builder.client("apiManager").send().get("/proxies/${apiId}/operations").header("Content-Type", "application/json"));
 		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
 				.extractFromPayload("$.[?(@.name=='getOrderById')].id", "apiMethodId"));
 
 		http(builder -> builder.client("apiManager").send().get("/proxies/${apiId}").header("Content-Type", "application/json"));
 		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
-			.validate("$.[?(@.id=='${apiId}')].outboundProfiles.${apiMethodId}.authenticationProfile", "${outboundProfileName}"));
+			.validate("$.[?(@.id=='${apiId}')].outboundProfiles.${apiMethodId}.authenticationProfile", "${outboundProfileName}")
+			.validate("$.[?(@.id=='${apiId}')].outboundProfiles.${apiMethodId}.apiId", "${backendApiId}")
+			);
 
 		echo("####### Perform a No-Change #######");		
 		createVariable(ImportTestAction.API_DEFINITION,  "/com/axway/apim/test/files/basic/petstore.json");