diff --git a/src/main/java/cz/trask/migration/AbstractProcess.java b/src/main/java/cz/trask/migration/AbstractProcess.java index d9b8413..3754cb6 100644 --- a/src/main/java/cz/trask/migration/AbstractProcess.java +++ b/src/main/java/cz/trask/migration/AbstractProcess.java @@ -31,12 +31,12 @@ import cz.trask.migration.model.TokenResponse; public abstract class AbstractProcess { private static Logger log = LogManager.getLogger(AbstractProcess.class); - + protected static final String PARAM_SOURCE_APIM = "source_apim"; protected static final String VERSION_32 = "v32"; protected ObjectMapper mapper; - + protected ObjectMapper mapperYaml; protected ConfigManager config = ConfigManager.getInstance(); diff --git a/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java b/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java index f81e606..4c9e835 100644 --- a/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java +++ b/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java @@ -239,38 +239,39 @@ public class ImportToApicurio extends AbstractProcess { /* Helper methods */ /* --------------------------------------------------------------------- */ - private void updateSwagger(ObjectNode swagger, Map apiMap, String description) { - // Update "info.description" - ObjectNode info = (ObjectNode) swagger.get("info"); - if (info != null) { - info.put("description", description); - } + private void updateSwagger(ObjectNode swagger, Map apiMap, String description) { + // Update "info.description" + ObjectNode info = (ObjectNode) swagger.get("info"); + if (info != null) { + info.put("description", description); + } - // Build "servers" array - ArrayNode servers = mapper.createArrayNode(); + // Build "servers" array + ArrayNode servers = mapper.createArrayNode(); - List> endpoints = (List>) apiMap.get("endpointURLs"); - if (endpoints != null) { - for (Map env : endpoints) { - Map urls = (Map) env.get("URLs"); - if (urls == null || urls.isEmpty()) continue; + List> endpoints = (List>) apiMap.get("endpointURLs"); + if (endpoints != null) { + for (Map env : endpoints) { + Map urls = (Map) env.get("URLs"); + if (urls == null || urls.isEmpty()) + continue; - ObjectNode server = mapper.createObjectNode(); - urls.forEach((k, v) -> { - if (v != null && !v.isBlank()) { - if (k.equals("https") || k.equals("wss")) { - server.put("url", v); - } - } - }); - server.put("description", "Gateway: " + env.getOrDefault("environmentName", "")); - servers.add(server); - } - } + ObjectNode server = mapper.createObjectNode(); + urls.forEach((k, v) -> { + if (v != null && !v.isBlank()) { + if (k.equals("https") || k.equals("wss")) { + server.put("url", v); + } + } + }); + server.put("description", "Gateway: " + env.getOrDefault("environmentName", "")); + servers.add(server); + } + } - // Replace "servers" node - swagger.set("servers", servers); - } + // Replace "servers" node + swagger.set("servers", servers); + } private void addSubscriptionsToProps(Map props, Map subsMap) { if (subsMap == null || !subsMap.containsKey("list")) @@ -315,8 +316,9 @@ public class ImportToApicurio extends AbstractProcess { List references = new ArrayList<>(); for (ZipEntryData entry : zipEntries) { String artifactId = api.getName() + "/" + api.getVersion() + "/" + entry.getName(); - - //ApiDefinition apiDef = mapper.readValue(entry.getContent(), ApiDefinition.class); + + // ApiDefinition apiDef = mapper.readValue(entry.getContent(), + // ApiDefinition.class); // Create the artifact (versioned) try (ByteArrayInputStream is = new ByteArrayInputStream(entry.getContent())) { 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 f29d56d..53e0bac 100644 --- a/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java +++ b/src/main/java/cz/trask/migration/impl/v32/ZipUtils.java @@ -77,8 +77,8 @@ public class ZipUtils { return buffer.toByteArray(); } - public static byte[] prepareApiZipFile32to45(RegistryClient client, SearchedVersion ver, List ref) - throws IOException { + public static byte[] prepareApiZipFile32to45(RegistryClient client, SearchedVersion ver, + List ref) throws IOException { String baseDir = ver.getName() + "-" + ver.getVersion() + "/"; diff --git a/src/main/java/cz/trask/migration/model/v32/ApiDefinition.java b/src/main/java/cz/trask/migration/model/v32/ApiDefinition.java index 3dbbf14..971adfa 100644 --- a/src/main/java/cz/trask/migration/model/v32/ApiDefinition.java +++ b/src/main/java/cz/trask/migration/model/v32/ApiDefinition.java @@ -79,31 +79,31 @@ public class ApiDefinition { } public static class EndpointConfig { - public String endpoint_type; - public Endpoint sandbox_endpoints; - public Endpoint production_endpoints; - public EndpointSecurity endpoint_security; + public String endpoint_type; + public Endpoint sandbox_endpoints; + public Endpoint production_endpoints; + public EndpointSecurity endpoint_security; - public static class Endpoint { - public String url; - } + public static class Endpoint { + public String url; + } - public static class EndpointSecurity { - public SecurityConfig production; - public SecurityConfig sandbox; + public static class EndpointSecurity { + public SecurityConfig production; + public SecurityConfig sandbox; - public static class SecurityConfig { - public String password; - public String tokenUrl; - public String clientId; - public String clientSecret; - public String customParameters; - public String type; - public String grantType; - public boolean enabled; - public String username; - } - } + public static class SecurityConfig { + public String password; + public String tokenUrl; + public String clientId; + public String clientSecret; + public String customParameters; + public String type; + public String grantType; + public boolean enabled; + public String username; + } + } } // --- HlavnĂ­ pole ---