From 0d25f854ec444c4c84dd05bd30dd570fc89c25a4 Mon Sep 17 00:00:00 2001 From: Radek Davidek Date: Mon, 22 Dec 2025 21:00:36 +0100 Subject: [PATCH] some fixes --- .../migration/impl/v32/Wso2v32ToApicurioFromDir.java | 4 +--- src/main/java/cz/trask/migration/impl/v32/ZipUtils.java | 3 +++ .../migration/impl/v45/ExportApisToWso2FromV32.java | 4 +++- .../migration/mapper/ApiDefinitionMapper32to45.java | 9 +++++---- src/main/java/cz/trask/migration/model/FileType.java | 2 +- .../cz/trask/migration/model/v32/ApiDefinition32.java | 1 + 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/cz/trask/migration/impl/v32/Wso2v32ToApicurioFromDir.java b/src/main/java/cz/trask/migration/impl/v32/Wso2v32ToApicurioFromDir.java index 3b5b709..efe981e 100644 --- a/src/main/java/cz/trask/migration/impl/v32/Wso2v32ToApicurioFromDir.java +++ b/src/main/java/cz/trask/migration/impl/v32/Wso2v32ToApicurioFromDir.java @@ -4,8 +4,6 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.text.Normalizer; -import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -181,7 +179,7 @@ public class Wso2v32ToApicurioFromDir extends AbstractProcess { api.getVersion(), api.getName(), fullDesc, new ByteArrayInputStream(swaggerObj.toString().getBytes()), references); - setArtifactMetaData(meta, api.getName(), fullDesc,props); + setArtifactMetaData(meta, api.getName(), fullDesc, props); } else { // Version already exists – no action needed log.warn("API {} with version {} already exists. Skipping import.", diff --git a/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java b/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java index af32e77..5206084 100644 --- a/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java +++ b/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java @@ -59,7 +59,10 @@ public class ZipUtils { return FileType.DOCUMENTATION_FILE; } else if (lowerFileName.contains("/docs/")) { return FileType.DOCUMENTATION; + } else if (lowerFileName.contains("/image/icon.png")) { + return FileType.ICON; } + return FileType.UNKNOWN; } diff --git a/src/main/java/cz/trask/migration/impl/v45/ExportApisToWso2FromV32.java b/src/main/java/cz/trask/migration/impl/v45/ExportApisToWso2FromV32.java index 02fa853..03ff6ee 100644 --- a/src/main/java/cz/trask/migration/impl/v45/ExportApisToWso2FromV32.java +++ b/src/main/java/cz/trask/migration/impl/v45/ExportApisToWso2FromV32.java @@ -103,7 +103,7 @@ public class ExportApisToWso2FromV32 extends AbstractProcess { if (ref != null && !ref.isEmpty()) { log.info("Artifact has {} references", ref.size()); byte[] data = prepareApiZipFile32to45(ver, ref); - String fileName = api.getName() + "-" + ver.getVersion() + ".zip"; + String fileName = ver.getName() + "-" + ver.getVersion() + ".zip"; if (config.isStoreMigratedArtifacts()) { File tmpFile = new File("tmp/api/", fileName); @@ -213,6 +213,8 @@ public class ExportApisToWso2FromV32 extends AbstractProcess { } else if (FileType.DOCUMENTATION_FILE.toString().equals(amd.getGroupId())) { // Handled in convertAndAddDocument method appendFile = false; + } else if (FileType.ICON.toString().equals(amd.getGroupId())) { + subDir = "Image/"; } if (appendFile) { diff --git a/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java b/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java index db7f79a..660e0ce 100644 --- a/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java +++ b/src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java @@ -54,10 +54,11 @@ public class ApiDefinitionMapper32to45 { oldApi.getTransports() != null ? List.of(oldApi.getTransports().split(",")) : Collections.emptyList()); data.setTags(oldApi.getTags()); data.setVisibility(oldApi.getVisibility().toUpperCase()); - data.setVisibleRoles(Collections.emptyList()); + //data.setVisibleRoles(oldApi.getVisibleRoles()!=null ? List.of(oldApi.getVisibleRoles().split(",")) : Collections.emptyList()); + data.setVisibleRoles(List.of("Internal/publisher")); data.setVisibleTenants(Collections.emptyList()); data.setAccessControl("NONE"); - data.setAccessControlRoles(Collections.emptyList()); + //data.setAccessControlRoles(Collections.emptyList()); data.setOrganizationPolicies(Collections.emptyList()); data.setType(oldApi.getType()!=null && !oldApi.getType().toLowerCase().equals("null") ? oldApi.getType() : "HTTP"); data.setAudiences(Arrays.asList("all")); @@ -159,7 +160,7 @@ public class ApiDefinitionMapper32to45 { return new HashMap(); Map endpointProd = (Map) endpointConfig.get("production_endpoints"); - if (endpointProd.containsKey("config")) { + if (endpointProd != null && endpointProd.containsKey("config")) { Object value = endpointProd.get("config"); if (value==null) { endpointProd.remove("config"); @@ -167,7 +168,7 @@ public class ApiDefinitionMapper32to45 { } Map endpointSand = (Map) endpointConfig.get("sandbox_endpoints"); - if (endpointSand.containsKey("config")) { + if (endpointSand != null && endpointSand.containsKey("config")) { Object value = endpointSand.get("config"); if (value==null) { endpointSand.remove("config"); diff --git a/src/main/java/cz/trask/migration/model/FileType.java b/src/main/java/cz/trask/migration/model/FileType.java index 123d103..659b68c 100644 --- a/src/main/java/cz/trask/migration/model/FileType.java +++ b/src/main/java/cz/trask/migration/model/FileType.java @@ -1,5 +1,5 @@ package cz.trask.migration.model; public enum FileType { - APIDEF, OPENAPI, WSDL, POLICY_IN, POLICY_OUT, POLICY_FAULT, CERTIFICATE, SUBSCRIPTIONS, DOCUMENTATION, DOCUMENTATION_FILE, UNKNOWN + APIDEF, OPENAPI, WSDL, POLICY_IN, POLICY_OUT, POLICY_FAULT, CERTIFICATE, SUBSCRIPTIONS, DOCUMENTATION, DOCUMENTATION_FILE, ICON, UNKNOWN } diff --git a/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java b/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java index 1bc5dea..b27e935 100644 --- a/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java +++ b/src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java @@ -42,6 +42,7 @@ public class ApiDefinition32 { private boolean apiResourcePatternsChanged; private String status; private String visibility; + private String visibleRoles; private List gatewayLabels; private boolean endpointSecured; private boolean endpointAuthDigest;