From 52dfaae9c49f022408f3740e2798daecc1796b8d Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Fri, 17 Jan 2025 14:37:15 +0100 Subject: [PATCH] Refactored the package structure --- .../{iss => hub}/DefaultIssInternalClient.java | 6 ++++-- .../suse/manager/{model => }/hub/HubManager.java | 13 ++++++++----- .../manager/{iss => hub}/IssClientFactory.java | 2 +- .../manager/{iss => hub}/IssExternalClient.java | 2 +- .../manager/{iss => hub}/IssInternalClient.java | 6 ++++-- .../suse/manager/{iss => hub}/IssSparkHelper.java | 4 ++-- .../manager/{iss => hub}/RouteWithIssToken.java | 2 +- .../suse/manager/{iss => hub}/SyncController.java | 15 ++++++++------- .../{model => }/hub/test/HubManagerTest.java | 14 +++++++------- .../src/com/suse/manager/model/hub/IssHub.java | 1 - .../com/suse/manager/model/hub/IssPeripheral.java | 1 - .../iss => suse/manager/model/hub}/IssRole.java | 4 ++-- .../src/com/suse/manager/model/hub/IssServer.java | 2 -- .../manager/{iss => model/hub}/RegisterJson.java | 4 +--- .../{iss => model/hub}/SCCCredentialsJson.java | 2 +- java/code/src/com/suse/manager/webui/Router.java | 4 ++-- .../com/suse/manager/xmlrpc/iss/IssHandler.java | 4 ++-- .../manager/xmlrpc/iss/RestIssExternalClient.java | 2 +- .../manager/xmlrpc/iss/test/IssHandlerTest.java | 3 ++- 19 files changed, 47 insertions(+), 44 deletions(-) rename java/code/src/com/suse/manager/{iss => hub}/DefaultIssInternalClient.java (95%) rename java/code/src/com/suse/manager/{model => }/hub/HubManager.java (97%) rename java/code/src/com/suse/manager/{iss => hub}/IssClientFactory.java (98%) rename java/code/src/com/suse/manager/{iss => hub}/IssExternalClient.java (97%) rename java/code/src/com/suse/manager/{iss => hub}/IssInternalClient.java (92%) rename java/code/src/com/suse/manager/{iss => hub}/IssSparkHelper.java (98%) rename java/code/src/com/suse/manager/{iss => hub}/RouteWithIssToken.java (97%) rename java/code/src/com/suse/manager/{iss => hub}/SyncController.java (92%) rename java/code/src/com/suse/manager/{model => }/hub/test/HubManagerTest.java (98%) rename java/code/src/com/{redhat/rhn/domain/iss => suse/manager/model/hub}/IssRole.java (86%) rename java/code/src/com/suse/manager/{iss => model/hub}/RegisterJson.java (96%) rename java/code/src/com/suse/manager/{iss => model/hub}/SCCCredentialsJson.java (98%) diff --git a/java/code/src/com/suse/manager/iss/DefaultIssInternalClient.java b/java/code/src/com/suse/manager/hub/DefaultIssInternalClient.java similarity index 95% rename from java/code/src/com/suse/manager/iss/DefaultIssInternalClient.java rename to java/code/src/com/suse/manager/hub/DefaultIssInternalClient.java index 148eec269135..4453a479cd2f 100644 --- a/java/code/src/com/suse/manager/iss/DefaultIssInternalClient.java +++ b/java/code/src/com/suse/manager/hub/DefaultIssInternalClient.java @@ -9,11 +9,13 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import com.redhat.rhn.common.util.http.HttpClientAdapter; -import com.redhat.rhn.domain.iss.IssRole; +import com.suse.manager.model.hub.IssRole; +import com.suse.manager.model.hub.RegisterJson; +import com.suse.manager.model.hub.SCCCredentialsJson; import com.suse.manager.webui.controllers.ECMAScriptDateAdapter; import com.google.gson.Gson; diff --git a/java/code/src/com/suse/manager/model/hub/HubManager.java b/java/code/src/com/suse/manager/hub/HubManager.java similarity index 97% rename from java/code/src/com/suse/manager/model/hub/HubManager.java rename to java/code/src/com/suse/manager/hub/HubManager.java index 35faf3ae187e..92dea373fa19 100644 --- a/java/code/src/com/suse/manager/model/hub/HubManager.java +++ b/java/code/src/com/suse/manager/hub/HubManager.java @@ -9,19 +9,22 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.model.hub; +package com.suse.manager.hub; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.credentials.CredentialsFactory; import com.redhat.rhn.domain.credentials.HubSCCCredentials; import com.redhat.rhn.domain.credentials.SCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.manager.setup.MirrorCredentialsManager; -import com.suse.manager.iss.IssClientFactory; -import com.suse.manager.iss.IssInternalClient; -import com.suse.manager.iss.SCCCredentialsJson; +import com.suse.manager.model.hub.HubFactory; +import com.suse.manager.model.hub.IssHub; +import com.suse.manager.model.hub.IssPeripheral; +import com.suse.manager.model.hub.IssRole; +import com.suse.manager.model.hub.IssServer; +import com.suse.manager.model.hub.SCCCredentialsJson; +import com.suse.manager.model.hub.TokenType; import com.suse.manager.webui.utils.token.IssTokenBuilder; import com.suse.manager.webui.utils.token.Token; import com.suse.manager.webui.utils.token.TokenBuildingException; diff --git a/java/code/src/com/suse/manager/iss/IssClientFactory.java b/java/code/src/com/suse/manager/hub/IssClientFactory.java similarity index 98% rename from java/code/src/com/suse/manager/iss/IssClientFactory.java rename to java/code/src/com/suse/manager/hub/IssClientFactory.java index db5e1cac8b6a..a8e7543c2e31 100644 --- a/java/code/src/com/suse/manager/iss/IssClientFactory.java +++ b/java/code/src/com/suse/manager/hub/IssClientFactory.java @@ -9,7 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import com.suse.manager.xmlrpc.iss.RestIssExternalClient; import com.suse.utils.CertificateUtils; diff --git a/java/code/src/com/suse/manager/iss/IssExternalClient.java b/java/code/src/com/suse/manager/hub/IssExternalClient.java similarity index 97% rename from java/code/src/com/suse/manager/iss/IssExternalClient.java rename to java/code/src/com/suse/manager/hub/IssExternalClient.java index c7c617048e97..cd1c3349912a 100644 --- a/java/code/src/com/suse/manager/iss/IssExternalClient.java +++ b/java/code/src/com/suse/manager/hub/IssExternalClient.java @@ -9,7 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import java.io.IOException; diff --git a/java/code/src/com/suse/manager/iss/IssInternalClient.java b/java/code/src/com/suse/manager/hub/IssInternalClient.java similarity index 92% rename from java/code/src/com/suse/manager/iss/IssInternalClient.java rename to java/code/src/com/suse/manager/hub/IssInternalClient.java index 53da24cd351f..ce0e051314f1 100644 --- a/java/code/src/com/suse/manager/iss/IssInternalClient.java +++ b/java/code/src/com/suse/manager/hub/IssInternalClient.java @@ -9,10 +9,12 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import com.redhat.rhn.domain.credentials.SCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; + +import com.suse.manager.model.hub.IssRole; +import com.suse.manager.model.hub.SCCCredentialsJson; import java.io.IOException; diff --git a/java/code/src/com/suse/manager/iss/IssSparkHelper.java b/java/code/src/com/suse/manager/hub/IssSparkHelper.java similarity index 98% rename from java/code/src/com/suse/manager/iss/IssSparkHelper.java rename to java/code/src/com/suse/manager/hub/IssSparkHelper.java index 31ca62bc38bc..6ab0ac88bdd5 100644 --- a/java/code/src/com/suse/manager/iss/IssSparkHelper.java +++ b/java/code/src/com/suse/manager/hub/IssSparkHelper.java @@ -9,17 +9,17 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import static com.suse.manager.webui.utils.SparkApplicationHelper.json; -import com.redhat.rhn.domain.iss.IssRole; import com.redhat.rhn.frontend.security.AuthenticationServiceFactory; import com.suse.manager.model.hub.HubFactory; import com.suse.manager.model.hub.IssAccessToken; import com.suse.manager.model.hub.IssHub; import com.suse.manager.model.hub.IssPeripheral; +import com.suse.manager.model.hub.IssRole; import com.suse.manager.webui.utils.gson.ResultJson; import com.suse.manager.webui.utils.token.Token; import com.suse.manager.webui.utils.token.TokenParser; diff --git a/java/code/src/com/suse/manager/iss/RouteWithIssToken.java b/java/code/src/com/suse/manager/hub/RouteWithIssToken.java similarity index 97% rename from java/code/src/com/suse/manager/iss/RouteWithIssToken.java rename to java/code/src/com/suse/manager/hub/RouteWithIssToken.java index 77f96646bcb0..3a37e9a9011e 100644 --- a/java/code/src/com/suse/manager/iss/RouteWithIssToken.java +++ b/java/code/src/com/suse/manager/hub/RouteWithIssToken.java @@ -8,7 +8,7 @@ * along with this software; if not, see * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; import com.suse.manager.webui.utils.token.Token; diff --git a/java/code/src/com/suse/manager/iss/SyncController.java b/java/code/src/com/suse/manager/hub/SyncController.java similarity index 92% rename from java/code/src/com/suse/manager/iss/SyncController.java rename to java/code/src/com/suse/manager/hub/SyncController.java index 1b25aa6f64bc..5b40ed7601cb 100644 --- a/java/code/src/com/suse/manager/iss/SyncController.java +++ b/java/code/src/com/suse/manager/hub/SyncController.java @@ -9,12 +9,12 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.hub; -import static com.suse.manager.iss.IssSparkHelper.allowingOnlyHub; -import static com.suse.manager.iss.IssSparkHelper.allowingOnlyPeripheral; -import static com.suse.manager.iss.IssSparkHelper.allowingOnlyUnregistered; -import static com.suse.manager.iss.IssSparkHelper.usingTokenAuthentication; +import static com.suse.manager.hub.IssSparkHelper.allowingOnlyHub; +import static com.suse.manager.hub.IssSparkHelper.allowingOnlyPeripheral; +import static com.suse.manager.hub.IssSparkHelper.allowingOnlyUnregistered; +import static com.suse.manager.hub.IssSparkHelper.usingTokenAuthentication; import static com.suse.manager.webui.utils.SparkApplicationHelper.asJson; import static com.suse.manager.webui.utils.SparkApplicationHelper.badRequest; import static com.suse.manager.webui.utils.SparkApplicationHelper.message; @@ -22,11 +22,12 @@ import static spark.Spark.post; import com.redhat.rhn.domain.credentials.HubSCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; -import com.suse.manager.model.hub.HubManager; import com.suse.manager.model.hub.IssHub; import com.suse.manager.model.hub.IssPeripheral; +import com.suse.manager.model.hub.IssRole; +import com.suse.manager.model.hub.RegisterJson; +import com.suse.manager.model.hub.SCCCredentialsJson; import com.suse.manager.webui.controllers.ECMAScriptDateAdapter; import com.suse.manager.webui.utils.token.Token; import com.suse.manager.webui.utils.token.TokenParsingException; diff --git a/java/code/src/com/suse/manager/model/hub/test/HubManagerTest.java b/java/code/src/com/suse/manager/hub/test/HubManagerTest.java similarity index 98% rename from java/code/src/com/suse/manager/model/hub/test/HubManagerTest.java rename to java/code/src/com/suse/manager/hub/test/HubManagerTest.java index 4286ce425dce..bd62bf52ec10 100644 --- a/java/code/src/com/suse/manager/model/hub/test/HubManagerTest.java +++ b/java/code/src/com/suse/manager/hub/test/HubManagerTest.java @@ -9,7 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.model.hub.test; +package com.suse.manager.hub.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -24,20 +24,20 @@ import com.redhat.rhn.domain.credentials.CredentialsFactory; import com.redhat.rhn.domain.credentials.HubSCCCredentials; import com.redhat.rhn.domain.credentials.SCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; import com.redhat.rhn.manager.setup.MirrorCredentialsManager; import com.redhat.rhn.testing.JMockBaseTestCaseWithUser; -import com.suse.manager.iss.IssClientFactory; -import com.suse.manager.iss.IssExternalClient; -import com.suse.manager.iss.IssInternalClient; -import com.suse.manager.iss.SCCCredentialsJson; +import com.suse.manager.hub.HubManager; +import com.suse.manager.hub.IssClientFactory; +import com.suse.manager.hub.IssExternalClient; +import com.suse.manager.hub.IssInternalClient; import com.suse.manager.model.hub.HubFactory; -import com.suse.manager.model.hub.HubManager; import com.suse.manager.model.hub.IssAccessToken; import com.suse.manager.model.hub.IssHub; import com.suse.manager.model.hub.IssPeripheral; +import com.suse.manager.model.hub.IssRole; import com.suse.manager.model.hub.IssServer; +import com.suse.manager.model.hub.SCCCredentialsJson; import com.suse.manager.model.hub.TokenType; import com.suse.manager.webui.utils.token.Token; import com.suse.manager.webui.utils.token.TokenBuildingException; diff --git a/java/code/src/com/suse/manager/model/hub/IssHub.java b/java/code/src/com/suse/manager/model/hub/IssHub.java index 840520eda271..a42d18930a65 100644 --- a/java/code/src/com/suse/manager/model/hub/IssHub.java +++ b/java/code/src/com/suse/manager/model/hub/IssHub.java @@ -12,7 +12,6 @@ import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.credentials.SCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; import java.util.Objects; diff --git a/java/code/src/com/suse/manager/model/hub/IssPeripheral.java b/java/code/src/com/suse/manager/model/hub/IssPeripheral.java index 3b8745115fed..c888d6b07116 100644 --- a/java/code/src/com/suse/manager/model/hub/IssPeripheral.java +++ b/java/code/src/com/suse/manager/model/hub/IssPeripheral.java @@ -12,7 +12,6 @@ import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.credentials.HubSCCCredentials; -import com.redhat.rhn.domain.iss.IssRole; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssRole.java b/java/code/src/com/suse/manager/model/hub/IssRole.java similarity index 86% rename from java/code/src/com/redhat/rhn/domain/iss/IssRole.java rename to java/code/src/com/suse/manager/model/hub/IssRole.java index 97dddc3497e1..55b62acfa181 100644 --- a/java/code/src/com/redhat/rhn/domain/iss/IssRole.java +++ b/java/code/src/com/suse/manager/model/hub/IssRole.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 SUSE LLC + * Copyright (c) 2024--2025 SUSE LLC * * This software is licensed to you under the GNU General Public License, * version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -9,7 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.redhat.rhn.domain.iss; +package com.suse.manager.model.hub; public enum IssRole { HUB, diff --git a/java/code/src/com/suse/manager/model/hub/IssServer.java b/java/code/src/com/suse/manager/model/hub/IssServer.java index d18bd4dd49e4..aeffc31a220d 100644 --- a/java/code/src/com/suse/manager/model/hub/IssServer.java +++ b/java/code/src/com/suse/manager/model/hub/IssServer.java @@ -11,8 +11,6 @@ package com.suse.manager.model.hub; -import com.redhat.rhn.domain.iss.IssRole; - /** * Common interface for ISS servers */ diff --git a/java/code/src/com/suse/manager/iss/RegisterJson.java b/java/code/src/com/suse/manager/model/hub/RegisterJson.java similarity index 96% rename from java/code/src/com/suse/manager/iss/RegisterJson.java rename to java/code/src/com/suse/manager/model/hub/RegisterJson.java index 5873734bd2ac..448c5e1d9e86 100644 --- a/java/code/src/com/suse/manager/iss/RegisterJson.java +++ b/java/code/src/com/suse/manager/model/hub/RegisterJson.java @@ -9,9 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; - -import com.redhat.rhn.domain.iss.IssRole; +package com.suse.manager.model.hub; import java.util.Objects; diff --git a/java/code/src/com/suse/manager/iss/SCCCredentialsJson.java b/java/code/src/com/suse/manager/model/hub/SCCCredentialsJson.java similarity index 98% rename from java/code/src/com/suse/manager/iss/SCCCredentialsJson.java rename to java/code/src/com/suse/manager/model/hub/SCCCredentialsJson.java index f07373215c2b..b04362f33da2 100644 --- a/java/code/src/com/suse/manager/iss/SCCCredentialsJson.java +++ b/java/code/src/com/suse/manager/model/hub/SCCCredentialsJson.java @@ -9,7 +9,7 @@ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. */ -package com.suse.manager.iss; +package com.suse.manager.model.hub; import java.util.Objects; diff --git a/java/code/src/com/suse/manager/webui/Router.java b/java/code/src/com/suse/manager/webui/Router.java index c105293074fe..33bdbf6a247a 100644 --- a/java/code/src/com/suse/manager/webui/Router.java +++ b/java/code/src/com/suse/manager/webui/Router.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015--2024 SUSE LLC + * Copyright (c) 2015--2025 SUSE LLC * * This software is licensed to you under the GNU General Public License, * version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -28,7 +28,7 @@ import com.suse.cloud.CloudPaygManager; import com.suse.manager.api.HttpApiRegistry; import com.suse.manager.attestation.AttestationManager; -import com.suse.manager.iss.SyncController; +import com.suse.manager.hub.SyncController; import com.suse.manager.kubernetes.KubernetesManager; import com.suse.manager.utils.SaltKeyUtils; import com.suse.manager.webui.controllers.AnsibleController; diff --git a/java/code/src/com/suse/manager/xmlrpc/iss/IssHandler.java b/java/code/src/com/suse/manager/xmlrpc/iss/IssHandler.java index 27b0ff29808a..1d3c79b5013f 100644 --- a/java/code/src/com/suse/manager/xmlrpc/iss/IssHandler.java +++ b/java/code/src/com/suse/manager/xmlrpc/iss/IssHandler.java @@ -11,7 +11,6 @@ package com.suse.manager.xmlrpc.iss; -import com.redhat.rhn.domain.iss.IssRole; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidParameterException; @@ -20,7 +19,8 @@ import com.redhat.rhn.frontend.xmlrpc.TokenCreationException; import com.redhat.rhn.frontend.xmlrpc.TokenExchangeFailedException; -import com.suse.manager.model.hub.HubManager; +import com.suse.manager.hub.HubManager; +import com.suse.manager.model.hub.IssRole; import com.suse.manager.webui.utils.token.TokenBuildingException; import com.suse.manager.webui.utils.token.TokenException; import com.suse.manager.webui.utils.token.TokenParsingException; diff --git a/java/code/src/com/suse/manager/xmlrpc/iss/RestIssExternalClient.java b/java/code/src/com/suse/manager/xmlrpc/iss/RestIssExternalClient.java index 0be3327e0e4d..a3f57366d614 100644 --- a/java/code/src/com/suse/manager/xmlrpc/iss/RestIssExternalClient.java +++ b/java/code/src/com/suse/manager/xmlrpc/iss/RestIssExternalClient.java @@ -13,7 +13,7 @@ import com.redhat.rhn.common.util.http.HttpClientAdapter; -import com.suse.manager.iss.IssExternalClient; +import com.suse.manager.hub.IssExternalClient; import com.suse.manager.webui.controllers.ECMAScriptDateAdapter; import com.google.gson.Gson; diff --git a/java/code/src/com/suse/manager/xmlrpc/iss/test/IssHandlerTest.java b/java/code/src/com/suse/manager/xmlrpc/iss/test/IssHandlerTest.java index 51abbb265fd4..ac0bf753fe46 100644 --- a/java/code/src/com/suse/manager/xmlrpc/iss/test/IssHandlerTest.java +++ b/java/code/src/com/suse/manager/xmlrpc/iss/test/IssHandlerTest.java @@ -21,7 +21,8 @@ import com.redhat.rhn.frontend.xmlrpc.TokenCreationException; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; -import com.suse.manager.model.hub.HubManager; +import com.suse.manager.hub.HubManager; +import com.suse.manager.model.hub.IssRole; import com.suse.manager.webui.utils.token.TokenBuildingException; import com.suse.manager.webui.utils.token.TokenException; import com.suse.manager.webui.utils.token.TokenParsingException;