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

refactor

Browse Source
This commit is contained in:
Radek Davidek 2025-11-07 11:33:30 +01:00
parent 6bc3b273b3
commit 03ad7c5cf4
15 changed files with 670 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/cz/trask/migration/AbstractProcess.java
View File

@ -101,8 +101,7 @@ public abstract class AbstractProcess {
System.setProperty("javax.net.ssl.trustStorePassword", config.getTrustStore().getPassword());
}
private SSLContext createSSLContext(String trustStorePath, String trustStorePassword)
throws Exception {
private SSLContext createSSLContext(String trustStorePath, String trustStorePassword) throws Exception {
// Vytvoříme TrustStore
KeyStore trustStore = KeyStore.getInstance("JKS");
try (FileInputStream fis = new FileInputStream(trustStorePath)) {
@ -120,10 +119,8 @@ public abstract class AbstractProcess {
return sslContext;
}
protected void configureHttpsConnection(HttpsURLConnection connection)
throws Exception {
SSLContext sslContext = createSSLContext(
System.getProperty("javax.net.ssl.trustStore"),
protected void configureHttpsConnection(HttpsURLConnection connection) throws Exception {
SSLContext sslContext = createSSLContext(System.getProperty("javax.net.ssl.trustStore"),
System.getProperty("javax.net.ssl.trustStorePassword"));
connection.setSSLSocketFactory(sslContext.getSocketFactory());
}
@ -134,15 +131,14 @@ public abstract class AbstractProcess {
String clientId = register.getClientId();
log.info("Registered with clientId: {}", clientId);
TokenResponse token = getToken(endpoints.getPublisherTokenUrl(), endpoints.getWso2User(),
register,
"apim:api_view apim:api_create apim:api_manage apim:api_delete apim:api_publish apim:subscription_view apim:subscription_block "+
"apim:subscription_manage apim:external_services_discover apim:threat_protection_policy_create apim:threat_protection_policy_manage "+
"apim:document_create apim:document_manage apim:mediation_policy_view apim:mediation_policy_create apim:mediation_policy_manage "+
"apim:client_certificates_view apim:client_certificates_add apim:client_certificates_update apim:ep_certificates_view apim:ep_certificates_add "+
"apim:ep_certificates_update apim:publisher_settings apim:pub_alert_manage apim:shared_scope_manage apim:app_import_export apim:api_import_export "+
"apim:api_product_import_export apim:api_generate_key apim:common_operation_policy_view apim:common_operation_policy_manage apim:comment_write "+
"apim:comment_view apim:admin apim:subscribe apim:api_key apim:app_manage apim:sub_manage apim:store_settings apim:sub_alert_manage");
TokenResponse token = getToken(endpoints.getPublisherTokenUrl(), endpoints.getWso2User(), register,
"apim:api_view apim:api_create apim:api_manage apim:api_delete apim:api_publish apim:subscription_view apim:subscription_block "
+ "apim:subscription_manage apim:external_services_discover apim:threat_protection_policy_create apim:threat_protection_policy_manage "
+ "apim:document_create apim:document_manage apim:mediation_policy_view apim:mediation_policy_create apim:mediation_policy_manage "
+ "apim:client_certificates_view apim:client_certificates_add apim:client_certificates_update apim:ep_certificates_view apim:ep_certificates_add "
+ "apim:ep_certificates_update apim:publisher_settings apim:pub_alert_manage apim:shared_scope_manage apim:app_import_export apim:api_import_export "
+ "apim:api_product_import_export apim:api_generate_key apim:common_operation_policy_view apim:common_operation_policy_manage apim:comment_write "
+ "apim:comment_view apim:admin apim:subscribe apim:api_key apim:app_manage apim:sub_manage apim:store_settings apim:sub_alert_manage");
log.debug("Access token received – {}", token.getAccess_token());
@ -516,8 +512,8 @@ public abstract class AbstractProcess {
String username = decodedstringparts[0];
String password = decodedstringparts[1];
httpHeaders.put("Authorization", "Basic ".concat(Base64.getEncoder()
.encodeToString(username.concat(":").concat(password).getBytes())));
httpHeaders.put("Authorization",
"Basic ".concat(Base64.getEncoder().encodeToString(username.concat(":").concat(password).getBytes())));
return httpHeaders;
}
}

21
src/main/java/cz/trask/migration/impl/v32/Wso2AppsToApicurio.java
View File

@ -83,11 +83,10 @@ public class Wso2AppsToApicurio extends AbstractProcess {
Map<String, String> httpHeaders = Collections.singletonMap("Authorization",
"Bearer " + tokenResponse.getAccess_token());
HttpResponse exportedZip = makeRequest("GET",
config.getSource().getAdminApiUrl() + "/export/applications?appName=" + app.getName() + "&appOwner="
+ app.getOwner() + "&withKeys=true",
httpHeaders,
Collections.emptyMap(), true);
HttpResponse exportedZip = makeRequest(
"GET", config.getSource().getAdminApiUrl() + "/export/applications?appName=" + app.getName()
+ "&appOwner=" + app.getOwner() + "&withKeys=true",
httpHeaders, Collections.emptyMap(), true);
List<ZipEntryData> zipEntries = ZipUtils.extractFilesFromZip(exportedZip.getResponseBytes());
@ -129,15 +128,11 @@ public class Wso2AppsToApicurio extends AbstractProcess {
}
private void createApplicationInApicurio(ApplicationDetail appDetail, String group, String mainArtifactId,
byte[] content)
throws Exception {
log.info("Creating new Application to Apicurio '{}' ({}).", appDetail.getName(),
appDetail.getOwner());
byte[] content) throws Exception {
log.info("Creating new Application to Apicurio '{}' ({}).", appDetail.getName(), appDetail.getOwner());
// Create new artifact
ArtifactMetaData meta = client.createArtifact(group, mainArtifactId,
ARTIFACT_APPLICATION_DEFAULT_VERSION, null, null,
null,
appDetail.getName(), appDetail.getName(), null, null, null,
ArtifactMetaData meta = client.createArtifact(group, mainArtifactId, ARTIFACT_APPLICATION_DEFAULT_VERSION, null,
null, null, appDetail.getName(), appDetail.getName(), null, null, null,
new ByteArrayInputStream(content), null);
// Create the three required rules

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

@ -148,8 +148,7 @@ public class ExportApisToWso2FromV32 extends AbstractProcess {
return responseCode;
}
public byte[] prepareApiZipFile32to45(SearchedVersion ver, List<ArtifactReference> ref)
throws Exception {
public byte[] prepareApiZipFile32to45(SearchedVersion ver, List<ArtifactReference> ref) throws Exception {
String baseDir = ver.getName() + "-" + ver.getVersion() + "/";

37
src/main/java/cz/trask/migration/impl/v45/ExportAppsToWso2FromV32.java
View File

@ -46,8 +46,8 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
TokenResponse token = authenticateToWso2AndGetToken(config.getTarget());
ArtifactSearchResults apps = client.searchArtifacts(ARTIFACT_GROUP_APPLICATIONS, null, null,
null, null, null, null, null, null);
ArtifactSearchResults apps = client.searchArtifacts(ARTIFACT_GROUP_APPLICATIONS, null, null, null, null,
null, null, null, null);
log.info("Found {} Apps", apps.getCount());
@ -86,8 +86,8 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
try {
log.info("Processing App {} of {}", index, total);
VersionSearchResults versions = client.listArtifactVersions(ARTIFACT_GROUP_APPLICATIONS,
app.getId(), null, null);
VersionSearchResults versions = client.listArtifactVersions(ARTIFACT_GROUP_APPLICATIONS, app.getId(), null,
null);
for (SearchedVersion ver : versions.getVersions()) {
processAppVersion(app, tokenResponse, ver, createAdminApp);
@ -112,8 +112,8 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
ApplicationDetail appDetail = mapper.readValue(content, ApplicationDetail.class);
// Skip default admin application unless explicitly requested
if (DEFAULT_APPLICATION_NAME.equals(appDetail.getName())
&& ADMIN_USERNAME.equals(appDetail.getOwner()) && !createAdminApp) {
if (DEFAULT_APPLICATION_NAME.equals(appDetail.getName()) && ADMIN_USERNAME.equals(appDetail.getOwner())
&& !createAdminApp) {
adminsDefaultApplication = app;
deleteWso2ApplicationIfExists(appDetail, tokenResponse);
log.info(" - Skipping import of admins-default-application for now.");
@ -138,10 +138,10 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
if (appDetail.getKeyManagerWiseOAuthApp() != null
&& !appDetail.getKeyManagerWiseOAuthApp().isEmpty()) {
log.info(" - Application {} has {} Key Mappings to create",
appDetail.getName(), appDetail.getKeyManagerWiseOAuthApp().size());
for (Entry<String, Map<String, KeyManagerApp>> entry : appDetail
.getKeyManagerWiseOAuthApp().entrySet()) {
log.info(" - Application {} has {} Key Mappings to create", appDetail.getName(),
appDetail.getKeyManagerWiseOAuthApp().size());
for (Entry<String, Map<String, KeyManagerApp>> entry : appDetail.getKeyManagerWiseOAuthApp()
.entrySet()) {
String keyType = entry.getKey();
Map<String, KeyManagerApp> keyManagerApp = entry.getValue();
@ -153,13 +153,9 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
log.info(" - Creating Key Mapping for Key Manager: {}", keyManager);
// Map to v4.5 request
ApplicationKeyMappingRequest45 keyMappingRequest = ApplicationKeyMappingRequest45
.builder()
.consumerKey(oauthInfo.getClientId())
.consumerSecret(oauthInfo.getClientSecret())
.keyManager(keyManager)
.keyType(ApplicationKeyMappingRequest45.KeyType
.valueOf(keyType))
.build();
.builder().consumerKey(oauthInfo.getClientId())
.consumerSecret(oauthInfo.getClientSecret()).keyManager(keyManager)
.keyType(ApplicationKeyMappingRequest45.KeyType.valueOf(keyType)).build();
byte[] kmData = mapper.writeValueAsBytes(keyMappingRequest);
publishApplicationKeyMappingToWso2(createdApp.getApplicationId(), kmData,
@ -199,8 +195,7 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
applicationId, response.getResponseCode());
}
} catch (Exception e) {
log.error("IO error while creating Key Mapping for Application {}: {}", applicationId,
e.getMessage(), e);
log.error("IO error while creating Key Mapping for Application {}: {}", applicationId, e.getMessage(), e);
}
}
@ -225,8 +220,8 @@ public class ExportAppsToWso2FromV32 extends AbstractProcess {
log.info(" - Application {} (id={}) deleted successfully from WSO2", appDetail.getName(),
resolvedAppId);
} else {
log.info(" - Application {} (id={}) deletion from WSO2 returned response code {}",
appDetail.getName(), resolvedAppId, response.getResponseCode());
log.info(" - Application {} (id={}) deletion from WSO2 returned response code {}", appDetail.getName(),
resolvedAppId, response.getResponseCode());
}
} catch (Exception e) {
log.error("IO error while deleting Application {} (id={}): {}", appDetail.getName(), resolvedAppId,

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

@ -42,7 +42,8 @@ public class ApiDefinitionMapper32to45 {
: "");
data.setVersion(oldApi.getId() != null ? oldApi.getId().getVersion() : null);
data.setProvider(oldApi.getId() != null ? oldApi.getId().getProviderName() : null);
//data.setContext(swaggerData.get("basePath") != null ? swaggerData.get("basePath").toString() : "");
// data.setContext(swaggerData.get("basePath") != null ?
// swaggerData.get("basePath").toString() : "");
data.setContext(oldApi.getContext());
data.setLifeCycleStatus(oldApi.getStatus());
data.setDefaultVersion(oldApi.isDefaultVersion());

8
src/main/java/cz/trask/migration/model/v32/ApplicationDetail.java
View File

@ -1,13 +1,13 @@
package cz.trask.migration.model.v32;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor

19
src/main/java/cz/trask/migration/model/v32/Documents32.java
View File

@ -26,28 +26,15 @@ public class Documents32 {
private String lastUpdatedBy = null;
public enum TypeEnum {
HOWTO,
SAMPLES,
PUBLIC_FORUM,
SUPPORT_FORUM,
API_MESSAGE_FORMAT,
SWAGGER_DOC,
OTHER
HOWTO, SAMPLES, PUBLIC_FORUM, SUPPORT_FORUM, API_MESSAGE_FORMAT, SWAGGER_DOC, OTHER
}
public enum SourceTypeEnum {
INLINE,
MARKDOWN,
URL,
FILE
INLINE, MARKDOWN, URL, FILE
}
public enum VisibilityEnum {
OWNER_ONLY,
PRIVATE,
API_LEVEL
OWNER_ONLY, PRIVATE, API_LEVEL
}
@Override

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

@ -3,6 +3,7 @@ package cz.trask.migration.model.v32;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
@Data

12
src/main/java/cz/trask/migration/model/v45/ApplicationCreateRequest.java
View File

@ -1,12 +1,16 @@
package cz.trask.migration.model.v45;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import javax.validation.constraints.*;
import java.util.List;
import java.util.Map;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor

11
src/main/java/cz/trask/migration/model/v45/ApplicationCreateResponse.java
View File

@ -1,13 +1,14 @@
package cz.trask.migration.model.v45;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor

1
src/main/java/cz/trask/migration/model/v45/ApplicationKeyMappingRequest45.java
View File

@ -1,6 +1,7 @@
package cz.trask.migration.model.v45;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import lombok.Data;

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

@ -1,7 +1,7 @@
package cz.trask.migration.model.v45;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data