Merge branch 'master' of https://github.com/wso2/product-microgateway …

…into fix_etcd_issue
wso2 · Apr 29, 2019 · 8117719 · 8117719
2 parents 5f613ea + 000fdd6
commit 8117719
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ts/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/codegen/CodeGenerator.java b/...ts/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/codegen/CodeGenerator.java
@@ -77,17 +77,17 @@ public void generate(String projectName, List<ExtendedAPI> apis, boolean overwri
             OpenAPICodegenUtils.setAdditionalConfig(api);
             BallerinaService ballerinaService = new BallerinaService();
             ballerinaService.setIsDevFirst(false);
+            definitionContext = ballerinaService.buildContext(openApi, api);
             // we need to generate the bal service for default versioned apis as well
             if (api.getIsDefaultVersion()) {
-                BallerinaService defaultDefinitionContext = ballerinaService.buildContext(openApi, api);
-                defaultDefinitionContext.setQualifiedServiceName(CodegenUtils.trim(api.getName()));
-                genFiles.add(generateService(defaultDefinitionContext));
+                definitionContext.setQualifiedServiceName(CodegenUtils.trim(api.getName()));
+                genFiles.add(generateService(definitionContext));
                 // without building the definitionContext again we use the same context to build default version as
                 // well. Hence setting the default version as false to generate the api with base path having version.
                 api.setIsDefaultVersion(false);
                 OpenAPICodegenUtils.setAdditionalConfig(api);
+                definitionContext.setQualifiedServiceName(CodegenUtils.trim(api.getName() + "_" + api.getVersion()));
             }
-            definitionContext = ballerinaService.buildContext(openApi, api);
             serviceList.add(definitionContext);
             genFiles.add(generateService(definitionContext));
             genFiles.add(generateSwagger(definitionContext));

diff --git a/...icro-gateway-core/src/main/ballerina/gateway/services/token_revocation_event_listener.bal b/...icro-gateway-core/src/main/ballerina/gateway/services/token_revocation_event_listener.bal
@@ -27,7 +27,7 @@ string jmsConnectionProviderUrlTokenRevocation = getConfigValue(REALTIME_MESSAGE
     "amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5672'");
 string jmsConnectionPasswordTokenRevocation = getConfigValue(REALTIME_MESSAGE_INSTANCE_ID, REALTIME_JMS_CONNECTION_PASSWORD, "");
 string jmsConnectionUsernameTokenRevocation = getConfigValue(REALTIME_MESSAGE_INSTANCE_ID, REALTIME_JMS_CONNECTION_USERNAME, "");
-string tokenRevocationJMSTopic = getConfigValue(REALTIME_MESSAGE_INSTANCE_ID, REALTIME_JMS_CONNECTION_TOPIC, "tokenRevocation");
+string tokenRevocationJMSTopic = getConfigValue(REALTIME_MESSAGE_INSTANCE_ID, REALTIME_JMS_CONNECTION_TOPIC, "jwtRevocation");
 
 service jmsTokenRevocationListener =
 service {