From b6149886741c7a1b6db12ce7aa420509404b51d7 Mon Sep 17 00:00:00 2001 From: Radek Davidek Date: Thu, 2 Oct 2025 17:37:14 +0200 Subject: [PATCH] format and imports --- .../cz/trask/apioperator/AbstractProcess.java | 20 +-- .../trask/apioperator/impl/ExportToWso2.java | 4 +- .../apioperator/impl/ImportToApicurio.java | 6 +- .../apioperator/model/ApiDefinition.java | 150 +++++++++--------- .../trask/apioperator/model/EventAPIInfo.java | 53 +++++-- .../cz/trask/apioperator/model/FileType.java | 6 +- 6 files changed, 130 insertions(+), 109 deletions(-) diff --git a/src/main/java/cz/trask/apioperator/AbstractProcess.java b/src/main/java/cz/trask/apioperator/AbstractProcess.java index 9190844..5f79b73 100644 --- a/src/main/java/cz/trask/apioperator/AbstractProcess.java +++ b/src/main/java/cz/trask/apioperator/AbstractProcess.java @@ -33,7 +33,7 @@ public abstract class AbstractProcess { private static Logger log = LogManager.getLogger(AbstractProcess.class); protected Gson gson; - + protected Yaml yaml; protected ConfigManager config = ConfigManager.getInstance(); @@ -41,7 +41,7 @@ public abstract class AbstractProcess { protected AbstractProcess() { gson = new GsonBuilder().create(); - + yaml = new Yaml(); setTrustStoreCredentials(); @@ -310,7 +310,7 @@ public abstract class AbstractProcess { } return listOfApis; } - + /** * Common function used for upload API * @@ -322,11 +322,11 @@ public abstract class AbstractProcess { */ protected static HttpResponse makeFileRequest(String method, String urlStr, Map httpHeaders, byte[] buff, String attachmentFileName) throws Exception { - - if (buff==null) { + + if (buff == null) { log.error("Cannot send NULL payload to rest service."); } - + String crlf = "\r\n"; String twoHyphens = "--"; @@ -369,14 +369,14 @@ public abstract class AbstractProcess { int responseCode = con.getResponseCode(); if (responseCode == 200 || responseCode == 201) { - in = con.getInputStream(); + in = con.getInputStream(); } else { - in = con.getErrorStream(); + in = con.getErrorStream(); } while (in.available() > 0) { - int read = in.read(buf); - res = res.concat(new String(buf, 0, read)); + int read = in.read(buf); + res = res.concat(new String(buf, 0, read)); } resp.setHeaders(con.getHeaderFields()); diff --git a/src/main/java/cz/trask/apioperator/impl/ExportToWso2.java b/src/main/java/cz/trask/apioperator/impl/ExportToWso2.java index 71d165a..5f801f8 100644 --- a/src/main/java/cz/trask/apioperator/impl/ExportToWso2.java +++ b/src/main/java/cz/trask/apioperator/impl/ExportToWso2.java @@ -1,6 +1,5 @@ package cz.trask.apioperator.impl; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -138,7 +137,8 @@ public class ExportToWso2 extends AbstractProcess { private int publishApiToWso2(String fileName, byte[] data, TokenResponse tokenResponse) { int responseCode = -1; try { - String url = config.getTargetPublisherApiUrl().concat(String.format("?preserveProvider=false&overwrite=true")); + String url = config.getTargetPublisherApiUrl() + .concat(String.format("?preserveProvider=false&overwrite=true")); log.info("API Import URL: " + url); diff --git a/src/main/java/cz/trask/apioperator/impl/ImportToApicurio.java b/src/main/java/cz/trask/apioperator/impl/ImportToApicurio.java index a8fb14c..76172c8 100644 --- a/src/main/java/cz/trask/apioperator/impl/ImportToApicurio.java +++ b/src/main/java/cz/trask/apioperator/impl/ImportToApicurio.java @@ -138,9 +138,9 @@ public class ImportToApicurio extends AbstractProcess { Collections.emptyMap(), true); List zipEntries = ZipExtractor.extractFilesFromZip(exportedZip.getResponseBytes()); - + String swagger = null; - + for (ZipEntryData e : zipEntries) { if (e.getType().toString().equals(FileType.OPENAPI.toString())) { log.debug("Found main API definition file: {}", e.getName()); @@ -148,7 +148,7 @@ public class ImportToApicurio extends AbstractProcess { break; } } - + // 3) Deserialize JSON responses TypeToken> mapType = new TypeToken<>() { }; diff --git a/src/main/java/cz/trask/apioperator/model/ApiDefinition.java b/src/main/java/cz/trask/apioperator/model/ApiDefinition.java index 1d8c97c..7e484c7 100644 --- a/src/main/java/cz/trask/apioperator/model/ApiDefinition.java +++ b/src/main/java/cz/trask/apioperator/model/ApiDefinition.java @@ -4,93 +4,93 @@ import java.util.List; import java.util.Map; public class ApiDefinition { - private String id; - private String name; - private Object description; - private String context; - private String version; - private String provider; - private String apiDefinition; - private Object wsdlUri; - private String lifeCycleStatus; - private boolean isDefaultVersion; - private String type; - private List transport; - private List operations; - private String authorizationHeader; - private List securityScheme; - private List tags; - private List tiers; - private boolean hasThumbnail; - private Map additionalProperties; - private Monetization monetization; - private List ingressURLs; - private List endpointURLs; - private BusinessInformation businessInformation; - private List labels; - private List environmentList; - private List scopes; - private String avgRating; - private AdvertiseInfo advertiseInfo; - private boolean isSubscriptionAvailable; - private List categories; - private List keyManagers; + private String id; + private String name; + private Object description; + private String context; + private String version; + private String provider; + private String apiDefinition; + private Object wsdlUri; + private String lifeCycleStatus; + private boolean isDefaultVersion; + private String type; + private List transport; + private List operations; + private String authorizationHeader; + private List securityScheme; + private List tags; + private List tiers; + private boolean hasThumbnail; + private Map additionalProperties; + private Monetization monetization; + private List ingressURLs; + private List endpointURLs; + private BusinessInformation businessInformation; + private List labels; + private List environmentList; + private List scopes; + private String avgRating; + private AdvertiseInfo advertiseInfo; + private boolean isSubscriptionAvailable; + private List categories; + private List keyManagers; - // Getters and Setters + // Getters and Setters - public static class Tier { - private String tierName; - private String tierPlan; - private Object monetizationAttributes; + public static class Tier { + private String tierName; + private String tierPlan; + private Object monetizationAttributes; - // Getters and Setters - } + // Getters and Setters + } - public static class EndpointURLs { - private String environmentName; - private String environmentType; - private URLs URLs; - private DefaultVersionURLs defaultVersionURLs; + public static class EndpointURLs { + private String environmentName; + private String environmentType; + private URLs URLs; + private DefaultVersionURLs defaultVersionURLs; - public static class URLs { - private String http; - private String https; - private Object ws; - private Object wss; + public static class URLs { + private String http; + private String https; + private Object ws; + private Object wss; - // Getters and Setters - } + // Getters and Setters + } - public static class DefaultVersionURLs { - private Object http; - private Object https; - private Object ws; - private Object wss; + public static class DefaultVersionURLs { + private Object http; + private Object https; + private Object ws; + private Object wss; - // Getters and Setters - } - } + // Getters and Setters + } + } - public static class Monetization { - private boolean enabled; + public static class Monetization { + private boolean enabled; - // Getters and Setters - } + // Getters and Setters + } - public static class BusinessInformation { - private String businessOwner; - private String businessOwnerEmail; - private String technicalOwner; - private String technicalOwnerEmail; + public static class BusinessInformation { + private String businessOwner; + private String businessOwnerEmail; + private String technicalOwner; + private String technicalOwnerEmail; - // Getters and Setters - } + // Getters and Setters + } - public static class AdvertiseInfo { - private boolean advertised; - private String originalStoreUrl; - private String apiOwner; + public static class AdvertiseInfo { + private boolean advertised; + private String originalStoreUrl; + private String apiOwner; - // Getters and Setters - } + // Getters and Setters + } } diff --git a/src/main/java/cz/trask/apioperator/model/EventAPIInfo.java b/src/main/java/cz/trask/apioperator/model/EventAPIInfo.java index 062b2b2..e1772f0 100644 --- a/src/main/java/cz/trask/apioperator/model/EventAPIInfo.java +++ b/src/main/java/cz/trask/apioperator/model/EventAPIInfo.java @@ -2,95 +2,120 @@ package cz.trask.apioperator.model; public class EventAPIInfo { - String apiName; - String apiId; - String uuid; - String apiVersion; - String apiContext; - String apiProvider; - String apiType; - String apiStatus; - String eventId; - String timeStamp; - String type; - String tenantId; - String tenantDomain; - + String apiName; + String apiId; + String uuid; + String apiVersion; + String apiContext; + String apiProvider; + String apiType; + String apiStatus; + String eventId; + String timeStamp; + String type; + String tenantId; + String tenantDomain; + public String getApiName() { return apiName; } + public void setApiName(String apiName) { this.apiName = apiName; } + public String getApiId() { return apiId; } + public void setApiId(String apiId) { this.apiId = apiId; } + public String getUuid() { return uuid; } + public void setUuid(String uuid) { this.uuid = uuid; } + public String getApiVersion() { return apiVersion; } + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } + public String getApiContext() { return apiContext; } + public void setApiContext(String apiContext) { this.apiContext = apiContext; } + public String getApiProvider() { return apiProvider; } + public void setApiProvider(String apiProvider) { this.apiProvider = apiProvider; } + public String getApiType() { return apiType; } + public void setApiType(String apiType) { this.apiType = apiType; } + public String getApiStatus() { return apiStatus; } + public void setApiStatus(String apiStatus) { this.apiStatus = apiStatus; } + public String getEventId() { return eventId; } + public void setEventId(String eventId) { this.eventId = eventId; } + public String getTimeStamp() { return timeStamp; } + public void setTimeStamp(String timeStamp) { this.timeStamp = timeStamp; } + public String getType() { return type; } + public void setType(String type) { this.type = type; } + public String getTenantId() { return tenantId; } + public void setTenantId(String tenantId) { this.tenantId = tenantId; } + public String getTenantDomain() { return tenantDomain; } + public void setTenantDomain(String tenantDomain) { this.tenantDomain = tenantDomain; } diff --git a/src/main/java/cz/trask/apioperator/model/FileType.java b/src/main/java/cz/trask/apioperator/model/FileType.java index fdf4b90..7f4212b 100644 --- a/src/main/java/cz/trask/apioperator/model/FileType.java +++ b/src/main/java/cz/trask/apioperator/model/FileType.java @@ -1,9 +1,5 @@ package cz.trask.apioperator.model; public enum FileType { - APIDEF, - OPENAPI, - WSDL, - POLICY, - UNKNOWN + APIDEF, OPENAPI, WSDL, POLICY, UNKNOWN }