kamma/apicurio-migration-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Radek Davidek 2025-12-22 21:00:36 +01:00
parent d44dbfabc7
commit 0d25f854ec
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cz/trask/migration/impl/v32/Wso2v32ToApicurioFromDir.java
View File

@ -4,8 +4,6 @@ import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

3
src/main/java/cz/trask/migration/impl/v32/ZipUtils.java
View File

@ -59,7 +59,10 @@ public class ZipUtils {
return FileType.DOCUMENTATION_FILE; return FileType.DOCUMENTATION_FILE;
} else if (lowerFileName.contains("/docs/")) { } else if (lowerFileName.contains("/docs/")) {
return FileType.DOCUMENTATION; return FileType.DOCUMENTATION;
} else if (lowerFileName.contains("/image/icon.png")) {
return FileType.ICON;
} }
return FileType.UNKNOWN; return FileType.UNKNOWN;
} }

4
src/main/java/cz/trask/migration/impl/v45/ExportApisToWso2FromV32.java
View File

@ -103,7 +103,7 @@ public class ExportApisToWso2FromV32 extends AbstractProcess {
if (ref != null && !ref.isEmpty()) { if (ref != null && !ref.isEmpty()) {
log.info("Artifact has {} references", ref.size()); log.info("Artifact has {} references", ref.size());
byte[] data = prepareApiZipFile32to45(ver, ref); byte[] data = prepareApiZipFile32to45(ver, ref);
String fileName = api.getName() + "-" + ver.getVersion() + ".zip"; String fileName = ver.getName() + "-" + ver.getVersion() + ".zip";
if (config.isStoreMigratedArtifacts()) { if (config.isStoreMigratedArtifacts()) {
File tmpFile = new File("tmp/api/", fileName); 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())) { } else if (FileType.DOCUMENTATION_FILE.toString().equals(amd.getGroupId())) {
// Handled in convertAndAddDocument method // Handled in convertAndAddDocument method
appendFile = false; appendFile = false;
} else if (FileType.ICON.toString().equals(amd.getGroupId())) {
subDir = "Image/";
} }
if (appendFile) { if (appendFile) {

9
src/main/java/cz/trask/migration/mapper/ApiDefinitionMapper32to45.java
View File

@ -54,10 +54,11 @@ public class ApiDefinitionMapper32to45 {
oldApi.getTransports() != null ? List.of(oldApi.getTransports().split(",")) : Collections.emptyList()); oldApi.getTransports() != null ? List.of(oldApi.getTransports().split(",")) : Collections.emptyList());
data.setTags(oldApi.getTags()); data.setTags(oldApi.getTags());
data.setVisibility(oldApi.getVisibility().toUpperCase()); 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.setVisibleTenants(Collections.emptyList());
data.setAccessControl("NONE"); data.setAccessControl("NONE");
data.setAccessControlRoles(Collections.emptyList()); //data.setAccessControlRoles(Collections.emptyList());
data.setOrganizationPolicies(Collections.emptyList()); data.setOrganizationPolicies(Collections.emptyList());
data.setType(oldApi.getType()!=null && !oldApi.getType().toLowerCase().equals("null") ? oldApi.getType() : "HTTP"); data.setType(oldApi.getType()!=null && !oldApi.getType().toLowerCase().equals("null") ? oldApi.getType() : "HTTP");
data.setAudiences(Arrays.asList("all")); data.setAudiences(Arrays.asList("all"));
@ -159,7 +160,7 @@ public class ApiDefinitionMapper32to45 {
return new HashMap(); return new HashMap();
Map<String, Object> endpointProd = (Map<String, Object>) endpointConfig.get("production_endpoints"); Map<String, Object> endpointProd = (Map<String, Object>) endpointConfig.get("production_endpoints");
if (endpointProd.containsKey("config")) { if (endpointProd != null && endpointProd.containsKey("config")) {
Object value = endpointProd.get("config"); Object value = endpointProd.get("config");
if (value==null) { if (value==null) {
endpointProd.remove("config"); endpointProd.remove("config");
@ -167,7 +168,7 @@ public class ApiDefinitionMapper32to45 {
} }
Map<String, Object> endpointSand = (Map<String, Object>) endpointConfig.get("sandbox_endpoints"); Map<String, Object> endpointSand = (Map<String, Object>) endpointConfig.get("sandbox_endpoints");
if (endpointSand.containsKey("config")) { if (endpointSand != null && endpointSand.containsKey("config")) {
Object value = endpointSand.get("config"); Object value = endpointSand.get("config");
if (value==null) { if (value==null) {
endpointSand.remove("config"); endpointSand.remove("config");

2
src/main/java/cz/trask/migration/model/FileType.java
View File

@ -1,5 +1,5 @@
package cz.trask.migration.model; package cz.trask.migration.model;
public enum FileType { 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
} }

1
src/main/java/cz/trask/migration/model/v32/ApiDefinition32.java
View File

@ -42,6 +42,7 @@ public class ApiDefinition32 {
private boolean apiResourcePatternsChanged; private boolean apiResourcePatternsChanged;
private String status; private String status;
private String visibility; private String visibility;
private String visibleRoles;
private List<Object> gatewayLabels; private List<Object> gatewayLabels;
private boolean endpointSecured; private boolean endpointSecured;
private boolean endpointAuthDigest; private boolean endpointAuthDigest;