[3.2.x] Add support for APIs with APIM 4.x versions

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/cmd/ImportCmd.java

@@ -114,6 +114,8 @@ public class ImportCmd implements LauncherCmd {
     private boolean isOverwriteRequired;
     private String restVersion;
     private String dcrVersion;
+    private String apimVersion;
+    private Boolean apim4xVersion;
 
     @Override
     public void execute() {
@@ -139,6 +141,10 @@ public void execute() {
         Config config = CmdUtils.getConfig();
         isOverwriteRequired = false;
 
+        //setup endpoints
+        Token configToken = config.getToken();
+        TokenBuilder configTokenValues = setEndpoints(configToken);
+
         validateAPIGetRequestParams(label, apiName, version);
         //Setup username
         String configuredUser = config.getToken().getUsername();
@@ -168,10 +174,6 @@ public void execute() {
             }
         }
 
-        //setup endpoints
-        Token configToken = config.getToken();
-        TokenBuilder configTokenValues = setEndpoints(configToken);
-
         //configure trust store
         String configuredTrustStore = config.getToken().getTrustStoreLocation();
         if (StringUtils.isEmpty(configuredTrustStore)) {
@@ -256,12 +258,16 @@ public void execute() {
 
         List<ExtendedAPI> apis = new ArrayList<>();
         RESTAPIService service = new RESTAPIServiceImpl(publisherEndpoint, adminEndpoint, restVersion, isInsecure);
-        if (label != null) {
-            apis = service.getAPIs(label, accessToken);
+        if (apim4xVersion) {
+            apis = service.exportAPIs(apiName, version, label, accessToken, projectName);
         } else {
-            ExtendedAPI api = service.getAPI(apiName, version, accessToken);
-            if (api != null) {
-                apis.add(api);
+            if (label != null) {
+                apis = service.getAPIs(label, accessToken);
+            } else {
+                ExtendedAPI api = service.getAPI(apiName, version, accessToken);
+                if (api != null) {
+                    apis.add(api);
+                }
             }
         }
 
@@ -278,7 +284,7 @@ public void execute() {
         //delete the folder if an exception is thrown in following steps
         try {
             CmdUtils.saveSwaggerDefinitionForMultipleAPIs(projectName, apis,
-                    !restVersion.startsWith(CliConstants.REST_API_V1_PREFIX));
+                    !restVersion.startsWith(CliConstants.REST_API_V1_PREFIX) && !apim4xVersion);
         } catch (Exception e) {
             throw new CLIInternalException("Exception occurred during codeGeneration process", e);
         }
@@ -297,6 +303,7 @@ public void execute() {
                     .setClientSecret(encryptedCS)
                     .setTrustStoreLocation(trustStoreLocation)
                     .setTrustStorePassword(encryptedTrustStorePass)
+                    .setApimVersion(apimVersion)
                     .build();
             newConfig.setToken(token);
             newConfig.setCorsConfiguration(config.getCorsConfiguration());
@@ -348,12 +355,24 @@ private static void init(String configPath) {
      * @param version API version
      */
     private void validateAPIGetRequestParams(String label, String apiName, String version) {
-        if ((StringUtils.isEmpty(label) && (StringUtils.isEmpty(apiName) || StringUtils.isEmpty(version))) ||
-                StringUtils.isNotEmpty(label) && (StringUtils.isNotEmpty(apiName) || StringUtils.isNotEmpty(version)) ||
-                (StringUtils.isEmpty(apiName) && StringUtils.isNotEmpty(version)) ||
-                (StringUtils.isNotEmpty(apiName) && StringUtils.isEmpty(version))) {
-            throw CmdUtils.createUsageException(
-                    "Missing \"-l <label>\" or \"-a <api-name> -v <version>\" parameters");
+        if (apim4xVersion) {
+            if (StringUtils.isEmpty(label)) {
+                throw CmdUtils.createUsageException(
+                        "Missing \"-l <label>\" parameter");
+            } else if (StringUtils.isNotEmpty(apiName) && StringUtils.isEmpty(version)) {
+                throw CmdUtils.createUsageException("Missing \"-v <version>\" parameter");
+            } else if (StringUtils.isNotEmpty(version) && StringUtils.isEmpty(apiName)) {
+                throw CmdUtils.createUsageException("Missing \"-a <api-name>\" parameter");
+            }
+        } else {
+            if ((StringUtils.isEmpty(label) && (StringUtils.isEmpty(apiName) || StringUtils.isEmpty(version))) ||
+                    StringUtils.isNotEmpty(label) && (StringUtils.isNotEmpty(apiName) ||
+                            StringUtils.isNotEmpty(version)) || (StringUtils.isEmpty(apiName) &&
+                    StringUtils.isNotEmpty(version)) || (StringUtils.isNotEmpty(apiName) &&
+                    StringUtils.isEmpty(version))) {
+                throw CmdUtils.createUsageException(
+                        "Missing \"-l <label>\" or \"-a <api-name> -v <version>\" parameters");
+            }
         }
     }
 
@@ -377,6 +396,8 @@ private TokenBuilder setEndpoints(Token token) {
         adminEndpoint = token.getAdminEndpoint();
         registrationEndpoint = token.getRegistrationEndpoint();
         tokenEndpoint = token.getTokenEndpoint();
+        apimVersion = token.getApimVersion();
+        apim4xVersion = token.isApim4xVersion();
 
         //copy current token config values
         configTokenValues.setPublisherEndpoint(publisherEndpoint);
@@ -386,6 +407,7 @@ private TokenBuilder setEndpoints(Token token) {
         configTokenValues.setRestVersion(restVersion);
         configTokenValues.setDCRVersion(dcrVersion);
         configTokenValues.setBaseURL(token.getBaseURL());
+        configTokenValues.setApimVersion(apimVersion);
 
         isEndPointsNeeded = StringUtils.isEmpty(publisherEndpoint) || StringUtils.isEmpty(adminEndpoint) || StringUtils
                 .isEmpty(registrationEndpoint) || StringUtils.isEmpty(tokenEndpoint);

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/codegen/CodeGenerator.java

@@ -33,6 +33,7 @@
 import org.wso2.apimgt.gateway.cli.exception.CLIRuntimeException;
 import org.wso2.apimgt.gateway.cli.model.config.CodeGen;
 import org.wso2.apimgt.gateway.cli.model.rest.ext.ExtendedAPI;
+import org.wso2.apimgt.gateway.cli.model.rest.ext.ExtendedAPIWrapper;
 import org.wso2.apimgt.gateway.cli.model.template.BallerinaToml;
 import org.wso2.apimgt.gateway.cli.model.template.GenSrcFile;
 import org.wso2.apimgt.gateway.cli.model.template.service.BallerinaOperation;
@@ -119,13 +120,13 @@ public void generate(String projectName, boolean overwrite)
                         ExtendedAPI api = OpenAPICodegenUtils.generateAPIFromOpenAPIDef(openAPI, openAPIAsJson);
                         BallerinaService definitionContext;
                         OpenAPICodegenUtils.setAdditionalConfigsDevFirst(api, openAPI, path.toString());
-
-                        definitionContext = new BallerinaService().buildContext(openAPI, api);
+                        ExtendedAPIWrapper apiWrapper = new ExtendedAPIWrapper(api);
+                        definitionContext = new BallerinaService().buildContext(openAPI, apiWrapper);
                         generateResourceFunctions(definitionContext, genFiles);
                         genFiles.add(generateService(definitionContext));
                         serviceList.add(definitionContext);
                         ballerinaToml.addDependencies(definitionContext);
-                        copySwaggerToResourcesFolder(api.getName(), api.getVersion(), path);
+                        copySwaggerToResourcesFolder(api.getApiInfo().getName(), api.getApiInfo().getVersion(), path);
                     } catch (BallerinaServiceGenException e) {
                         throw new CLIRuntimeException("Swagger definition cannot be parsed to ballerina code", e);
                     } catch (IOException e) {
@@ -228,7 +229,8 @@ private BallerinaService generateDefinitionContext(OpenAPI openAPI, String openA
         }
         BallerinaService definitionContext;
         OpenAPICodegenUtils.setAdditionalConfigsDevFirst(api, openAPI, path.toString());
-        definitionContext = new BallerinaService().buildContext(openAPI, api);
+        ExtendedAPIWrapper apiWrapper = new ExtendedAPIWrapper(api);
+        definitionContext = new BallerinaService().buildContext(openAPI, apiWrapper);
         return definitionContext;
     }
 
@@ -240,7 +242,8 @@ private void copySwaggerToResourcesFolder(String apiName, String apiVersion, Pat
                 CliConstants.YAML_EXTENSION :
                 CliConstants.JSON_EXTENSION;
         String destinationFilename = apiName + "_" + apiVersion + fileExtension;
-        CmdUtils.copyFilesToSources(openAPIFilePath.toString(), resourcesPath + File.separator + destinationFilename);
+        CmdUtils.copyFilesToSources(openAPIFilePath.toString(), resourcesPath + File.separator
+                + destinationFilename);
     }
 
     /**

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/constants/CliConstants.java

@@ -119,4 +119,8 @@ public class CliConstants {
     public static final String PROJECT_GRPC_DEFINITIONS_DIR = "grpc_definitions";
     public static final String RESOURCES_GRPC_DIR = "grpc";
     public static final String MICROGW_PROJECT_PLACEHOLDER = "\\$MGW-PROJECT_HOME";
+    public static final String DEPLOYMENTS_JSON = "deployments.json";
+    public static final String API_JSON = "api.json";
+    public static final String EXPORTED_API = "exported-api";
+    public static final String DEFINITIONS_DIR = "Definitions";
 }

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/constants/RESTServiceConstants.java

@@ -43,6 +43,7 @@ public class RESTServiceConstants {
             "apis?query=name:" + CliConstants.API_NAME_PLACEHOLDER + "%20version:" + CliConstants.VERSION_PLACEHOLDER
                     + "%20status:PUBLISHED&expand=" + CliConstants.EXPAND_PLACEHOLDER;
     public static final String API_OPEN_API_GET_URI = "apis/" + CliConstants.API_ID_PLACEHOLDER + "/swagger";
+    public static final String APIS_EXPORT_URI = "apis/export";
 
     public static final String CONFIG_REST_VERSION = "v1.2";
     public static final String CONFIG_DCR_VERSION = "v0.17";
@@ -64,4 +65,5 @@ public class RESTServiceConstants {
     public static final String CERTIFICATE_TIER = "Tier";
 
     public static final String ALL_SERVICES_REGEX_PATH = "/*";
+    public static final String CONTENT_TYPE_APPLICATION_ZIP = "application/zip";
 }

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/constants/TokenManagementConstants.java

@@ -32,6 +32,10 @@ public class TokenManagementConstants {
     public static final String APPLICATION_CALLBACK_URL = "https://wso2.org";
     public static final String POLICY_VIEW_TOKEN_SCOPE = "apim:tier_view";
     public static final String VIEW_API_SCOPE = "apim:api_view";
+    public static final String API_CREATE_SCOPE = "apim:api_create";
+    public static final String API_PUBLISH_SCOPE = "apim:api_publish";
+    public static final String API_IMPORT_EXPORT_SCOPE = "apim:api_import_export";
+    public static final String API_MANAGE_SCOPE = "apim:api_manage";
     public static final String PASSWORD_GRANT_TYPE = "password";
     public static final String CONTENT_TYPE = "Content-Type";
     public static final String CONTENT_TYPE_APPLICATION_JSON = "application/json";

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/hashing/HashUtils.java

@@ -138,7 +138,7 @@ private static Map<String, String> getMapOfHashes(List objects) throws HashingEx
             for (Object obj : objects) {
                 String hash = getAnnotatedHash(obj);
                 if (obj instanceof ExtendedAPI) {
-                    hashes.put(((ExtendedAPI) obj).getId(), hash);
+                    hashes.put(((ExtendedAPI) obj).getApiInfo().getId(), hash);
                 } else if (obj instanceof ThrottlePolicyDTO) {
                     hashes.put(((ThrottlePolicyDTO) obj).getPolicyId(), hash);
                 } else {

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/model/config/Config.java

@@ -17,7 +17,7 @@
  */
 package org.wso2.apimgt.gateway.cli.model.config;
 
-import org.wso2.apimgt.gateway.cli.model.rest.APICorsConfigurationDTO;
+import org.wso2.apimgt.gateway.cli.model.rest.common.APICorsConfigurationDTO;
 
 /**
  * Configuration data holder.

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/model/config/Token.java

@@ -17,6 +17,7 @@
  */
 package org.wso2.apimgt.gateway.cli.model.config;
 
+import org.apache.commons.lang3.StringUtils;
 import org.wso2.apimgt.gateway.cli.utils.CmdUtils;
 
 import java.io.File;
@@ -27,6 +28,7 @@
  */
 public class Token {
 
+    private String apimVersion;
     private String baseURL;
     private String restVersion;
     private String dcrVersion;
@@ -150,4 +152,19 @@ public String getDcrVersion() {
     public void setDcrVersion(String dcrVersion) {
         this.dcrVersion = dcrVersion;
     }
+
+    public String getApimVersion() {
+        return apimVersion;
+    }
+
+    public void setApimVersion(String apimVersion) {
+        this.apimVersion = apimVersion;
+    }
+
+    public Boolean isApim4xVersion() {
+        if (StringUtils.isNotEmpty(apimVersion)) {
+            return apimVersion.startsWith("4.");
+        }
+        return false;
+    }
 }

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/model/config/TokenBuilder.java

@@ -87,6 +87,11 @@ public TokenBuilder setBaseURL(String baseURL) {
         return this;
     }
 
+    public TokenBuilder setApimVersion(String apimVersion) {
+        this.token.setApimVersion(apimVersion);
+        return this;
+    }
+
     public Token build() {
         return token;
     }

components/micro-gateway-cli/src/main/java/org/wso2/apimgt/gateway/cli/model/mgwcodegen/MgwEndpointListDTO.java

@@ -1,8 +1,8 @@
 package org.wso2.apimgt.gateway.cli.model.mgwcodegen;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.wso2.apimgt.gateway.cli.model.rest.APIEndpointSecurityDTO;
 import org.wso2.apimgt.gateway.cli.model.rest.EndpointUrlTypeEnum;
+import org.wso2.apimgt.gateway.cli.model.rest.apim3x.APIEndpointSecurityDTO;
 import org.wso2.apimgt.gateway.cli.model.route.EndpointType;
 
 import java.util.List;