Standardize on javax.annotation annotations (#3564)

Author: rjeberhard

documentation/domains/Cluster.json

@@ -654,7 +654,10 @@
           "description": "Changes to this field cause the operator to restart WebLogic Server instances. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-lifecycle/startup/#restarting-servers.",
           "type": "string"
         }
-      }
+      },
+      "required": [
+        "serverName"
+      ]
     },
     "Map": {
       "type": "object"
@@ -1143,5 +1146,8 @@
       "description": "The current status of the operation of the WebLogic cluster. Updated automatically by the operator.",
       "$ref": "#/definitions/ClusterStatus"
     }
-  }
+  },
+  "required": [
+    "spec"
+  ]
 }

documentation/domains/Domain.json

@@ -573,7 +573,10 @@
           "description": "Changes to this field cause the operator to restart WebLogic Server instances. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-lifecycle/startup/#restarting-servers.",
           "type": "string"
         }
-      }
+      },
+      "required": [
+        "serverName"
+      ]
     },
     "Map": {
       "type": "object"

documentation/domains/index.html

@@ -1489,7 +1489,10 @@
           "description": "Changes to this field cause the operator to restart WebLogic Server instances. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-lifecycle/startup/#restarting-servers.",
           "type": "string"
         }
-      }
+      },
+      "required": [
+        "serverName"
+      ]
     },
     "Map": {
       "type": "object"

integration-tests/src/test/java/oracle/weblogic/domain/ClusterResource.java

@@ -4,14 +4,14 @@
 package oracle.weblogic.domain;
 
 import java.util.Optional;
+import javax.annotation.Nonnull;
 
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * An element representing a cluster in the domain configuration.
@@ -206,7 +206,7 @@ public ClusterResource withStatus(ClusterStatus status) {
     return this;
   }
 
-  @NotNull
+  @Nonnull
   public ClusterSpec getSpec() {
     return spec;
   }

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsFailedCondition.java

@@ -10,6 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.models.V1EnvVar;
@@ -35,7 +36,6 @@
 import oracle.weblogic.kubernetes.utils.FmwUtils;
 import oracle.weblogic.kubernetes.utils.LoggingUtil;
 import oracle.weblogic.kubernetes.utils.PodUtils;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
@@ -295,7 +295,7 @@ void testReplicasTooHigh() {
     }
   }
 
-  @NotNull
+  @Nonnull
   private String getClusterResName(String domainName) {
     return domainName + "-" + this.wlClusterName;
   }

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java

@@ -11,6 +11,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
@@ -27,7 +28,6 @@
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
@@ -465,7 +465,7 @@ private boolean hasExpectedException(ApiException exception, String expectedMsg)
     return exception != null && exception.getResponseBody().contains(expectedMsg);
   }
 
-  @NotNull
+  @Nonnull
   private static DomainResource createDomainResource(String domainName) {
 
     // create the domain CR

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java

@@ -18,6 +18,7 @@
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
 
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
@@ -54,7 +55,6 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.assertions.impl.Cluster;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
-import org.jetbrains.annotations.NotNull;
 
 import static java.io.File.createTempFile;
 import static java.nio.file.Files.copy;
@@ -1191,7 +1191,7 @@ public static void shutdownDomainAndVerify(String domainNamespace, String domain
    * @param domainNamespace the namespace
    * @param domainUid the UID
    */
-  @NotNull
+  @Nonnull
   public static DomainResource getAndValidateInitialDomain(String domainNamespace, String domainUid) {
     DomainResource domain = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace),
         String.format("getDomainCustomResource failed with ApiException when tried to get domain %s in namespace %s",
@@ -1210,7 +1210,7 @@ public static DomainResource getAndValidateInitialDomain(String domainNamespace,
    * @param regex check string
    * @return true if regex found, false otherwise.
    */
-  @NotNull
+  @Nonnull
   public static boolean findStringInDomainStatusMessage(String domainNamespace, String domainUid, String regex) {
     // get the domain status message
     StringBuffer getDomainInfoCmd = new StringBuffer("kubectl get domain/");

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/PersistentVolumeUtils.java

@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.Random;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.models.V1Container;
@@ -26,7 +27,6 @@
 import io.kubernetes.client.openapi.models.V1SecurityContext;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
-import org.jetbrains.annotations.NotNull;
 
 import static java.nio.file.Files.createDirectories;
 import static oracle.weblogic.kubernetes.TestConstants.FSS_DIR;
@@ -225,7 +225,7 @@ private static void setVolumeSource(Path pvHostPath, V1PersistentVolume v1pv, St
     }
   }
 
-  @NotNull
+  @Nonnull
   private static Path createPVHostPathDir(String pvName, String className) {
     Path pvHostPath = null;
     LoggingFacade logger = getLogger();

kubernetes/crd/domain-crd.yaml

@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: 6c271191a86ea2a5ff138c7772075e2867ac7cbb6c04ab4133f94e6a69508662
+    weblogic.sha256: 869d5b8e0c547afc1f704e7a4a37ff8623be6606ec8c5e51c9555304835a6464
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -9186,6 +9186,8 @@ spec:
                       description: 'Changes to this field cause the operator to restart
                         WebLogic Server instances. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-lifecycle/startup/#restarting-servers.'
                       type: string
+                  required:
+                  - serverName
                 type: array
             type: object
           status:

operator-build-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/JsonSchemaMojo.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 
 import oracle.kubernetes.mojosupport.FileSystem;
 import org.apache.maven.plugin.AbstractMojo;
@@ -19,7 +20,6 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.jetbrains.annotations.NotNull;
 
 @Mojo(
     name = "generate",
@@ -87,7 +87,7 @@ private void generate() throws MojoExecutionException {
     }
   }
 
-  @NotNull
+  @Nonnull
   String getRootName() {
     return new File(getOutputFile()).getName().split("\\.")[0];
   }