Merge pull request #13584 from AnuGayan/master-stage1

Remove unused synapse APIs
wso2 · Oct 22, 2024 · 51730c9 · 51730c9
2 parents 45dc9c6 + 08c4049
commit 51730c9
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 48 deletions.
diff --git a/modules/distribution/product/src/main/conf/log4j2.properties b/modules/distribution/product/src/main/conf/log4j2.properties
@@ -493,5 +493,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER
diff --git a/modules/distribution/product/src/main/conf/synapse-configs/default/api/_OpenService_.xml b/modules/distribution/product/src/main/conf/synapse-configs/default/api/_OpenService_.xml
diff --git a/...-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java b/...-extensions/src/main/java/org/wso2/am/framework/extensions/APIMCarbonServerExtension.java
@@ -35,6 +35,7 @@
 import org.wso2.carbon.integration.common.utils.FileManager;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import javax.xml.xpath.XPathExpressionException;
 
@@ -116,6 +117,12 @@ public void configureServer() throws AutomationFrameworkException {
                                     + "deployment" + File.separator + "server" + File.separator + "synapse-configs"
                                     + File.separator + "default" + File.separator + "api";
 
+                    try {
+                        FileManager.readFile(synapseApiPath);
+                    } catch (FileNotFoundException e) {
+                        new File(synapseApiPath).mkdirs();
+                    }
+
                     FileManager.copyFile(new File(
                             resourcePath + File.separator + "synapseconfigs" + File.separator + "rest" + File.separator
                                     + "BackEndSecurity.xml"), synapseApiPath + File.separator + "BackEndSecurity.xml");

diff --git a/...-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java b/...-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java
@@ -169,6 +169,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiID);
         userManagementClient.deleteUser(newUser);
-        super.cleanUp();
     }
 }
diff --git a/...ion/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java b/...ion/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java
@@ -239,7 +239,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
 
-        super.cleanUp();
     }
 
 }
diff --git a/...org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java b/...org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java
@@ -118,6 +118,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/...rg/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java b/...rg/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java
@@ -131,7 +131,6 @@ public void testAPIPublishing() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 

diff --git a/...rc/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java b/...rc/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java
@@ -486,7 +486,6 @@ public void cleanUpArtifacts() throws Exception {
         deleteAPI(apiVisibilityByRoleId, apiPublisherClientCarbonSuperAdmin);
         userManagementClient1.deleteUser(CARBON_SUPER_SUBSCRIBER_USERNAME);
         userManagementClient2.deleteUser(TENANT_SUBSCRIBER_USERNAME);
-        super.cleanUp();
     }
 
 }
diff --git a/.../src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java b/.../src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java
@@ -18,7 +18,6 @@
 
 package org.wso2.am.integration.tests.api.revision;
 
-import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -28,7 +27,6 @@
 import org.testng.annotations.Test;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIDTO;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIProductDTO;
-import org.wso2.am.integration.clients.publisher.api.v1.dto.APIRevisionListDTO;
 import org.wso2.am.integration.test.Constants;
 import org.wso2.am.integration.test.impl.ApiProductTestHelper;
 import org.wso2.am.integration.test.impl.ApiTestHelper;
