From 775b3b042da171b7fa5a8c9a2f6ee524e8968db4 Mon Sep 17 00:00:00 2001 From: Radek Davidek Date: Thu, 23 Oct 2025 14:27:52 +0200 Subject: [PATCH] refactor --- .../cz/trask/migration/AbstractProcess.java | 21 +++++++++++++++++++ .../migration/impl/v32/ImportToApicurio.java | 18 +--------------- .../impl/v45/ExportToWso2FromV32.java | 18 +--------------- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/src/main/java/cz/trask/migration/AbstractProcess.java b/src/main/java/cz/trask/migration/AbstractProcess.java index 7377e21..1d8ca05 100644 --- a/src/main/java/cz/trask/migration/AbstractProcess.java +++ b/src/main/java/cz/trask/migration/AbstractProcess.java @@ -66,6 +66,27 @@ public abstract class AbstractProcess { System.setProperty("javax.net.ssl.trustStore", config.getTruststorePath()); System.setProperty("javax.net.ssl.trustStorePassword", config.getTruststorePassword()); } + + protected TokenResponse authenticateToWso2AndGetToken() throws Exception { + RegisterResponse register = register(config.getSourceRegistrationApiUrl(), config.getSourceWso2User()); + + String clientId = register.getClientId(); + log.info("Registered with clientId: {}", clientId); + + TokenResponse token = getToken(config.getSourcePublisherTokenUrl(), config.getSourceWso2User(), 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"); + + log.debug("Access token received – {}", token.getAccess_token()); + + return token; + } /** * Retrieve access token based on clientId and clientSecret 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 a981e5f..5326723 100644 --- a/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java +++ b/src/main/java/cz/trask/migration/impl/v32/ImportToApicurio.java @@ -23,7 +23,6 @@ import cz.trask.migration.model.APIInfo; import cz.trask.migration.model.APIList; import cz.trask.migration.model.FileType; import cz.trask.migration.model.HttpResponse; -import cz.trask.migration.model.RegisterResponse; import cz.trask.migration.model.TokenResponse; import cz.trask.migration.model.ZipEntryData; import io.apicurio.registry.rest.client.RegistryClient; @@ -57,22 +56,7 @@ public class ImportToApicurio extends AbstractProcess { try { log.info("Starting API import to Apicurio from WSO2..."); - RegisterResponse register = register(config.getSourceRegistrationApiUrl(), config.getSourceWso2User()); - - String clientId = register.getClientId(); - log.info("Registered with clientId: {}", clientId); - - TokenResponse token = getToken(config.getSourcePublisherTokenUrl(), config.getSourceWso2User(), 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"); - - log.debug("Access token received – {}", token.getAccess_token()); + TokenResponse token = authenticateToWso2AndGetToken(); APIList apis = getList(config.getSourcePublisherApiUrl(), token); if (apis == null || apis.getList() == null || apis.getList().length == 0) { diff --git a/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java b/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java index ed51f6e..c2416b6 100644 --- a/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java +++ b/src/main/java/cz/trask/migration/impl/v45/ExportToWso2FromV32.java @@ -23,7 +23,6 @@ import cz.trask.migration.AbstractProcess; import cz.trask.migration.mapper.ApiDefinitionMapper32to45; import cz.trask.migration.model.FileType; import cz.trask.migration.model.HttpResponse; -import cz.trask.migration.model.RegisterResponse; import cz.trask.migration.model.TokenResponse; import cz.trask.migration.model.v32.ApiDefinition32; import cz.trask.migration.model.v32.HostInfo32; @@ -60,22 +59,7 @@ public class ExportToWso2FromV32 extends AbstractProcess { try { log.info("Starting API export to WSO2 from Apicurio..."); - RegisterResponse register = register(config.getSourceRegistrationApiUrl(), config.getSourceWso2User()); - - String clientId = register.getClientId(); - log.info("Registered with clientId: {}", clientId); - - TokenResponse token = getToken(config.getSourcePublisherTokenUrl(), config.getSourceWso2User(), 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"); - - log.debug("Access token received – {}", token.getAccess_token()); + TokenResponse token = authenticateToWso2AndGetToken(); ArtifactSearchResults apis = client.searchArtifacts(config.getDefaultApiGroup(), null, null, null, null, null, null, null, null);