And more

Author: rjeberhard

json-schema/src/main/java/oracle/kubernetes/json/Description.java

@@ -4,13 +4,13 @@
 
 package oracle.kubernetes.json;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+
 /** Supplies a description for a field to be inserted into the generated JSON schema. */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE, FIELD})

model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

@@ -25,7 +25,8 @@ public abstract class DomainConfigurator {
 
   private Domain domain;
 
-  public DomainConfigurator() {}
+  public DomainConfigurator() {
+  }
 
   protected DomainConfigurator(Domain domain) {
     this.domain = domain;

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

@@ -329,13 +329,13 @@ public V1SecretReference getWebLogicCredentialsSecret() {
    *
    * @return domain UID
    */
-  public String getDomainUID() {
-    return Optional.ofNullable(spec.getDomainUID()).orElse(getMetadata().getName());
+  public String getDomainUid() {
+    return Optional.ofNullable(spec.getDomainUid()).orElse(getMetadata().getName());
   }
 
   public String getLogHome() {
     return Optional.ofNullable(spec.getLogHome())
-        .orElse(String.format(LOG_HOME_DEFAULT_PATTERN, getDomainUID()));
+        .orElse(String.format(LOG_HOME_DEFAULT_PATTERN, getDomainUid()));
   }
 
   public boolean getLogHomeEnabled() {
@@ -364,7 +364,7 @@ public String getDomainHome() {
     if (spec.isDomainHomeInImage()) {
       return "/u01/oracle/user_projects/domains";
     }
-    return "/shared/domains/" + getDomainUID();
+    return "/shared/domains/" + getDomainUid();
   }
 
   public boolean isShuttingDown() {

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainCommonConfigurator.java

@@ -28,7 +28,8 @@ public DomainConfigurator createFor(Domain domain) {
     return new DomainCommonConfigurator(domain);
   }
 
-  public DomainCommonConfigurator() {}
+  public DomainCommonConfigurator() {
+  }
 
   DomainCommonConfigurator(@Nonnull Domain domain) {
     super(domain);

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

@@ -12,6 +12,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1LocalObjectReference;
 import io.kubernetes.client.models.V1SecretReference;
 import oracle.kubernetes.json.Description;
@@ -37,7 +38,8 @@ public class DomainSpec extends BaseConfiguration {
       "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required."
           + " Defaults to the value of metadata.name")
   @Pattern("^[a-z0-9_.]{1,253}$")
-  private String domainUID;
+  @SerializedName("domainUID")
+  private String domainUid;
 
   /**
    * Domain home.
@@ -46,7 +48,7 @@ public class DomainSpec extends BaseConfiguration {
    */
   @Description(
       "The folder for the WebLogic Domain. Not required."
-          + " Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false"
+          + " Defaults to /shared/domains/domains/domainUid if domainHomeInImage is false"
           + " Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true")
   private String domainHome;
 
@@ -231,28 +233,28 @@ EffectiveConfigurationFactory getEffectiveConfigurationFactory(
    *
    * @return domain UID
    */
-  public String getDomainUID() {
-    return domainUID;
+  public String getDomainUid() {
+    return domainUid;
   }
 
   /**
    * Domain unique identifier. Must be unique across the Kubernetes cluster. (Not required) Defaults
    * to the value of metadata.name
    *
-   * @param domainUID domain UID
+   * @param domainUid domain UID
    */
-  public void setDomainUID(String domainUID) {
-    this.domainUID = domainUID;
+  public void setDomainUid(String domainUid) {
+    this.domainUid = domainUid;
   }
 
   /**
    * Domain unique identifier. Must be unique across the Kubernetes cluster. (Required)
    *
-   * @param domainUID domain UID
+   * @param domainUid domain UID
    * @return this
    */
-  public DomainSpec withDomainUID(String domainUID) {
-    this.domainUID = domainUID;
+  public DomainSpec withDomainUid(String domainUid) {
+    this.domainUid = domainUid;
     return this;
   }
 
@@ -505,7 +507,7 @@ public String toString() {
     ToStringBuilder builder =
         new ToStringBuilder(this)
             .appendSuper(super.toString())
-            .append("domainUID", domainUID)
+            .append("domainUid", domainUid)
             .append("domainHome", domainHome)
             .append("domainHomeInImage", domainHomeInImage)
             .append("serverStartPolicy", serverStartPolicy)
@@ -531,7 +533,7 @@ public int hashCode() {
     HashCodeBuilder builder =
         new HashCodeBuilder()
             .appendSuper(super.hashCode())
-            .append(domainUID)
+            .append(domainUid)
             .append(domainHome)
             .append(domainHomeInImage)
             .append(serverStartPolicy)
@@ -565,7 +567,7 @@ public boolean equals(Object other) {
     EqualsBuilder builder =
         new EqualsBuilder()
             .appendSuper(super.equals(other))
-            .append(domainUID, rhs.domainUID)
+            .append(domainUid, rhs.domainUid)
             .append(domainHome, rhs.domainHome)
             .append(domainHomeInImage, rhs.domainHomeInImage)
             .append(serverStartPolicy, rhs.serverStartPolicy)

model/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java

@@ -50,7 +50,7 @@ public abstract class DomainTestBase {
   protected static Domain createDomain() {
     return new Domain()
         .withMetadata(new V1ObjectMeta().namespace(NS))
-        .withSpec(new DomainSpec().withWebLogicCredentialsSecret(SECRET).withDomainUID(DOMAIN_UID));
+        .withSpec(new DomainSpec().withWebLogicCredentialsSecret(SECRET).withDomainUid(DOMAIN_UID));
   }
 
   protected abstract DomainConfigurator configureDomain(Domain domain);
@@ -70,7 +70,7 @@ public void canGetAdminServerInfoFromDomain() {
 
   @Test
   public void canGetDomainInfoFromDomain() {
-    assertThat(domain.getDomainUID(), equalTo(DOMAIN_UID));
+    assertThat(domain.getDomainUid(), equalTo(DOMAIN_UID));
   }
 
   @Test