Remove leftover naming from jax

Author: charlottemach

samples/tomcat/src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: com.example.jaxdemo.TomcatOperator
+Main-Class: com.github.containersolutions.operator.sample.TomcatOperator
 

samples/tomcat/src/main/java/com/example/jaxdemo/Tomcat.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Tomcat.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 import io.fabric8.kubernetes.client.CustomResource;
 

samples/tomcat/src/main/java/com/example/jaxdemo/TomcatController.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatController.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 import com.github.containersolutions.operator.api.Context;
 import com.github.containersolutions.operator.api.Controller;
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Controller(customResourceClass = Tomcat.class,
         crdName = "tomcats.tomcatoperator.io")
@@ -42,7 +43,9 @@ public TomcatController(KubernetesClient client) {
     }
 
     private void updateTomcatStatus(Context<Tomcat> context, Tomcat tomcat, Deployment deployment) {
-        int readyReplicas = Objects.requireNonNullElse(deployment.getStatus().getReadyReplicas(), 0);
+        int readyReplicas = Optional.ofNullable(deployment.getStatus().getReadyReplicas()).orElse(0);
+        // Java 9+
+        // int readyReplicas = Objects.requireNonNullElse(deployment.getStatus().getReadyReplicas(), 0);
         log.info("Updating status of Tomcat {} in namespace {} to {} ready replicas", tomcat.getMetadata().getName(),
                 tomcat.getMetadata().getNamespace(), readyReplicas);
 

samples/tomcat/src/main/java/com/example/jaxdemo/TomcatOperator.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatOperator.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 import com.github.containersolutions.operator.Operator;
 import io.fabric8.kubernetes.client.Config;

samples/tomcat/src/main/java/com/example/jaxdemo/TomcatSpec.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatSpec.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 public class TomcatSpec {
 

samples/tomcat/src/main/java/com/example/jaxdemo/TomcatStatus.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/TomcatStatus.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 public class TomcatStatus {
 

samples/tomcat/src/main/java/com/example/jaxdemo/Webapp.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/Webapp.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 import io.fabric8.kubernetes.client.CustomResource;
 

samples/tomcat/src/main/java/com/example/jaxdemo/WebappController.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappController.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 import com.github.containersolutions.operator.api.Context;
 import com.github.containersolutions.operator.api.Controller;

samples/tomcat/src/main/java/com/example/jaxdemo/WebappSpec.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappSpec.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 public class WebappSpec {
 

samples/tomcat/src/main/java/com/example/jaxdemo/WebappStatus.java renamed to samples/tomcat/src/main/java/com/github/containersolutions/operator/sample/WebappStatus.java

@@ -1,4 +1,4 @@
-package com.example.jaxdemo;
+package com.github.containersolutions.operator.sample;
 
 public class WebappStatus {