Always initialize spec and status of CRs

eclipse-theia · Mar 7, 2024 · 582ee44 · 582ee44
1 parent 027b622
commit 582ee44
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 55 deletions.
diff --git a/...rc/main/java/org/eclipse/theia/cloud/common/k8s/resource/appdefinition/AppDefinition.java b/...rc/main/java/org/eclipse/theia/cloud/common/k8s/resource/appdefinition/AppDefinition.java
@@ -45,7 +45,8 @@ public String toString() {
  }
 
  public AppDefinition() {
-
+ this.spec = new AppDefinitionSpec();
+ this.status = new AppDefinitionStatus();
  }
 
  public AppDefinition(AppDefinitionHub fromHub) {
@@ -56,13 +57,4 @@ public AppDefinition(AppDefinitionHub fromHub) {
  this.status = new AppDefinitionStatus(fromHub);
  }
 
- @Override
- public AppDefinitionStatus getStatus() {
- AppDefinitionStatus status = super.getStatus();
- if (status == null) {
- status = new AppDefinitionStatus();
- }
- return status;
- }
-
 }
diff --git a/...g/eclipse/theia/cloud/common/k8s/resource/appdefinition/v1beta8/AppDefinitionV1beta8.java b/...g/eclipse/theia/cloud/common/k8s/resource/appdefinition/v1beta8/AppDefinitionV1beta8.java
@@ -47,6 +47,8 @@ public String toString() {
  }
 
  public AppDefinitionV1beta8() {
+ this.spec = new AppDefinitionV1beta8Spec();
+ this.status = new AppDefinitionV1beta8Status();
 
  }
 
@@ -58,13 +60,4 @@ public AppDefinitionV1beta8(AppDefinitionHub fromHub) {
  this.status = new AppDefinitionV1beta8Status(fromHub);
  }
 
- @Override
- public AppDefinitionV1beta8Status getStatus() {
- AppDefinitionV1beta8Status status = super.getStatus();
- if (status == null) {
- status = new AppDefinitionV1beta8Status();
- }
- return status;
- }
-
 }
diff --git a/...oud.common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/session/Session.java b/...oud.common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/session/Session.java
@@ -40,6 +40,8 @@ public class Session extends CustomResource<SessionSpec, SessionStatus> implemen
  public static final String CRD_NAME = "sessions.theia.cloud";
 
  public Session() {
+ this.spec = new SessionSpec();
+ this.status = new SessionStatus();
  }
 
  public Session(SessionHub fromHub) {
@@ -54,13 +56,4 @@ public Session(SessionHub fromHub) {
  public String toString() {
  return CustomResourceUtil.toString(this);
  }
-
- @Override
- public SessionStatus getStatus() {
- SessionStatus status = super.getStatus();
- if (status == null) {
- status = new SessionStatus();
- }
- return status;
- }
 }
diff --git a/...main/java/org/eclipse/theia/cloud/common/k8s/resource/session/v1beta6/SessionV1beta6.java b/...main/java/org/eclipse/theia/cloud/common/k8s/resource/session/v1beta6/SessionV1beta6.java
@@ -41,6 +41,8 @@ public class SessionV1beta6 extends CustomResource<SessionV1beta6Spec, SessionV1
  public static final String CRD_NAME = "sessions.theia.cloud";
 
  public SessionV1beta6() {
+ this.spec = new SessionV1beta6Spec();
+ this.status = new SessionV1beta6Status();
  }
 
  public SessionV1beta6(SessionHub fromHub) {
@@ -56,13 +58,4 @@ public String toString() {
  return CustomResourceUtil.toString(this);
  }
 
- @Override
- public SessionV1beta6Status getStatus() {
- SessionV1beta6Status status = super.getStatus();
- if (status == null) {
- status = new SessionV1beta6Status();
- }
- return status;
- }
-
 }
diff --git a/...common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/workspace/Workspace.java b/...common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/workspace/Workspace.java
@@ -40,6 +40,8 @@ public class Workspace extends CustomResource<WorkspaceSpec, WorkspaceStatus> im
  private static final long serialVersionUID = 6437279756051357397L;
 
  public Workspace() {
+ this.spec = new WorkspaceSpec();
+ this.status = new WorkspaceStatus();
  }
 
  public Workspace(WorkspaceHub fromHub) {
@@ -55,13 +57,4 @@ public String toString() {
  return CustomResourceUtil.toString(this);
  }
 
- @Override
- public WorkspaceStatus getStatus() {
- WorkspaceStatus status = super.getStatus();
- if (status == null) {
- status = new WorkspaceStatus();
- }
- return status;
- }
-
 }
diff --git a/.../java/org/eclipse/theia/cloud/common/k8s/resource/workspace/v1beta3/WorkspaceV1beta3.java b/.../java/org/eclipse/theia/cloud/common/k8s/resource/workspace/v1beta3/WorkspaceV1beta3.java
@@ -42,6 +42,8 @@ public class WorkspaceV1beta3 extends CustomResource<WorkspaceV1beta3Spec, Works
  private static final long serialVersionUID = 6437279756051357397L;
 
  public WorkspaceV1beta3() {
+ this.spec = new WorkspaceV1beta3Spec();
+ this.status = new WorkspaceV1beta3Status();
  }
 
  public WorkspaceV1beta3(WorkspaceHub fromHub) {
@@ -57,13 +59,4 @@ public String toString() {
  return CustomResourceUtil.toString(this);
  }
 
- @Override
- public WorkspaceV1beta3Status getStatus() {
- WorkspaceV1beta3Status status = super.getStatus();
- if (status == null) {
- status = new WorkspaceV1beta3Status();
- }
- return status;
- }
-
 }