refactor: pass TypeRef instead of Optional to CustomResourceInfo

fabric8io · Mar 12, 2021 · afab4f4 · afab4f4
1 parent 1172840
commit afab4f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/CustomResourceInfo.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/CustomResourceInfo.java
@@ -47,7 +47,7 @@ public class CustomResourceInfo {
 
   public CustomResourceInfo(String group, String version, String kind, String singular,
     String plural, String[] shortNames, boolean storage, boolean served,
-    Scope scope, Optional<TypeRef> status, TypeDef definition, String crClassName,
+    Scope scope, TypeRef status, TypeDef definition, String crClassName,
     String specClassName, String statusClassName) {
     this.group = group;
     this.version = version;
@@ -58,7 +58,7 @@ public CustomResourceInfo(String group, String version, String kind, String sing
     this.storage = storage;
     this.served = served;
     this.scope = scope;
-    this.status = status;
+    this.status = Optional.ofNullable(status);
     this.definition = definition;
     this.crClassName = crClassName;
     this.specClassName = specClassName;
@@ -157,7 +157,7 @@ public static CustomResourceInfo fromClass(Class<? extends CustomResource> custo
 
       // this works because CustomResource is an abstract class
       String specClassName = null, statusClassName = null;
-      Optional<TypeRef> statusType = Optional.empty();
+      TypeRef statusType = null;
       if (genericSuperclass instanceof ParameterizedType) {
         final Type[] types = ((ParameterizedType) genericSuperclass).getActualTypeArguments();
         if (types.length == 2) {
@@ -168,7 +168,7 @@ public static CustomResourceInfo fromClass(Class<? extends CustomResource> custo
             // load status class
             final Class<?> statusClass = Thread.currentThread().getContextClassLoader()
               .loadClass(statusClassName);
-            statusType = Optional.of(ClassTo.TYPEDEF.apply(statusClass).toReference());
+            statusType = ClassTo.TYPEDEF.apply(statusClass).toReference();
           } 
         }
       }

diff --git a/...tor/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java b/...tor/apt/src/main/java/io/fabric8/crd/generator/apt/CustomResourceAnnotationProcessor.java
@@ -87,9 +87,9 @@ private CustomResourceInfo toCustomResourceInfo(TypeElement customResource) {
       }
       final TypeElement spec = ((TypeElement) ((DeclaredType) typeArguments.get(0)).asElement());
       final TypeElement status = ((TypeElement) ((DeclaredType) typeArguments.get(1)).asElement());
-      Optional<TypeRef> statusType = Optional.empty();
+      TypeRef statusType = null;
       if (!status.getQualifiedName().contentEquals(Void.class.getCanonicalName())) {
-        statusType = Optional.of(ElementTo.TYPEDEF.apply(status).toReference());
+        statusType = ElementTo.TYPEDEF.apply(status).toReference();
       }
 
       final String group = customResource.getAnnotation(Group.class).value();