clean up

Author: doxiao

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -570,7 +570,7 @@ private static boolean isDeprecatedDedicated() {
     public static String getIntrospectorJobNameSuffix() {
       return Optional.ofNullable(tuningAndConfig()
           .get(LegalNames.INTROSPECTOR_JOB_NAME_SUFFIX_PARAM))
-          .orElse(LegalNames.DOMAIN_INTROSPECTOR_JOB_SUFFIX);
+          .orElse(LegalNames.DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX);
     }
 
     /**
@@ -580,7 +580,7 @@ public static String getIntrospectorJobNameSuffix() {
     public static String getExternalServiceNameSuffix() {
       return Optional.ofNullable(tuningAndConfig()
           .get(LegalNames.EXTERNAL_SERVICE_NAME_SUFFIX_PARAM))
-          .orElse(LegalNames.EXTERNAL_SERVICE_SUFFIX);
+          .orElse(LegalNames.DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
     }
 
     /**

operator/src/main/java/oracle/kubernetes/operator/PodWatcher.java

@@ -38,8 +38,6 @@
 import oracle.kubernetes.operator.watcher.WatchListener;
 import oracle.kubernetes.operator.work.Step;
 
-import static oracle.kubernetes.operator.helpers.LegalNames.DOMAIN_INTROSPECTOR_JOB_SUFFIX;
-
 /**
  * Watches for changes to pods.
  */
@@ -163,7 +161,7 @@ public void receivedResponse(Watch.Response<V1Pod> item) {
     switch (item.type) {
       case "ADDED":
       case "MODIFIED":
-        if (getPodName(pod).contains(DOMAIN_INTROSPECTOR_JOB_SUFFIX) && isFailed(pod)) {
+        if (getPodName(pod).contains(Main.Namespaces.getIntrospectorJobNameSuffix()) && isFailed(pod)) {
           LOGGER.info(MessageKeys.INTROSPECTOR_POD_FAILED, getPodName(pod), getPodNamespace(pod), pod.getStatus());
         }
         copyOf(getOnModifiedCallbacks(getPodName(pod))).forEach(c -> c.accept(pod));

operator/src/main/java/oracle/kubernetes/operator/helpers/LegalNames.java

@@ -15,10 +15,10 @@
 /** A class to create DNS-1123 legal names for Kubernetes objects. */
 public class LegalNames {
 
-  public static final String EXTERNAL_SERVICE_SUFFIX = "-ext";
+  public static final String DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX = "-ext";
   private static final String SERVER_PATTERN = "%s-%s";
   private static final String CLUSTER_SERVICE_PATTERN = "%s-cluster-%s";
-  public static final String DOMAIN_INTROSPECTOR_JOB_SUFFIX = "-introspector";
+  public static final String DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX = "-introspector";
   private static final String DOMAIN_INTROSPECTOR_JOB_PATTERN = "%s%s";
   private static final String EXTERNAL_SERVICE_PATTERN = "%s-%s%s";
 

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Domain.java

@@ -34,8 +34,6 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.helpers.LegalNames;
 import oracle.kubernetes.operator.helpers.SecretType;
-import oracle.kubernetes.operator.logging.LoggingFacade;
-import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
 import oracle.kubernetes.operator.work.Packet;
@@ -116,8 +114,6 @@ public class Domain implements KubernetesObject {
   @Description("The current status of the operation of the WebLogic domain. Updated automatically by the operator.")
   private DomainStatus status;
 
-  private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
-
   @SuppressWarnings({"rawtypes"})
   static List sortOrNull(List list) {
     return sortOrNull(list, null);
@@ -664,9 +660,6 @@ List<String> getValidationFailures(KubernetesResourceLookup kubernetesResources)
 
     private void verifyIntrospectorJobName() {
       // K8S adds a 5 character suffix to an introspector job name
-      LOGGER.fine("XXX verifyIntrospectorJobName: domain UID = " + getDomainUid()
-          + " spec = " + getSpec()
-          + "generatedName = " + LegalNames.toJobIntrospectorName(getDomainUid()));
       if (LegalNames.toJobIntrospectorName(getDomainUid()).length()
           > LegalNames.LEGAL_DNS_LABEL_NAME_MAX_LENGTH - 5) {
         failures.add(DomainValidationMessages.exceedMaxIntrospectorJobName(getDomainUid()));
@@ -706,19 +699,13 @@ private void checkGeneratedExternalServiceName(String adminServerName) {
     }
 
     private void checkGeneratedServerServiceName(String serverName) {
-      LOGGER.fine("XXX checkGeneratedServerServiceName: domain UID = " + getDomainUid()
-          + " serverName = " + serverName
-          + "generatedName = " + LegalNames.toServerServiceName(getDomainUid(), serverName));
       if (LegalNames.toServerServiceName(getDomainUid(), serverName).length()
           > LegalNames.LEGAL_DNS_LABEL_NAME_MAX_LENGTH) {
         failures.add(DomainValidationMessages.exceedMaxServerServiceName(getDomainUid(), serverName));
       }
     }
 
     private void checkGeneratedClusterServiceName(String clusterName) {
-      LOGGER.fine("XXX checkGeneratedServerServiceName: domain UID = " + getDomainUid()
-          + " clusterName = " + clusterName
-          + "generatedName = " + LegalNames.toServerServiceName(getDomainUid(), clusterName));
       if (LegalNames.toClusterServiceName(getDomainUid(), clusterName).length()
           > LegalNames.LEGAL_DNS_LABEL_NAME_MAX_LENGTH) {
         failures.add(DomainValidationMessages.exceedMaxClusterServiceName(getDomainUid(), clusterName));

operator/src/test/java/oracle/kubernetes/operator/PodWatcherTest.java

@@ -32,7 +32,7 @@
 
 import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
-import static oracle.kubernetes.operator.helpers.LegalNames.DOMAIN_INTROSPECTOR_JOB_SUFFIX;
+import static oracle.kubernetes.operator.helpers.LegalNames.DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX;
 import static oracle.kubernetes.operator.logging.MessageKeys.INTROSPECTOR_POD_FAILED;
 import static oracle.kubernetes.utils.LogMatcher.containsInfo;
 import static org.hamcrest.Matchers.both;
@@ -123,7 +123,7 @@ private V1Pod createPod() {
   }
 
   private V1Pod createIntrospectorPod() {
-    return new V1Pod().metadata(new V1ObjectMeta().namespace(NS).name(NAME + DOMAIN_INTROSPECTOR_JOB_SUFFIX));
+    return new V1Pod().metadata(new V1ObjectMeta().namespace(NS).name(NAME + DEFAULT_INTROSPECTOR_JOB_NAME_SUFFIX));
   }
 
   @Test