fix standlone move revert

csviri · csviri · commit aea57570b6f3 · 2022-05-18T15:38:46.000+02:00
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample.dependents;
+package io.javaoperatorsdk.operator.sample;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,7 +12,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
-import io.javaoperatorsdk.operator.sample.WebPage;
 
 import static io.javaoperatorsdk.operator.sample.Utils.configMapName;
 import static io.javaoperatorsdk.operator.sample.Utils.deploymentName;
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample.dependents;
+package io.javaoperatorsdk.operator.sample;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,8 +8,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
-import io.javaoperatorsdk.operator.sample.WebPage;
-import io.javaoperatorsdk.operator.sample.WebPageManagedDependentsReconciler;
 
 import static io.javaoperatorsdk.operator.ReconcilerUtils.loadYaml;
 import static io.javaoperatorsdk.operator.sample.Utils.configMapName;
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java
@@ -1,11 +1,9 @@
-package io.javaoperatorsdk.operator.sample.dependents;
+package io.javaoperatorsdk.operator.sample;
 
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
-import io.javaoperatorsdk.operator.sample.WebPage;
-import io.javaoperatorsdk.operator.sample.WebPageManagedDependentsReconciler;
 
 import static io.javaoperatorsdk.operator.sample.Utils.*;
 
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.operator.sample.dependents;
+package io.javaoperatorsdk.operator.sample;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,8 +7,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
-import io.javaoperatorsdk.operator.sample.WebPage;
-import io.javaoperatorsdk.operator.sample.WebPageManagedDependentsReconciler;
 
 import static io.javaoperatorsdk.operator.ReconcilerUtils.loadYaml;
 import static io.javaoperatorsdk.operator.sample.Utils.deploymentName;
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/Utils.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/Utils.java
@@ -9,53 +9,53 @@ public class Utils {
 
   private Utils() {}
 
-  public static WebPageStatus createStatus(String configMapName) {
+  static WebPageStatus createStatus(String configMapName) {
     WebPageStatus status = new WebPageStatus();
     status.setHtmlConfigMap(configMapName);
     status.setAreWeGood(true);
     status.setErrorMessage(null);
     return status;
   }
 
-  public static String configMapName(WebPage nginx) {
+  static String configMapName(WebPage nginx) {
     return nginx.getMetadata().getName() + "-html";
   }
 
-  public static String deploymentName(WebPage nginx) {
+  static String deploymentName(WebPage nginx) {
     return nginx.getMetadata().getName();
   }
 
-  public static String serviceName(WebPage webPage) {
+  static String serviceName(WebPage webPage) {
     return webPage.getMetadata().getName();
   }
 
-  public static ErrorStatusUpdateControl<WebPage> handleError(WebPage resource, Exception e) {
+  static ErrorStatusUpdateControl<WebPage> handleError(WebPage resource, Exception e) {
     resource.getStatus().setErrorMessage("Error: " + e.getMessage());
     return ErrorStatusUpdateControl.updateStatus(resource);
   }
 
-  public static void simulateErrorIfRequested(WebPage webPage) throws ErrorSimulationException {
+  static void simulateErrorIfRequested(WebPage webPage) throws ErrorSimulationException {
     if (webPage.getSpec().getHtml().contains("error")) {
       // special case just to showcase error if doing a demo
       throw new ErrorSimulationException("Simulating error");
     }
   }
 
-  public static boolean isValidHtml(WebPage webPage) {
+  static boolean isValidHtml(WebPage webPage) {
     // very dummy html validation
     var lowerCaseHtml = webPage.getSpec().getHtml().toLowerCase();
     return lowerCaseHtml.contains("<html>") && lowerCaseHtml.contains("</html>");
   }
 
-  public static WebPage setInvalidHtmlErrorMessage(WebPage webPage) {
+  static WebPage setInvalidHtmlErrorMessage(WebPage webPage) {
     if (webPage.getStatus() == null) {
       webPage.setStatus(new WebPageStatus());
     }
     webPage.getStatus().setErrorMessage("Invalid html.");
     return webPage;
   }
 
-  public static Ingress makeDesiredIngress(WebPage webPage) {
+  static Ingress makeDesiredIngress(WebPage webPage) {
     Ingress ingress = loadYaml(Ingress.class, Utils.class, "ingress.yaml");
     ingress.getMetadata().setName(webPage.getMetadata().getName());
     ingress.getMetadata().setNamespace(webPage.getMetadata().getNamespace());
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageManagedDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageManagedDependentsReconciler.java
@@ -8,9 +8,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
-import io.javaoperatorsdk.operator.sample.dependents.ConfigMapDependentResource;
-import io.javaoperatorsdk.operator.sample.dependents.DeploymentDependentResource;
-import io.javaoperatorsdk.operator.sample.dependents.ServiceDependentResource;
 
 import static io.javaoperatorsdk.operator.sample.Utils.createStatus;
 import static io.javaoperatorsdk.operator.sample.Utils.handleError;
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java
@@ -15,10 +15,6 @@
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
-import io.javaoperatorsdk.operator.sample.dependents.ConfigMapDependentResource;
-import io.javaoperatorsdk.operator.sample.dependents.DeploymentDependentResource;
-import io.javaoperatorsdk.operator.sample.dependents.IngressDependentResource;
-import io.javaoperatorsdk.operator.sample.dependents.ServiceDependentResource;
 
 import static io.javaoperatorsdk.operator.sample.Utils.*;
 

Original file line number	Diff line number	Diff line change
`@@ -9,53 +9,53 @@ public class Utils {`
`9`	`9`
`10`	`10`	`private Utils() {}`
`11`	`11`
`12`		`- public static WebPageStatus createStatus(String configMapName) {`
	`12`	`+ static WebPageStatus createStatus(String configMapName) {`
`13`	`13`	`WebPageStatus status = new WebPageStatus();`
`14`	`14`	`status.setHtmlConfigMap(configMapName);`
`15`	`15`	`status.setAreWeGood(true);`
`16`	`16`	`status.setErrorMessage(null);`
`17`	`17`	`return status;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static String configMapName(WebPage nginx) {`
	`20`	`+ static String configMapName(WebPage nginx) {`
`21`	`21`	`return nginx.getMetadata().getName() + "-html";`
`22`	`22`	`}`
`23`	`23`
`24`		`- public static String deploymentName(WebPage nginx) {`
	`24`	`+ static String deploymentName(WebPage nginx) {`
`25`	`25`	`return nginx.getMetadata().getName();`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static String serviceName(WebPage webPage) {`
	`28`	`+ static String serviceName(WebPage webPage) {`
`29`	`29`	`return webPage.getMetadata().getName();`
`30`	`30`	`}`
`31`	`31`
`32`		`- public static ErrorStatusUpdateControl<WebPage> handleError(WebPage resource, Exception e) {`
	`32`	`+ static ErrorStatusUpdateControl<WebPage> handleError(WebPage resource, Exception e) {`
`33`	`33`	`resource.getStatus().setErrorMessage("Error: " + e.getMessage());`
`34`	`34`	`return ErrorStatusUpdateControl.updateStatus(resource);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static void simulateErrorIfRequested(WebPage webPage) throws ErrorSimulationException {`
	`37`	`+ static void simulateErrorIfRequested(WebPage webPage) throws ErrorSimulationException {`
`38`	`38`	`if (webPage.getSpec().getHtml().contains("error")) {`
`39`	`39`	`// special case just to showcase error if doing a demo`
`40`	`40`	`throw new ErrorSimulationException("Simulating error");`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- public static boolean isValidHtml(WebPage webPage) {`
	`44`	`+ static boolean isValidHtml(WebPage webPage) {`
`45`	`45`	`// very dummy html validation`
`46`	`46`	`var lowerCaseHtml = webPage.getSpec().getHtml().toLowerCase();`
`47`	`47`	`return lowerCaseHtml.contains("<html>") && lowerCaseHtml.contains("</html>");`
`48`	`48`	`}`
`49`	`49`
`50`		`- public static WebPage setInvalidHtmlErrorMessage(WebPage webPage) {`
	`50`	`+ static WebPage setInvalidHtmlErrorMessage(WebPage webPage) {`
`51`	`51`	`if (webPage.getStatus() == null) {`
`52`	`52`	`webPage.setStatus(new WebPageStatus());`
`53`	`53`	`}`
`54`	`54`	`webPage.getStatus().setErrorMessage("Invalid html.");`
`55`	`55`	`return webPage;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static Ingress makeDesiredIngress(WebPage webPage) {`
	`58`	`+ static Ingress makeDesiredIngress(WebPage webPage) {`
`59`	`59`	`Ingress ingress = loadYaml(Ingress.class, Utils.class, "ingress.yaml");`
`60`	`60`	`ingress.getMetadata().setName(webPage.getMetadata().getName());`
`61`	`61`	`ingress.getMetadata().setNamespace(webPage.getMetadata().getNamespace());`