refactor: separate model generator from builders

marcnuri-forks · Apr 26, 2021 · c79fd8b · c79fd8b
1 parent 4dbb7c7
commit c79fd8b
Show file tree

Hide file tree

Showing 251 changed files with 5,038 additions and 6,927 deletions.
diff --git a/annotations/builder/src/main/java/io/sundr/builder/Constants.java b/annotations/builder/src/main/java/io/sundr/builder/Constants.java
@@ -30,14 +30,14 @@
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.ExternalBuildables;
 import io.sundr.codegen.functions.Collections;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.AttributeKey;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeParamRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.AttributeKey;
+import io.sundr.model.ClassRef;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeParamRef;
 
 public class Constants {
 

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/BuildableRepository.java b/annotations/builder/src/main/java/io/sundr/builder/internal/BuildableRepository.java
@@ -23,9 +23,9 @@
 import java.util.Set;
 
 import io.sundr.codegen.functions.GetDefinition;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.ClassRef;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeRef;
 
 public class BuildableRepository {
 

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/BuilderContext.java b/annotations/builder/src/main/java/io/sundr/builder/internal/BuilderContext.java
@@ -30,9 +30,9 @@
 import io.sundr.codegen.ReplacePackage;
 import io.sundr.codegen.functions.ClassTo;
 import io.sundr.codegen.functions.Sources;
-import io.sundr.codegen.model.Kind;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
+import io.sundr.model.Kind;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
 import io.sundr.codegen.utils.TypeUtils;
 
 public class BuilderContext {

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ClazzAs.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ClazzAs.java
@@ -41,21 +41,21 @@
 import io.sundr.codegen.CodegenContext;
 import io.sundr.codegen.functions.ClassTo;
 import io.sundr.codegen.functions.GetDefinition;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.Block;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.MethodBuilder;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.Statement;
-import io.sundr.codegen.model.StringStatement;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeParamDef;
-import io.sundr.codegen.model.TypeParamRef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.Block;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Method;
+import io.sundr.model.MethodBuilder;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.Statement;
+import io.sundr.model.StringStatement;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeParamDef;
+import io.sundr.model.TypeParamRef;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.Getter;
 import io.sundr.codegen.utils.Setter;
 import io.sundr.codegen.utils.StringUtils;

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/Construct.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/Construct.java
@@ -22,9 +22,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.Method;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.StringUtils;
 
 public class Construct implements Function<List<String>, String> {

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/Descendants.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/Descendants.java
@@ -40,14 +40,14 @@
 import io.sundr.builder.internal.visitors.InitEnricher;
 import io.sundr.codegen.functions.GetDefinition;
 import io.sundr.codegen.functions.TypeAssignalbe;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Kind;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Kind;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeRef;
 
 public class Descendants {
 

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/PropertyAs.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/PropertyAs.java
@@ -38,19 +38,19 @@
 import io.sundr.builder.internal.BuilderContextManager;
 import io.sundr.builder.internal.utils.BuilderUtils;
 import io.sundr.codegen.functions.GetDefinition;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Kind;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.MethodBuilder;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.Statement;
-import io.sundr.codegen.model.StringStatement;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeParamDef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Kind;
+import io.sundr.model.Method;
+import io.sundr.model.MethodBuilder;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.Statement;
+import io.sundr.model.StringStatement;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeParamDef;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.TypeUtils;
 
 public final class PropertyAs {

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
@@ -45,10 +45,10 @@
 import static io.sundr.codegen.functions.Collections.IS_LIST;
 import static io.sundr.codegen.functions.Collections.IS_MAP;
 import static io.sundr.codegen.functions.Collections.IS_SET;
-import static io.sundr.codegen.model.Attributeable.ALSO_IMPORT;
-import static io.sundr.codegen.model.Attributeable.INIT;
-import static io.sundr.codegen.model.Attributeable.INIT_FUNCTION;
-import static io.sundr.codegen.model.Attributeable.LAZY_INIT;
+import static io.sundr.model.Attributeable.ALSO_IMPORT;
+import static io.sundr.model.Attributeable.INIT;
+import static io.sundr.model.Attributeable.INIT_FUNCTION;
+import static io.sundr.model.Attributeable.LAZY_INIT;
 import static io.sundr.codegen.utils.StringUtils.capitalizeFirst;
 import static io.sundr.codegen.utils.StringUtils.loadResourceQuietly;
 import static io.sundr.codegen.utils.TypeUtils.isAbstract;
@@ -81,20 +81,20 @@
 import io.sundr.codegen.DefinitionRepository;
 import io.sundr.codegen.functions.GetDefinition;
 import io.sundr.codegen.functions.Singularize;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.Attributeable;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.EditableMethod;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.MethodBuilder;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.Statement;
-import io.sundr.codegen.model.StringStatement;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeParamDef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.Attributeable;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.EditableMethod;
+import io.sundr.model.Method;
+import io.sundr.model.MethodBuilder;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.Statement;
+import io.sundr.model.StringStatement;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeParamDef;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.Getter;
 import io.sundr.codegen.utils.StringUtils;
 import io.sundr.codegen.utils.TypeUtils;

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToPojo.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToPojo.java
@@ -24,9 +24,9 @@
 import static io.sundr.builder.internal.functions.ClazzAs.BUILDER;
 import static io.sundr.builder.internal.functions.ClazzAs.POJO;
 import static io.sundr.builder.internal.utils.BuilderUtils.findBuildableConstructor;
-import static io.sundr.codegen.model.Attributeable.ALSO_IMPORT;
-import static io.sundr.codegen.model.Attributeable.DEFAULT_VALUE;
-import static io.sundr.codegen.model.Attributeable.INIT;
+import static io.sundr.model.Attributeable.ALSO_IMPORT;
+import static io.sundr.model.Attributeable.DEFAULT_VALUE;
+import static io.sundr.model.Attributeable.INIT;
 import static io.sundr.codegen.utils.StringUtils.loadResourceQuietly;
 import static io.sundr.codegen.utils.TypeUtils.modifiersToInt;
 import static java.util.stream.Collectors.*;
@@ -64,23 +64,23 @@
 import io.sundr.codegen.functions.Collections;
 import io.sundr.codegen.functions.ElementTo;
 import io.sundr.codegen.functions.GetDefinition;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.AnnotationRefBuilder;
-import io.sundr.codegen.model.AttributeKey;
-import io.sundr.codegen.model.Attributeable;
-import io.sundr.codegen.model.Block;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.MethodBuilder;
-import io.sundr.codegen.model.PrimitiveRef;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.Statement;
-import io.sundr.codegen.model.StringStatement;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.AnnotationRefBuilder;
+import io.sundr.model.AttributeKey;
+import io.sundr.model.Attributeable;
+import io.sundr.model.Block;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Method;
+import io.sundr.model.MethodBuilder;
+import io.sundr.model.PrimitiveRef;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.Statement;
+import io.sundr.model.StringStatement;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.Getter;
 import io.sundr.codegen.utils.StringUtils;
 import io.sundr.codegen.utils.TypeUtils;

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/TypeAs.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/TypeAs.java
@@ -29,7 +29,7 @@
 import io.sundr.builder.internal.BuilderContext;
 import io.sundr.builder.internal.BuilderContextManager;
 import io.sundr.codegen.functions.Collections;
-import io.sundr.codegen.model.*;
+import io.sundr.model.*;
 import io.sundr.codegen.utils.TypeUtils;
 
 public class TypeAs {

diff --git a/...s/builder/src/main/java/io/sundr/builder/internal/processor/AbstractBuilderProcessor.java b/...s/builder/src/main/java/io/sundr/builder/internal/processor/AbstractBuilderProcessor.java
@@ -46,15 +46,15 @@
 import io.sundr.builder.internal.functions.TypeAs;
 import io.sundr.builder.internal.utils.BuilderUtils;
 import io.sundr.codegen.DefinitionRepository;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.MethodBuilder;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Method;
+import io.sundr.model.MethodBuilder;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.processor.JavaGeneratingProcessor;
 import io.sundr.codegen.utils.TypeUtils;
 

diff --git a/...tations/builder/src/main/java/io/sundr/builder/internal/processor/BuildableProcessor.java b/...tations/builder/src/main/java/io/sundr/builder/internal/processor/BuildableProcessor.java
@@ -42,9 +42,9 @@
 import io.sundr.builder.internal.BuilderContextManager;
 import io.sundr.builder.internal.utils.BuilderUtils;
 import io.sundr.codegen.functions.ElementTo;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
 import io.sundr.codegen.utils.ModelUtils;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)

diff --git a/...builder/src/main/java/io/sundr/builder/internal/processor/ExternalBuildableProcessor.java b/...builder/src/main/java/io/sundr/builder/internal/processor/ExternalBuildableProcessor.java
@@ -48,10 +48,10 @@
 import io.sundr.builder.internal.BuilderContextManager;
 import io.sundr.builder.internal.utils.BuilderUtils;
 import io.sundr.codegen.functions.ElementTo;
-import io.sundr.codegen.model.Kind;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
+import io.sundr.model.Kind;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
 import io.sundr.codegen.utils.ModelUtils;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)

diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/utils/BuilderUtils.java b/annotations/builder/src/main/java/io/sundr/builder/internal/utils/BuilderUtils.java
@@ -19,10 +19,10 @@
 import static io.sundr.builder.Constants.DESCENDANTS;
 import static io.sundr.builder.Constants.LAZY_COLLECTIONS_INIT_ENABLED;
 import static io.sundr.builder.internal.functions.TypeAs.*;
-import static io.sundr.codegen.model.Attributeable.ALSO_IMPORT;
-import static io.sundr.codegen.model.Attributeable.DEFAULT_VALUE;
-import static io.sundr.codegen.model.Attributeable.INIT;
-import static io.sundr.codegen.model.Attributeable.LAZY_INIT;
+import static io.sundr.model.Attributeable.ALSO_IMPORT;
+import static io.sundr.model.Attributeable.DEFAULT_VALUE;
+import static io.sundr.model.Attributeable.INIT;
+import static io.sundr.model.Attributeable.LAZY_INIT;
 import static io.sundr.codegen.utils.StringUtils.capitalizeFirst;
 import static io.sundr.codegen.utils.TypeUtils.isAbstract;
 
@@ -56,22 +56,22 @@
 import io.sundr.codegen.functions.ElementTo;
 import io.sundr.codegen.functions.GetDefinition;
 import io.sundr.codegen.functions.Optionals;
-import io.sundr.codegen.model.AnnotationRef;
-import io.sundr.codegen.model.Attributeable;
-import io.sundr.codegen.model.ClassRef;
-import io.sundr.codegen.model.ClassRefBuilder;
-import io.sundr.codegen.model.Kind;
-import io.sundr.codegen.model.Method;
-import io.sundr.codegen.model.Property;
-import io.sundr.codegen.model.PropertyBuilder;
-import io.sundr.codegen.model.Statement;
-import io.sundr.codegen.model.StringStatement;
-import io.sundr.codegen.model.TypeDef;
-import io.sundr.codegen.model.TypeDefBuilder;
-import io.sundr.codegen.model.TypeParamDef;
-import io.sundr.codegen.model.TypeParamDefBuilder;
-import io.sundr.codegen.model.TypeParamRef;
-import io.sundr.codegen.model.TypeRef;
+import io.sundr.model.AnnotationRef;
+import io.sundr.model.Attributeable;
+import io.sundr.model.ClassRef;
+import io.sundr.model.ClassRefBuilder;
+import io.sundr.model.Kind;
+import io.sundr.model.Method;
+import io.sundr.model.Property;
+import io.sundr.model.PropertyBuilder;
+import io.sundr.model.Statement;
+import io.sundr.model.StringStatement;
+import io.sundr.model.TypeDef;
+import io.sundr.model.TypeDefBuilder;
+import io.sundr.model.TypeParamDef;
+import io.sundr.model.TypeParamDefBuilder;
+import io.sundr.model.TypeParamRef;
+import io.sundr.model.TypeRef;
 import io.sundr.codegen.utils.TypeUtils;
 
 public class BuilderUtils {