wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

@@ -31,11 +31,10 @@ public static void main(String[] args) throws IOException {
     var configLoader = ConfigLoader.getDefault();
     Operator operator = new Operator(configLoader.applyConfigs());
     operator.register(
-        new TomcatReconciler(),
-        configLoader.applyControllerConfigs(TomcatReconciler.TOMCAT_CONTROLLER_NAME));
+        new TomcatReconciler(), configLoader.applyControllerConfigs(TomcatReconciler.NAME));
     operator.register(
         new WebappReconciler(operator.getKubernetesClient()),
-        configLoader.applyControllerConfigs(WebappReconciler.WEBAPP_CONTROLLER_NAME));
+        configLoader.applyControllerConfigs(WebappReconciler.NAME));
     operator.start();
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

@@ -35,10 +35,10 @@
       @Dependent(type = DeploymentDependentResource.class),
       @Dependent(type = ServiceDependentResource.class)
     })
-@ControllerConfiguration(name = TomcatReconciler.TOMCAT_CONTROLLER_NAME)
+@ControllerConfiguration(name = TomcatReconciler.NAME)
 public class TomcatReconciler implements Reconciler<Tomcat> {
 
-  public static final String TOMCAT_CONTROLLER_NAME = "tomcat";
+  public static final String NAME = "tomcat";
   private final Logger log = LoggerFactory.getLogger(getClass());
 
   @Override

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

@@ -47,11 +47,11 @@
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
-@ControllerConfiguration(name = WebappReconciler.WEBAPP_CONTROLLER_NAME)
+@ControllerConfiguration(name = WebappReconciler.NAME)
 public class WebappReconciler implements Reconciler<Webapp>, Cleaner<Webapp> {
 
   private static final Logger log = LoggerFactory.getLogger(WebappReconciler.class);
-  public static final String WEBAPP_CONTROLLER_NAME = "webapp";
+  public static final String NAME = "webapp";
 
   private final KubernetesClient kubernetesClient;