[SystemX] Move classes into correct packages

tnb-software · Nov 30, 2022 · ab1483b · ab1483b
1 parent 10dafd7
commit ab1483b
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 29 deletions.
diff --git a/...horreum/service/HorreumConfiguration.java → ...m/configuration/HorreumConfiguration.java b/...horreum/service/HorreumConfiguration.java → ...m/configuration/HorreumConfiguration.java
@@ -1,4 +1,4 @@
-package software.tnb.horreum.service;
+package software.tnb.horreum.configuration;
 
 import software.tnb.common.config.Configuration;
 

diff --git a/...m-x/services/horreum/src/main/java/software/tnb/horreum/validation/HorreumValidation.java b/...m-x/services/horreum/src/main/java/software/tnb/horreum/validation/HorreumValidation.java
@@ -3,7 +3,7 @@
 import software.tnb.common.utils.HTTPUtils;
 import software.tnb.common.utils.HTTPUtils.Response;
 import software.tnb.horreum.account.HorreumAccount;
-import software.tnb.horreum.service.HorreumConfiguration;
+import software.tnb.horreum.configuration.HorreumConfiguration;
 import software.tnb.horreum.validation.generated.ApiClient;
 import software.tnb.horreum.validation.generated.ApiException;
 import software.tnb.horreum.validation.generated.JSON;

diff --git a/...amq/service/local/AMQBrokerContainer.java → ...mq/resource/local/AMQBrokerContainer.java b/...amq/service/local/AMQBrokerContainer.java → ...mq/resource/local/AMQBrokerContainer.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.local;
+package software.tnb.jms.amq.resource.local;
 
 import org.testcontainers.containers.GenericContainer;
 

diff --git a/...jms/amq/service/local/LocalAMQBroker.java → ...ms/amq/resource/local/LocalAMQBroker.java b/...jms/amq/service/local/LocalAMQBroker.java → ...ms/amq/resource/local/LocalAMQBroker.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.local;
+package software.tnb.jms.amq.resource.local;
 
 import software.tnb.common.deployment.Deployable;
 import software.tnb.common.deployment.WithDockerImage;

diff --git a/...service/openshift/OpenshiftAMQBroker.java → ...esource/openshift/OpenshiftAMQBroker.java b/...service/openshift/OpenshiftAMQBroker.java → ...esource/openshift/OpenshiftAMQBroker.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift;
+package software.tnb.jms.amq.resource.openshift;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
@@ -7,12 +7,12 @@
 import software.tnb.common.deployment.WithInClusterHostname;
 import software.tnb.common.deployment.WithOperator;
 import software.tnb.common.openshift.OpenshiftClient;
+import software.tnb.jms.amq.resource.openshift.generated.Acceptor;
+import software.tnb.jms.amq.resource.openshift.generated.ActiveMQArtemis;
+import software.tnb.jms.amq.resource.openshift.generated.ActiveMQArtemisList;
+import software.tnb.jms.amq.resource.openshift.generated.ActiveMQArtemisSpec;
+import software.tnb.jms.amq.resource.openshift.generated.DeploymentPlan;
 import software.tnb.jms.amq.service.AMQBroker;
-import software.tnb.jms.amq.service.openshift.generated.Acceptor;
-import software.tnb.jms.amq.service.openshift.generated.ActiveMQArtemis;
-import software.tnb.jms.amq.service.openshift.generated.ActiveMQArtemisList;
-import software.tnb.jms.amq.service.openshift.generated.ActiveMQArtemisSpec;
-import software.tnb.jms.amq.service.openshift.generated.DeploymentPlan;
 
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.apache.commons.io.IOUtils;

diff --git a/...service/openshift/generated/Acceptor.java → ...esource/openshift/generated/Acceptor.java b/...service/openshift/generated/Acceptor.java → ...esource/openshift/generated/Acceptor.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/.../openshift/generated/ActiveMQArtemis.java → .../openshift/generated/ActiveMQArtemis.java b/.../openshift/generated/ActiveMQArtemis.java → .../openshift/generated/ActiveMQArtemis.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;

