removed delegator support

Author: hwellmann

ramler-gradle-plugin/src/main/java/org/ops4j/ramler/gradle/AbstractRamlerJavaGenerator.java

@@ -46,16 +46,8 @@ public abstract class AbstractRamlerJavaGenerator extends AbstractRamlerTask {
 
     private boolean jacksonPropertyName;
 
-    /**
-     */
     private boolean jacksonUnion;
 
-    private boolean delegators;
-
-    private String delegatorSuffix;
-
-    private String delegateFieldName;
-
     /**
      * Gets the fully qualified package name for generated Java sources. The generated classes will be
      * located in subpackages {@code model} and {@code api}.
@@ -181,68 +173,6 @@ public void setJacksonUnion(boolean jacksonUnion) {
         this.jacksonUnion = jacksonUnion;
     }
 
-    /**
-     * Gets the delegators.
-     *
-     * @return the delegators
-     */
-    @Input
-    public boolean isDelegators() {
-        return delegators;
-    }
-
-    /**
-     * Sets the delegators.
-     *
-     * @param delegators
-     *            the delegators to set
-     */
-    public void setDelegators(boolean delegators) {
-        this.delegators = delegators;
-    }
-
-    /**
-     * Gets the delegatorSuffix.
-     *
-     * @return the delegatorSuffix
-     */
-    @Input
-    @Optional
-    public String getDelegatorSuffix() {
-        return delegatorSuffix;
-    }
-
-    /**
-     * Sets the delegatorSuffix.
-     *
-     * @param delegatorSuffix
-     *            the delegatorSuffix to set
-     */
-    public void setDelegatorSuffix(String delegatorSuffix) {
-        this.delegatorSuffix = delegatorSuffix;
-    }
-
-    /**
-     * Gets the delegateFieldName.
-     *
-     * @return the delegateFieldName
-     */
-    @Input
-    @Optional
-    public String getDelegateFieldName() {
-        return delegateFieldName;
-    }
-
-    /**
-     * Sets the delegateFieldName.
-     *
-     * @param delegateFieldName
-     *            the delegateFieldName to set
-     */
-    public void setDelegateFieldName(String delegateFieldName) {
-        this.delegateFieldName = delegateFieldName;
-    }
-
     protected abstract String getDefaultOutputSubdir();
 
     protected abstract String getSourceSet();
@@ -262,9 +192,6 @@ public void generate() {
         config.setJacksonTypeInfo(jacksonTypeInfo);
         config.setJacksonPropertyName(jacksonPropertyName);
         config.setJacksonUnion(jacksonUnion);
-        config.setDelegators(delegators);
-        config.setDelegateFieldName(delegateFieldName);
-        config.setDelegatorSuffix(delegatorSuffix);
 
         JavaPluginConvention javaPluginConvention = getProject().getConvention()
             .getPlugin(JavaPluginConvention.class);

ramler-java/src/main/java/org/ops4j/ramler/java/DelegatorGenerator.java

@@ -50,12 +50,6 @@ public class JavaConfiguration {
 
     private boolean jacksonUnion;
 
-    private boolean delegators;
-
-    private String delegatorSuffix;
-
-    private String delegateFieldName;
-
     /**
      * Gets the name of the base package for all subpackages created by the code generator.
      *
@@ -269,53 +263,6 @@ public void setJacksonPropertyName(boolean jacksonPropertyName) {
         this.jacksonPropertyName = jacksonPropertyName;
     }
 
-    /**
-     * @return the delegators
-     */
-    public boolean isDelegators() {
-        return delegators;
-    }
-
-    /**
-     * @param delegators
-     *            the delegators to set
-     */
-    public void setDelegators(boolean delegators) {
-        this.delegators = delegators;
-    }
-
-    /**
-     * @return the delegatorSuffix
-     */
-    public String getDelegatorSuffix() {
-        return Optional.ofNullable(delegatorSuffix)
-            .orElse("Delegator");
-    }
-
-    /**
-     * @param delegatorSuffix
-     *            the delegatorSuffix to set
-     */
-    public void setDelegatorSuffix(String delegatorSuffix) {
-        this.delegatorSuffix = delegatorSuffix;
-    }
-
-    /**
-     * @return the delegateFieldName
-     */
-    public String getDelegateFieldName() {
-        return Optional.ofNullable(delegateFieldName)
-            .orElse("delegate");
-    }
-
-    /**
-     * @param delegateFieldName
-     *            the delegateFieldName to set
-     */
-    public void setDelegateFieldName(String delegateFieldName) {
-        this.delegateFieldName = delegateFieldName;
-    }
-
     /**
      * Should Jackson annotations {@code @JsonSerializer} etc. be used for union types?
      *

ramler-java/src/main/java/org/ops4j/ramler/java/JavaConfiguration.java

@@ -80,8 +80,6 @@ public class PojoGeneratingApiVisitor implements ApiVisitor {
 
     private EnumGenerator enumGenerator;
 
-    private DelegatorGenerator delegatorGenerator;
-
     private UnionGenerator unionGenerator;
 
     private NameFactory nameFactory;
@@ -97,7 +95,6 @@ public PojoGeneratingApiVisitor(JavaGeneratorContext context) {
         this.codeModel = context.getCodeModel();
         this.pkg = context.getModelPackage();
         this.enumGenerator = new EnumGenerator(context);
-        this.delegatorGenerator = new DelegatorGenerator(context);
         this.unionGenerator = new UnionGenerator(context);
         this.nameFactory = new JavaNameFactory();
     }
@@ -117,29 +114,11 @@ public void visitObjectTypeStart(ObjectTypeDeclaration type) {
         addMixinProperties(klass, type);
     }
 
-    @Override
-    public void visitObjectTypeEnd(ObjectTypeDeclaration type) {
-        if (context.getConfig()
-            .isDelegators()) {
-            JDefinedClass klass = pkg._getClass(type.name());
-            if (klass != null) {
-                generateDelegator(klass);
-            }
-        }
-    }
-
     @Override
     public void visitUnionType(UnionTypeDeclaration type) {
         unionGenerator.generateUnionClass(type);
     }
 
-    /**
-     * @param klass
-     */
-    private void generateDelegator(JDefinedClass klass) {
-        delegatorGenerator.generateDelegator(klass);
-    }
-
     private void addBaseClass(JDefinedClass klass, ObjectTypeDeclaration type) {
         TypeDeclaration parentType = type.parentTypes()
             .get(0);

ramler-java/src/main/java/org/ops4j/ramler/java/PojoGeneratingApiVisitor.java

@@ -30,8 +30,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.ops4j.ramler.java.JavaConfiguration;
-import org.ops4j.ramler.java.JavaGenerator;
 
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JAnnotationValue;
@@ -62,7 +60,6 @@ public void generateJavaModel() {
         config.setSourceFile(String.format("raml/%s.raml", getBasename()));
         config.setBasePackage(String.format("org.ops4j.raml.%s", getBasename()));
         config.setTargetDir(new File("target/generated/raml"));
-        config.setDelegators(true);
         config.setJacksonUnion(true);
 
         generator = new JavaGenerator(config);

ramler-java/src/test/java/org/ops4j/ramler/java/AbstractGeneratorTest.java

@@ -96,9 +96,6 @@ protected void generateOutput() throws MojoFailureException {
         config.setJacksonTypeInfo(jacksonTypeInfo);
         config.setJacksonPropertyName(jacksonPropertyName);
         config.setJacksonUnion(jacksonUnion);
-        config.setDelegators(delegators);
-        config.setDelegateFieldName(delegateFieldName);
-        config.setDelegatorSuffix(delegatorSuffix);
 
         try {
             JavaGenerator generator = new JavaGenerator(config);