Merge branch 'Axway-API-Management-Plus:develop' into openapi31-merged

Author: florianstoll

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: Axway Support
-    url: https://support.axway.com
-    about: If you are using an Axway officially supported version you may also create an Axway support case.

modules/apis/src/main/java/com/axway/apim/api/export/impl/CSVAPIExporter.java

@@ -76,6 +76,7 @@ private enum HeaderFields {
                 "Tags",
                 "Granted Organization",
                 "Application Name",
+                "Application ID",
                 "Application Organization",
             CREATED_ON
         });
@@ -232,6 +233,7 @@ private void writeAPIUltraToCSV(CSVPrinter csvPrinter, API api, ClientApplicatio
                 getTags(api),
                 org.getName(),
                 app.getName(),
+                app.getId(),
                 app.getOrganization().getName(),
                 getFormattedDate(api)
         );

modules/apis/src/main/java/com/axway/apim/api/export/impl/ExportHelper.java

@@ -46,10 +46,13 @@ public ExportHelper(APIExportParams params) {
         this.params = params;
     }
 
-    public void saveAPILocally(ObjectMapper mapper, ExportAPI exportAPI, String configFile) throws AppException {
+    public void saveAPILocally(ObjectMapper mapper, ExportAPI exportAPI, String configFile, int size) throws AppException {
 
         String apiPath = getAPIExportFolder(exportAPI.getPath());
         File localFolder = new File(params.getTarget() + File.separator + getVHost(exportAPI) + apiPath);
+        if (size > 1 && localFolder.exists()) {
+            localFolder = new File(params.getTarget() + File.separator + getVHost(exportAPI) + apiPath + "-" + System.currentTimeMillis());
+        }
         if (!EnvironmentProperties.PRINT_CONFIG_CONSOLE) {
             LOG.debug("Going to export API: {} into folder: {} ", exportAPI.getName(), localFolder);
             validateFolder(localFolder);

modules/apis/src/main/java/com/axway/apim/api/export/impl/JsonAPIExporter.java

@@ -28,9 +28,10 @@ public JsonAPIExporter(APIExportParams params) {
     @Override
     public void execute(List<API> apis) throws AppException {
         LOG.info("Exporting API and configuration as JSON format");
+        int size = apis.size();
         for (API api : apis) {
             ExportAPI exportAPI = new ExportAPI(api);
-            exportHelper.saveAPILocally(new ObjectMapper(), exportAPI, "/api-config.json");
+            exportHelper.saveAPILocally(new ObjectMapper(), exportAPI, "/api-config.json", size);
         }
     }
 

modules/apis/src/main/java/com/axway/apim/api/export/impl/YamlAPIExporter.java

@@ -22,9 +22,10 @@ public YamlAPIExporter(APIExportParams params) {
     @Override
     public void execute(List<API> apis) throws AppException {
         LOG.info("Export API and configuration as Yaml format");
+        int size = apis.size();
         for (API api : apis) {
             ExportAPI exportAPI = new ExportAPI(api);
-            exportHelper.saveAPILocally(new ObjectMapper(CustomYamlFactory.createYamlFactory()), exportAPI, "/api-config.yaml");
+            exportHelper.saveAPILocally(new ObjectMapper(CustomYamlFactory.createYamlFactory()), exportAPI, "/api-config.yaml", size);
         }
     }
 }