diff --git a/...nshift/generated/ActiveMQArtemisList.java → ...nshift/generated/ActiveMQArtemisList.java b/...nshift/generated/ActiveMQArtemisList.java → ...nshift/generated/ActiveMQArtemisList.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import io.fabric8.kubernetes.client.CustomResourceList;
 

diff --git a/...nshift/generated/ActiveMQArtemisSpec.java → ...nshift/generated/ActiveMQArtemisSpec.java b/...nshift/generated/ActiveMQArtemisSpec.java → ...nshift/generated/ActiveMQArtemisSpec.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...hift/generated/ActiveMQArtemisStatus.java → ...hift/generated/ActiveMQArtemisStatus.java b/...hift/generated/ActiveMQArtemisStatus.java → ...hift/generated/ActiveMQArtemisStatus.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...e/openshift/generated/AddressSetting.java → ...e/openshift/generated/AddressSetting.java b/...e/openshift/generated/AddressSetting.java → ...e/openshift/generated/AddressSetting.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/.../openshift/generated/AddressSettings.java → .../openshift/generated/AddressSettings.java b/.../openshift/generated/AddressSettings.java → .../openshift/generated/AddressSettings.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...ervice/openshift/generated/Connector.java → ...source/openshift/generated/Connector.java b/...ervice/openshift/generated/Connector.java → ...source/openshift/generated/Connector.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/.../service/openshift/generated/Console.java → ...resource/openshift/generated/Console.java b/.../service/openshift/generated/Console.java → ...resource/openshift/generated/Console.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...e/openshift/generated/DeploymentPlan.java → ...e/openshift/generated/DeploymentPlan.java b/...e/openshift/generated/DeploymentPlan.java → ...e/openshift/generated/DeploymentPlan.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...q/service/openshift/generated/Limits.java → .../resource/openshift/generated/Limits.java b/...q/service/openshift/generated/Limits.java → .../resource/openshift/generated/Limits.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...ervice/openshift/generated/PodStatus.java → ...source/openshift/generated/PodStatus.java b/...ervice/openshift/generated/PodStatus.java → ...source/openshift/generated/PodStatus.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...service/openshift/generated/Requests.java → ...esource/openshift/generated/Requests.java b/...service/openshift/generated/Requests.java → ...esource/openshift/generated/Requests.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...ervice/openshift/generated/Resources.java → ...source/openshift/generated/Resources.java b/...ervice/openshift/generated/Resources.java → ...source/openshift/generated/Resources.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/.../service/openshift/generated/Storage.java → ...resource/openshift/generated/Storage.java b/.../service/openshift/generated/Storage.java → ...resource/openshift/generated/Storage.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...service/openshift/generated/Upgrades.java → ...esource/openshift/generated/Upgrades.java b/...service/openshift/generated/Upgrades.java → ...esource/openshift/generated/Upgrades.java
@@ -1,4 +1,4 @@
-package software.tnb.jms.amq.service.openshift.generated;
+package software.tnb.jms.amq.resource.openshift.generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...tnb/splunk/service/local/LocalSplunk.java → ...nb/splunk/resource/local/LocalSplunk.java b/...tnb/splunk/service/local/LocalSplunk.java → ...nb/splunk/resource/local/LocalSplunk.java
@@ -1,4 +1,4 @@
-package software.tnb.splunk.service.local;
+package software.tnb.splunk.resource.local;
 
 import software.tnb.common.account.AccountFactory;
 import software.tnb.common.deployment.Deployable;

diff --git a/...splunk/service/local/SplunkContainer.java → ...plunk/resource/local/SplunkContainer.java b/...splunk/service/local/SplunkContainer.java → ...plunk/resource/local/SplunkContainer.java
@@ -1,4 +1,4 @@
-package software.tnb.splunk.service.local;
+package software.tnb.splunk.resource.local;
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;

diff --git a/...nk/service/openshift/OpenshiftSplunk.java → ...k/resource/openshift/OpenshiftSplunk.java b/...nk/service/openshift/OpenshiftSplunk.java → ...k/resource/openshift/OpenshiftSplunk.java
@@ -1,4 +1,4 @@
-package software.tnb.splunk.service.openshift;
+package software.tnb.splunk.resource.openshift;
 
 import software.tnb.common.account.AccountFactory;
 import software.tnb.common.config.OpenshiftConfiguration;