Skip to content
This repository was archived by the owner on Sep 11, 2025. It is now read-only.

Commit cb866a3

Browse files
task: move files and organize them (#48)
1 parent debf50b commit cb866a3

33 files changed

+81
-72
lines changed

src/main/java/org/trustify/operator/cdrs/v2alpha1/ui/UIIngress.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/ingress/AppIngress.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.ui;
1+
package org.trustify.operator.cdrs.v2alpha1.ingress;
22

33
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
44
import io.fabric8.kubernetes.api.model.networking.v1.IngressTLS;
@@ -15,9 +15,9 @@
1515
import java.util.Collections;
1616
import java.util.Map;
1717

18-
@KubernetesDependent(labelSelector = UIIngress.LABEL_SELECTOR, resourceDiscriminator = UIIngressDiscriminator.class)
18+
@KubernetesDependent(labelSelector = AppIngress.LABEL_SELECTOR, resourceDiscriminator = AppIngressDiscriminator.class)
1919
@ApplicationScoped
20-
public class UIIngress extends UIIngressBase {
20+
public class AppIngress extends AppIngressBase {
2121

2222
public static final String LABEL_SELECTOR = "app.kubernetes.io/managed-by=trustify-operator,component=ui,component-variant=https";
2323

@@ -38,7 +38,7 @@ protected Ingress desired(Trustify cr, Context<Trustify> context) {
3838

3939
@Override
4040
public boolean isMet(DependentResource<Ingress, Trustify> dependentResource, Trustify primary, Context<Trustify> context) {
41-
return context.getSecondaryResource(Ingress.class, new UIIngressDiscriminator())
41+
return context.getSecondaryResource(Ingress.class, new AppIngressDiscriminator())
4242
.map(in -> {
4343
final var status = in.getStatus();
4444
if (status != null) {

src/main/java/org/trustify/operator/cdrs/v2alpha1/ui/UIIngressBase.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/ingress/AppIngressBase.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.ui;
1+
package org.trustify.operator.cdrs.v2alpha1.ingress;
22

33
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
44
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
@@ -14,19 +14,20 @@
1414
import jakarta.inject.Inject;
1515
import org.trustify.operator.Constants;
1616
import org.trustify.operator.cdrs.v2alpha1.Trustify;
17+
import org.trustify.operator.cdrs.v2alpha1.ui.service.UIService;
1718
import org.trustify.operator.utils.CRDUtils;
1819

1920
import java.util.Collections;
2021
import java.util.List;
2122
import java.util.Map;
2223
import java.util.Optional;
2324

24-
public abstract class UIIngressBase extends CRUDKubernetesDependentResource<Ingress, Trustify> implements Condition<Ingress, Trustify> {
25+
public abstract class AppIngressBase extends CRUDKubernetesDependentResource<Ingress, Trustify> implements Condition<Ingress, Trustify> {
2526

2627
@Inject
2728
KubernetesClient k8sClient;
2829

29-
public UIIngressBase() {
30+
public AppIngressBase() {
3031
super(Ingress.class);
3132
}
3233

src/main/java/org/trustify/operator/cdrs/v2alpha1/ui/UIIngressDiscriminator.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/ingress/AppIngressDiscriminator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.ui;
1+
package org.trustify.operator.cdrs.v2alpha1.ingress;
22

33
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -9,10 +9,10 @@
99

1010
import java.util.Optional;
1111

12-
public class UIIngressDiscriminator implements ResourceDiscriminator<Ingress, Trustify> {
12+
public class AppIngressDiscriminator implements ResourceDiscriminator<Ingress, Trustify> {
1313
@Override
1414
public Optional<Ingress> distinguish(Class<Ingress> resource, Trustify cr, Context<Trustify> context) {
15-
String ingressName = UIIngress.getIngressName(cr);
15+
String ingressName = AppIngress.getIngressName(cr);
1616
ResourceID resourceID = new ResourceID(ingressName, cr.getMetadata().getNamespace());
1717
var informerEventSource = (InformerEventSource<Ingress, Trustify>) context.eventSourceRetriever().getResourceEventSourceFor(Ingress.class);
1818
return informerEventSource.get(resourceID);

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBActivationCondition.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/DBActivationCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db;
22

33
import org.trustify.operator.cdrs.v2alpha1.Trustify;
44
import org.trustify.operator.cdrs.v2alpha1.server.utils.ServerUtils;

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBDeployment.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/deployment/DBDeployment.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
22

33
import io.fabric8.kubernetes.api.model.*;
44
import io.fabric8.kubernetes.api.model.apps.*;
@@ -14,7 +14,9 @@
1414
import org.trustify.operator.Constants;
1515
import org.trustify.operator.cdrs.v2alpha1.Trustify;
1616
import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
17-
import org.trustify.operator.cdrs.v2alpha1.db.utils.DBUtils;
17+
import org.trustify.operator.cdrs.v2alpha1.server.db.pvc.DBPersistentVolumeClaim;
18+
import org.trustify.operator.cdrs.v2alpha1.server.db.secret.DBSecret;
19+
import org.trustify.operator.cdrs.v2alpha1.server.db.utils.DBUtils;
1820
import org.trustify.operator.utils.CRDUtils;
1921

2022
import java.util.Arrays;

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBDeploymentActivationCondition.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/deployment/DBDeploymentActivationCondition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
22

33
import io.fabric8.kubernetes.api.model.apps.Deployment;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;
55
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
66
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
77
import jakarta.enterprise.context.ApplicationScoped;
88
import org.trustify.operator.cdrs.v2alpha1.Trustify;
9+
import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
910

1011
@ApplicationScoped
1112
public class DBDeploymentActivationCondition extends DBActivationCondition implements Condition<Deployment, Trustify> {

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBDeploymentDiscriminator.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/deployment/DBDeploymentDiscriminator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
22

33
import io.fabric8.kubernetes.api.model.apps.Deployment;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBPersistentVolumeClaim.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/pvc/DBPersistentVolumeClaim.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
22

33
import io.fabric8.kubernetes.api.model.*;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
22

33
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;
55
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
66
import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
77
import jakarta.enterprise.context.ApplicationScoped;
88
import org.trustify.operator.cdrs.v2alpha1.Trustify;
9+
import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
910

1011
@ApplicationScoped
1112
public class DBPersistentVolumeClaimActivationCondition extends DBActivationCondition implements Condition<PersistentVolumeClaim, Trustify> {

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBPersistentVolumeClaimDiscriminator.java renamed to src/main/java/org/trustify/operator/cdrs/v2alpha1/server/db/pvc/DBPersistentVolumeClaimDiscriminator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.trustify.operator.cdrs.v2alpha1.db;
1+
package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
22

33
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
44
import io.javaoperatorsdk.operator.api.reconciler.Context;

0 commit comments

Comments
 (0)