Refactored the package structure

uyuni-project · Jan 21, 2025 · 52dfaae · 52dfaae
1 parent ae12a13
commit 52dfaae
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 44 deletions.
diff --git a/...manager/iss/DefaultIssInternalClient.java → ...manager/hub/DefaultIssInternalClient.java b/...manager/iss/DefaultIssInternalClient.java → ...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/...om/suse/manager/model/hub/HubManager.java → .../src/com/suse/manager/hub/HubManager.java b/...om/suse/manager/model/hub/HubManager.java → .../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/...om/suse/manager/iss/IssClientFactory.java → ...om/suse/manager/hub/IssClientFactory.java b/...om/suse/manager/iss/IssClientFactory.java → ...om/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/...m/suse/manager/iss/IssExternalClient.java → ...m/suse/manager/hub/IssExternalClient.java b/...m/suse/manager/iss/IssExternalClient.java → ...m/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/...m/suse/manager/iss/IssInternalClient.java → ...m/suse/manager/hub/IssInternalClient.java b/...m/suse/manager/iss/IssInternalClient.java → ...m/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/.../com/suse/manager/iss/IssSparkHelper.java → .../com/suse/manager/hub/IssSparkHelper.java b/.../com/suse/manager/iss/IssSparkHelper.java → .../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/...m/suse/manager/iss/RouteWithIssToken.java → ...m/suse/manager/hub/RouteWithIssToken.java b/...m/suse/manager/iss/RouteWithIssToken.java → ...m/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/.../com/suse/manager/iss/SyncController.java → .../com/suse/manager/hub/SyncController.java b/.../com/suse/manager/iss/SyncController.java → .../com/suse/manager/hub/SyncController.java
@@ -9,24 +9,25 @@
  * 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;
 import static com.suse.manager.webui.utils.SparkApplicationHelper.success;
 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/...anager/model/hub/test/HubManagerTest.java → ...suse/manager/hub/test/HubManagerTest.java b/...anager/model/hub/test/HubManagerTest.java → ...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
@@ -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
@@ -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/...rc/com/redhat/rhn/domain/iss/IssRole.java → ...c/com/suse/manager/model/hub/IssRole.java b/...rc/com/redhat/rhn/domain/iss/IssRole.java → ...c/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
@@ -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/...rc/com/suse/manager/iss/RegisterJson.java → .../suse/manager/model/hub/RegisterJson.java b/...rc/com/suse/manager/iss/RegisterJson.java → .../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/.../suse/manager/iss/SCCCredentialsJson.java → ...manager/model/hub/SCCCredentialsJson.java b/.../suse/manager/iss/SCCCredentialsJson.java → ...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
@@ -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
@@ -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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,6 @@ @@
     package com.suse.manager.model.hub;
-    import com.redhat.rhn.domain.iss.IssRole;
     /**
      * Common interface for ISS servers
      */
@@ Expand Down @@