From 4c1baf45998b8d3ea94a0a35e74e54a072be6367 Mon Sep 17 00:00:00 2001 From: Jie Han Date: Thu, 1 Mar 2018 13:53:27 +0800 Subject: [PATCH] Binding v2 - Optimize acceptable condition for BuilderGenerator - Since GeneratedTypeForBuilder mark a type which has its builder, it is nice to use it for judgment. Change-Id: Ia09f49b7c3cd88f6bfa606a78d6c108f23d306bd Signed-off-by: Jie Han --- .../java/api/generator/BuilderGenerator.java | 16 +++------------- .../java/api/generator/GeneratorJavaFile.java | 1 - 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java index f0a17b82f6..d197d21e4d 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java @@ -13,6 +13,7 @@ import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.Builde import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTypeForBuilder; import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.mdsal.binding.javav2.model.api.UnitName; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; @@ -34,7 +35,7 @@ public final class BuilderGenerator implements CodeGenerator { @Override public String generate(Type type) { - if ((type instanceof GeneratedType) && !(type instanceof GeneratedTransferObject)) { + if (type instanceof GeneratedTypeForBuilder) { final GeneratedType genType = (GeneratedType) type; return new BuilderRenderer(genType).generateTemplate(); } else { @@ -44,18 +45,7 @@ public final class BuilderGenerator implements CodeGenerator { @Override public boolean isAcceptable(Type type) { - if (type instanceof GeneratedType && !(type instanceof GeneratedTransferObject)) { - for (Type t : ((GeneratedType) type).getImplements()) { - // "rpc" and "grouping" elements do not implement Augmentable - if (t.getFullyQualifiedName().equals(Augmentable.class.getName())) { - return true; - } else if (t.getFullyQualifiedName().equals(Augmentation.class.getName())) { - return true; - } - - } - } - return false; + return type instanceof GeneratedTypeForBuilder; } @Override diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java index 74cb9215b1..99d814143f 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java @@ -187,7 +187,6 @@ public final class GeneratorJavaFile { if (generator.isAcceptable(type)) { File packageDir; if (generator instanceof BuilderGenerator) { - Preconditions.checkState(type instanceof GeneratedTypeForBuilder, type.getFullyQualifiedName()); packageDir = packageToDirectory(parentDir, ((GeneratedTypeForBuilder)type).getPackageNameForBuilder()); } else { packageDir = packageToDirectory(parentDir, type.getPackageName()); -- 2.36.6