Change gateway configuration for setting supported modes

Author: tharikaGitHub

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/GatewayAgentConfiguration.java

@@ -76,4 +76,10 @@ public interface GatewayAgentConfiguration {
      * @return String default hostname template
      */
     String getDefaultHostnameTemplate();
+
+    /**
+     * This method returns the supported gateway modes for a given gateway type
+     * @return List of supported gateway modes
+     */
+    List<String> getSupportedModes();
 }

components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/SettingsMappingUtil.java

@@ -168,7 +168,14 @@ private static List<SettingsGatewayConfigurationDTO> getSettingsGatewayConfigura
             settingsFederatedGatewayConfigurationDTO.setType(gatewayConfiguration.getType());
             settingsFederatedGatewayConfigurationDTO.setDisplayName(gatewayConfiguration.getType());
             settingsFederatedGatewayConfigurationDTO.setDefaultHostnameTemplate(gatewayConfiguration.getDefaultHostnameTemplate());
-            settingsFederatedGatewayConfigurationDTO.setSupportedModes(getSupportedGatewayModes(gatewayConfiguration));
+            List<String> supportedModes = gatewayConfiguration.getSupportedModes();
+            if (supportedModes.isEmpty()) {
+                log.warn(String.format(
+                        "No supported modes derived for gateway type '%s'. Defaulting to '%s'",
+                        gatewayConfiguration.getType(), GatewayMode.WRITE_ONLY.getMode()));
+                supportedModes.add(GatewayMode.WRITE_ONLY.getMode());
+            }
+            settingsFederatedGatewayConfigurationDTO.setSupportedModes(gatewayConfiguration.getSupportedModes());
             List<ConfigurationDto> connectionConfigurations = gatewayConfiguration.getConnectionConfigurations();
             if (connectionConfigurations != null) {
                 for (ConfigurationDto dto : connectionConfigurations) {
@@ -200,28 +207,6 @@ private static List<SettingsGatewayConfigurationDTO> getSettingsGatewayConfigura
         return list;
     }
 
-    private static List<String> getSupportedGatewayModes(GatewayAgentConfiguration gatewayConfiguration) {
-        //Deriving the supported modes from the gateway connector
-        List<String> supportedModes = new ArrayList<>();
-        if (gatewayConfiguration.getGatewayDeployerImplementation() != null
-                && !gatewayConfiguration.getGatewayDeployerImplementation().trim().isEmpty()) {
-            supportedModes.add(GatewayMode.WRITE_ONLY.getMode());
-        }
-        if (gatewayConfiguration.getDiscoveryImplementation() != null
-                && !gatewayConfiguration.getDiscoveryImplementation().trim().isEmpty()) {
-            supportedModes.add(GatewayMode.READ_ONLY.getMode());
-        }
-        if (supportedModes.size() == 2) {
-            supportedModes.add(GatewayMode.READ_WRITE.getMode());
-        }
-        if (supportedModes.isEmpty()) {
-            log.warn(String.format(
-                    "No supported modes derived for gateway connector type '%s'.",
-                    gatewayConfiguration.getType()));
-        }
-        return supportedModes;
-    }
-
     private static GatewayConfigurationDTO fromConfigurationToConfigurationDTO(ConfigurationDto configuration) {
         GatewayConfigurationDTO dto = new GatewayConfigurationDTO();
         dto.setName(configuration.getName());