@@ -55,6 +53,7 @@ public class APIProductRevisionTestCase extends APIMIntegrationBaseTest {
     private ApiProductTestHelper apiProductTestHelper;
     protected static final String TIER_UNLIMITED = "Unlimited";
     protected static final String TIER_GOLD = "Gold";
+    List<APIDTO> apisToBeUsed = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void setEnvironment() throws Exception {
@@ -68,7 +67,6 @@ public void setEnvironment() throws Exception {
     @Test(groups = {"wso2.am"}, description = "API Product Revision create test case")
     public void testAddingAPIProductRevision() throws Exception {
         // Pre-Conditions : Create APIs
-        List<APIDTO> apisToBeUsed = new ArrayList<>();
 
         apisToBeUsed.add(apiTestHelper.
                 createApiOne(getBackendEndServiceEndPointHttp("wildcard/resources")));
@@ -105,7 +103,7 @@ public void testAddingAPIProductRevision() throws Exception {
     @Test(groups = {"wso2.am"}, description = "Check the availability of API Product Revision in publisher before deploying.",
             dependsOnMethods = "testAddingAPIProductRevision")
     public void testGetAPIProductRevisions() throws Exception {
-        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId,null);
+        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId, null);
         assertEquals(apiRevisionsGetResponse.getResponseCode(), HTTP_RESPONSE_CODE_OK,
                 "Unable to retrieve revisions" + apiRevisionsGetResponse.getData());
         List<JSONObject> revisionList = new ArrayList<>();
@@ -115,7 +113,7 @@ public void testGetAPIProductRevisions() throws Exception {
         for (int i = 0, l = arrayList.length(); i < l; i++) {
             revisionList.add(arrayList.getJSONObject(i));
         }
-        for (JSONObject revision :revisionList) {
+        for (JSONObject revision : revisionList) {
             revisionUUID = revision.getString("id");
         }
         assertNotNull(revisionUUID, "Unable to retrieve revision UUID");
@@ -131,7 +129,7 @@ public void testDeployAPIProductRevisions() throws Exception {
         apiRevisionDeployRequest.setDisplayOnDevportal(true);
         apiRevisionDeployRequestList.add(apiRevisionDeployRequest);
         HttpResponse apiRevisionsDeployResponse = restAPIPublisher.deployAPIProductRevision(apiId, revisionUUID,
-                apiRevisionDeployRequestList,"APIProduct");
+                apiRevisionDeployRequestList, "APIProduct");
         assertEquals(apiRevisionsDeployResponse.getResponseCode(), HTTP_RESPONSE_CODE_CREATED,
                 "Unable to deploy API Product Revisions:" + apiRevisionsDeployResponse.getData());
     }
@@ -174,6 +172,9 @@ public void testDeleteAPIProductRevision() throws Exception {
 
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
-        super.cleanUp();
+        restAPIPublisher.deleteAPI(apiId);
+        for (APIDTO api : apisToBeUsed) {
+            restAPIPublisher.deleteAPI(api.getId());
+        }
     }
 }
diff --git a/...c/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java b/...c/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java
@@ -163,7 +163,6 @@ public void testApplicationUpdateValidIpAsCallBackURL() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         apiStore.removeApplication(appName);
-        super.cleanUp();
     }
 
     @DataProvider

diff --git a/...rg/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java b/...rg/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java
@@ -98,7 +98,6 @@ public void testRegenerateConsumerSecret() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
-        super.cleanUp();
     }
 
     @DataProvider

diff --git a/...va/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java b/...va/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java
@@ -144,12 +144,6 @@ public void testAPIKeyRevocationBySharedUser()
         restAPIStoreClientUser2.revokeAPIKey(userOneSharedApplicationId, key.getApikey());
     }
 
-    @AfterClass(alwaysRun = true)
-    public void destroy() throws Exception {
-        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
-        super.cleanUp();
-    }
-
     private void createUsersAndApplications() throws Exception {
         //signup of user one
         UserManagementUtils.signupUser(USER_ONE, PASSWORD, FIRST_NAME, ORGANIZATION);
@@ -176,4 +170,9 @@ private void createUsersAndApplications() throws Exception {
                 ApplicationDTO.TokenTypeEnum.JWT, groups);
         userOneSharedApplicationId = appCreationResponse3.getData();
     }
+
+    @AfterClass(alwaysRun = true)
+    public void destroy() throws Exception {
+        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
+    }
 }
diff --git a/...ts-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java b/...ts-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java
@@ -659,6 +659,5 @@ public void testVerifyPublisherAdminDeleteCommentTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/...rg/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java b/...rg/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java
@@ -166,6 +166,5 @@ private String apiContextResolver(String context, String version) {
     public void destroy() throws Exception {
         restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition1ID);
         restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition2ID);
-        super.cleanUp();
     }
 }
diff --git a/.../tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties b/.../tests-backend/src/test/resources/artifacts/AM/configFiles/ElkAnalytics/log4j2.properties
@@ -493,5 +493,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER
diff --git a/...backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties b/...backend/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties
@@ -497,5 +497,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER
diff --git a/...end/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old b/...end/src/test/resources/artifacts/AM/configFiles/logAnalyticsEnabled/log4j2.properties.old
@@ -452,5 +452,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER
diff --git a/...integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties b/...integration/tests-backend/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties
@@ -476,5 +476,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER
diff --git a/...integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties b/...integration/tests-restart/src/test/resources/artifacts/AM/lifecycletest/log4j2.properties
@@ -476,5 +476,3 @@ logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.name = org.
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.level = INFO
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.appenderRef.BOTDATA_APPENDER.ref = BOTDATA_APPENDER
 logger.org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator.additivity = false
-
-category.SERVICE_APPENDER._OpenService_ = TRACE_APPENDER, BOTDATA_APPENDER