Refactor package structure.

Author: chenkins

admin-cli/src/main/java/cloud/katta/cli/KattaSetupCli.java

@@ -4,11 +4,11 @@
 
 package cloud.katta.cli;
 
-import cloud.katta.cli.commands.AuthorizationCode;
-import cloud.katta.cli.commands.AwsStsSetup;
-import cloud.katta.cli.commands.StorageProfileArchive;
-import cloud.katta.cli.commands.StorageProfileAwsStaticSetup;
-import cloud.katta.cli.commands.StorageProfileAwsStsSetup;
+import cloud.katta.cli.commands.hub.StorageProfileArchive;
+import cloud.katta.cli.commands.login.AuthorizationCode;
+import cloud.katta.cli.commands.setup.AwsStsSetup;
+import cloud.katta.cli.commands.setup.StorageProfileAwsStaticSetup;
+import cloud.katta.cli.commands.setup.StorageProfileAwsStsSetup;
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "katta-admin-cli",

admin-cli/src/main/java/cloud/katta/cli/commands/StorageProfileArchive.java renamed to admin-cli/src/main/java/cloud/katta/cli/commands/hub/StorageProfileArchive.java

@@ -2,11 +2,12 @@
  * Copyright (c) 2025 shift7 GmbH. All rights reserved.
  */
 
-package cloud.katta.cli.commands;
+package cloud.katta.cli.commands.hub;
 
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
+import cloud.katta.cli.commands.AbstractAuthorizationCode;
 import cloud.katta.client.ApiClient;
 import cloud.katta.client.ApiException;
 import cloud.katta.client.api.StorageProfileResourceApi;
@@ -32,7 +33,7 @@ public class StorageProfileArchive extends AbstractAuthorizationCode implements
 
     @Override
     public Void call() throws Exception {
-        accessToken = login();
+        final String accessToken = login();
         call(hubUrl, accessToken, uuid);
         return null;
     }

admin-cli/src/main/java/cloud/katta/cli/commands/AuthorizationCode.java renamed to admin-cli/src/main/java/cloud/katta/cli/commands/login/AuthorizationCode.java

@@ -1,4 +1,8 @@
-package cloud.katta.cli.commands;
+/*
+ * Copyright (c) 2025 shift7 GmbH. All rights reserved.
+ */
+
+package cloud.katta.cli.commands.login;
 
 import java.net.URI;
 import java.net.http.HttpClient;

admin-cli/src/main/java/cloud/katta/cli/commands/AwsStsSetup.java renamed to admin-cli/src/main/java/cloud/katta/cli/commands/setup/AwsStsSetup.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 shift7 GmbH. All rights reserved.
  */
 
-package cloud.katta.cli.commands;
+package cloud.katta.cli.commands.setup;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;

admin-cli/src/main/java/cloud/katta/cli/commands/StorageProfileAwsStaticSetup.java renamed to admin-cli/src/main/java/cloud/katta/cli/commands/setup/StorageProfileAwsStaticSetup.java

@@ -2,12 +2,13 @@
  * Copyright (c) 2025 shift7 GmbH. All rights reserved.
  */
 
-package cloud.katta.cli.commands;
+package cloud.katta.cli.commands.setup;
 
 import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
+import cloud.katta.cli.commands.AbstractAuthorizationCode;
 import cloud.katta.client.ApiClient;
 import cloud.katta.client.ApiException;
 import cloud.katta.client.api.StorageProfileResourceApi;
@@ -33,7 +34,7 @@ public class StorageProfileAwsStaticSetup extends AbstractAuthorizationCode impl
     @Override
     public Void call() throws Exception {
         final UUID uuid = UUID.randomUUID();
-        accessToken = login();
+        final String accessToken = login();
         call(hubUrl, accessToken, uuid);
         return null;
     }

admin-cli/src/main/java/cloud/katta/cli/commands/StorageProfileAwsStsSetup.java renamed to admin-cli/src/main/java/cloud/katta/cli/commands/setup/StorageProfileAwsStsSetup.java

@@ -2,13 +2,14 @@
  * Copyright (c) 2025 shift7 GmbH. All rights reserved.
  */
 
-package cloud.katta.cli.commands;
+package cloud.katta.cli.commands.setup;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
+import cloud.katta.cli.commands.AbstractAuthorizationCode;
 import cloud.katta.client.ApiClient;
 import cloud.katta.client.ApiException;
 import cloud.katta.client.api.StorageProfileResourceApi;
@@ -43,7 +44,7 @@ public class StorageProfileAwsStsSetup extends AbstractAuthorizationCode impleme
     public Void call() throws Exception {
         final UUID uuid = UUID.randomUUID();
 
-        accessToken = login();
+        final String accessToken = login();
         call(hubUrl, accessToken, uuid);
 
         return null;

admin-cli/src/test/java/cloud/katta/cli/commands/StorageProfileArchiveTest.java renamed to admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileArchiveTest.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2025 shift7 GmbH. All rights reserved.
  */
 
-package cloud.katta.cli.commands;
+package cloud.katta.cli.commands.hub;
 
 
 import ch.cyberduck.core.PasswordStoreFactory;