Combine VmDefinitionModel and VmDefinition.

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/K8sDynamicModel.java

@@ -102,7 +102,7 @@ public class K8sDynamicModel implements KubernetesObject {
      *
      * @return the JSON object describing the status
      */
-    public JsonObject status() {
+    public JsonObject statusJson() {
         return data.getAsJsonObject("status");
     }
 

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinition.java

@@ -20,8 +20,10 @@ package org.jdrupes.vmoperator.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import io.kubernetes.client.openapi.JSON;
 import io.kubernetes.client.openapi.models.V1Condition;
-import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.Strings;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -46,21 +48,20 @@ import org.jdrupes.vmoperator.util.DataPath;
 /**
  * Represents a VM definition.
  */
-@SuppressWarnings({ "PMD.DataClass", "PMD.TooManyMethods" })
-public class VmDefinition {
+@SuppressWarnings({ "PMD.DataClass", "PMD.TooManyMethods",
+    "PMD.CouplingBetweenObjects" })
+public class VmDefinition extends K8sDynamicModel {
 
     @SuppressWarnings("PMD.FieldNamingConventions")
     private static final Logger logger
         = Logger.getLogger(VmDefinition.class.getName());
     @SuppressWarnings("PMD.FieldNamingConventions")
+    private static final Gson gson = new JSON().getGson();
+    @SuppressWarnings("PMD.FieldNamingConventions")
     private static final ObjectMapper objectMapper
         = new ObjectMapper().registerModule(new JavaTimeModule());
 
-    private String kind;
-    private String apiVersion;
-    private V1ObjectMeta metadata;
-    private Map<String, Object> spec;
-    private Map<String, Object> status;
+    private final Model model;
     private final Map<String, Object> extra = new ConcurrentHashMap<>();
 
     /**
@@ -145,66 +146,34 @@ public class VmDefinition {
     }
 
     /**
-     * Gets the kind.
+     * Instantiates a new vm definition.
      *
-     * @return the kind
+     * @param delegate the delegate
+     * @param json the json
      */
-    public String getKind() {
-        return kind;
+    public VmDefinition(Gson delegate, JsonObject json) {
+        super(delegate, json);
+        model = gson.fromJson(json, Model.class);
     }
 
     /**
-     * Sets the kind.
+     * Gets the spec.
      *
-     * @param kind the kind to set
+     * @return the spec
      */
-    public void setKind(String kind) {
-        this.kind = kind;
+    public Map<String, Object> spec() {
+        return model.getSpec();
     }
 
     /**
-     * Gets the api version.
+     * Get a value from the spec using {@link DataPath#get}.
      *
-     * @return the apiVersion
+     * @param <T> the generic type
+     * @param selectors the selectors
+     * @return the value, if found
      */
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    /**
-     * Sets the api version.
-     *
-     * @param apiVersion the apiVersion to set
-     */
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    /**
-     * Gets the metadata.
-     *
-     * @return the metadata
-     */
-    public V1ObjectMeta getMetadata() {
-        return metadata;
-    }
-
-    /**
-     * Gets the metadata.
-     *
-     * @return the metadata
-     */
-    public V1ObjectMeta metadata() {
-        return metadata;
-    }
-
-    /**
-     * Sets the metadata.
-     *
-     * @param metadata the metadata to set
-     */
-    public void setMetadata(V1ObjectMeta metadata) {
-        this.metadata = metadata;
+    public <T> Optional<T> fromSpec(Object... selectors) {
+        return DataPath.get(spec(), selectors);
     }
 
     /**
@@ -217,35 +186,6 @@ public class VmDefinition {
             .orElse(Collections.emptyList());
     }
 
-    /**
-     * Gets the spec.
-     *
-     * @return the spec
-     */
-    public Map<String, Object> getSpec() {
-        return spec;
-    }
-
-    /**
-     * Gets the spec.
-     *
-     * @return the spec
-     */
-    public Map<String, Object> spec() {
-        return spec;
-    }
-
-    /**
-     * Get a value from the spec using {@link DataPath#get}.
-     *
-     * @param <T> the generic type
-     * @param selectors the selectors
-     * @return the value, if found
-     */
-    public <T> Optional<T> fromSpec(Object... selectors) {
-        return DataPath.get(spec, selectors);
-    }
-
     /**
      * Get a value from the `spec().get("vm")` using {@link DataPath#get}.
      *
@@ -254,35 +194,17 @@ public class VmDefinition {
      * @return the value, if found
      */
     public <T> Optional<T> fromVm(Object... selectors) {
-        return DataPath.get(spec, "vm")
+        return DataPath.get(spec(), "vm")
             .flatMap(vm -> DataPath.get(vm, selectors));
     }
 
-    /**
-     * Sets the spec.
-     *
-     * @param spec the spec to set
-     */
-    public void setSpec(Map<String, Object> spec) {
-        this.spec = spec;
-    }
-
-    /**
-     * Gets the status.
-     *
-     * @return the status
-     */
-    public Map<String, Object> getStatus() {
-        return status;
-    }
-
     /**
      * Gets the status.
      *
      * @return the status
      */
     public Map<String, Object> status() {
-        return status;
+        return model.getStatus();
     }
 
     /**
@@ -293,16 +215,7 @@ public class VmDefinition {
      * @return the value, if found
      */
     public <T> Optional<T> fromStatus(Object... selectors) {
-        return DataPath.get(status, selectors);
-    }
-
-    /**
-     * Sets the status.
-     *
-     * @param status the status to set
-     */
-    public void setStatus(Map<String, Object> status) {
-        this.status = status;
+        return DataPath.get(status(), selectors);
     }
 
     /**
@@ -411,7 +324,7 @@ public class VmDefinition {
      * @return the string
      */
     public String name() {
-        return metadata.getName();
+        return metadata().getName();
     }
 
     /**
@@ -420,7 +333,7 @@ public class VmDefinition {
      * @return the string
      */
     public String namespace() {
-        return metadata.getNamespace();
+        return metadata().getNamespace();
     }
 
     /**
@@ -569,7 +482,7 @@ public class VmDefinition {
      */
     @Override
     public int hashCode() {
-        return Objects.hash(metadata.getNamespace(), metadata.getName());
+        return Objects.hash(metadata().getNamespace(), metadata().getName());
     }
 
     /**
@@ -590,9 +503,55 @@ public class VmDefinition {
             return false;
         }
         VmDefinition other = (VmDefinition) obj;
-        return Objects.equals(metadata.getNamespace(),
-            other.metadata.getNamespace())
-            && Objects.equals(metadata.getName(), other.metadata.getName());
+        return Objects.equals(metadata().getNamespace(),
+            other.metadata().getNamespace())
+            && Objects.equals(metadata().getName(), other.metadata().getName());
+    }
+
+    /**
+     * The Class Model.
+     */
+    public static class Model {
+
+        private Map<String, Object> spec;
+        private Map<String, Object> status;
+
+        /**
+         * Gets the spec.
+         *
+         * @return the spec
+         */
+        public Map<String, Object> getSpec() {
+            return spec;
+        }
+
+        /**
+         * Sets the spec.
+         *
+         * @param spec the spec to set
+         */
+        public void setSpec(Map<String, Object> spec) {
+            this.spec = spec;
+        }
+
+        /**
+         * Gets the status.
+         *
+         * @return the status
+         */
+        public Map<String, Object> getStatus() {
+            return status;
+        }
+
+        /**
+         * Sets the status.
+         *
+         * @param status the status to set
+         */
+        public void setStatus(Map<String, Object> status) {
+            this.status = status;
+        }
+
     }
 
 }

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionModel.java

@@ -1,39 +0,0 @@
-/*
- * VM-Operator
- * Copyright (C) 2024 Michael N. Lipp
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.jdrupes.vmoperator.common;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-/**
- * Represents a VM definition.
- */
-@SuppressWarnings("PMD.DataClass")
-public class VmDefinitionModel extends K8sDynamicModel {
-
-    /**
-     * Instantiates a new model from the JSON representation.
-     *
-     * @param delegate the gson instance to use for extracting structured data
-     * @param json the JSON
-     */
-    public VmDefinitionModel(Gson delegate, JsonObject json) {
-        super(delegate, json);
-    }
-}

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionModels.java

@@ -25,7 +25,7 @@ import com.google.gson.JsonObject;
  * Represents a list of {@link VmDefinitionModel}s.
  */
 public class VmDefinitionModels
-        extends K8sDynamicModelsBase<VmDefinitionModel> {
+        extends K8sDynamicModelsBase<VmDefinition> {
 
     /**
      * Initialize the object list using the given JSON data.
@@ -34,6 +34,6 @@ public class VmDefinitionModels
      * @param data the data
      */
     public VmDefinitionModels(Gson delegate, JsonObject data) {
-        super(VmDefinitionModel.class, delegate, data);
+        super(VmDefinition.class, delegate, data);
     }
 }

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionStub.java

@@ -33,9 +33,9 @@ import java.util.Collection;
  */
 @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
 public class VmDefinitionStub
-        extends K8sDynamicStubBase<VmDefinitionModel, VmDefinitionModels> {
+        extends K8sDynamicStubBase<VmDefinition, VmDefinitionModels> {
 
-    private static DynamicTypeAdapterFactory<VmDefinitionModel,
+    private static DynamicTypeAdapterFactory<VmDefinition,
             VmDefinitionModels> taf = new VmDefintionModelTypeAdapterFactory();
 
     /**
@@ -48,7 +48,7 @@ public class VmDefinitionStub
      */
     public VmDefinitionStub(K8sClient client, APIResource context,
             String namespace, String name) {
-        super(VmDefinitionModel.class, VmDefinitionModels.class, taf, client,
+        super(VmDefinition.class, VmDefinitionModels.class, taf, client,
             context, namespace, name);
     }
 
@@ -101,9 +101,9 @@ public class VmDefinitionStub
      */
     public static VmDefinitionStub createFromYaml(K8sClient client,
             APIResource context, Reader yaml) throws ApiException {
-        var model = new VmDefinitionModel(client.getJSON().getGson(),
+        var model = new VmDefinition(client.getJSON().getGson(),
             K8s.yamlToJson(client, yaml));
-        return K8sGenericStub.create(VmDefinitionModel.class,
+        return K8sGenericStub.create(VmDefinition.class,
             VmDefinitionModels.class, client, context, model,
             (c, ns, n) -> new VmDefinitionStub(c, context, ns, n));
     }
@@ -121,7 +121,7 @@ public class VmDefinitionStub
     public static Collection<VmDefinitionStub> list(K8sClient client,
             APIResource context, String namespace, ListOptions options)
             throws ApiException {
-        return K8sGenericStub.list(VmDefinitionModel.class,
+        return K8sGenericStub.list(VmDefinition.class,
             VmDefinitionModels.class, client, context, namespace, options,
             (c, ns, n) -> new VmDefinitionStub(c, context, ns, n));
     }
@@ -144,13 +144,13 @@ public class VmDefinitionStub
      * A factory for creating VmDefinitionModel(s) objects.
      */
     public static class VmDefintionModelTypeAdapterFactory extends
-            DynamicTypeAdapterFactory<VmDefinitionModel, VmDefinitionModels> {
+            DynamicTypeAdapterFactory<VmDefinition, VmDefinitionModels> {
 
         /**
          * Instantiates a new dynamic model type adapter factory.
          */
         public VmDefintionModelTypeAdapterFactory() {
-            super(VmDefinitionModel.class, VmDefinitionModels.class);
+            super(VmDefinition.class, VmDefinitionModels.class);
         }
     }