- 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 <han.jie@zte.com.cn>
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.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;
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;
@Override
public String generate(Type type) {
@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 {
final GeneratedType genType = (GeneratedType) type;
return new BuilderRenderer(genType).generateTemplate();
} else {
@Override
public boolean isAcceptable(Type type) {
@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;
if (generator.isAcceptable(type)) {
File packageDir;
if (generator instanceof BuilderGenerator) {
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());
packageDir = packageToDirectory(parentDir, ((GeneratedTypeForBuilder)type).getPackageNameForBuilder());
} else {
packageDir = packageToDirectory(parentDir, type.getPackageName());