Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not generate union builders
[mdsal.git]
/
binding
/
mdsal-binding-java-api-generator
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
binding
/
java
/
api
/
generator
/
JavaFileGenerator.java
diff --git
a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java
b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java
index 1cdf881d001dc215ca2c7f3e675be6895547a0de..788239eee816cf8e825283ffcd3795cb6b5d050e 100644
(file)
--- a/
binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java
+++ b/
binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java
@@
-22,7
+22,6
@@
import java.util.ServiceLoader;
import java.util.Set;
import org.opendaylight.mdsal.binding.generator.BindingGenerator;
import org.opendaylight.mdsal.binding.model.api.CodeGenerator;
import java.util.Set;
import org.opendaylight.mdsal.binding.generator.BindingGenerator;
import org.opendaylight.mdsal.binding.model.api.CodeGenerator;
-import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
import org.opendaylight.mdsal.binding.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
import org.opendaylight.mdsal.binding.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
@@
-109,9
+108,6
@@
final class JavaFileGenerator implements FileGenerator {
continue;
}
continue;
}
- final GeneratedFileLifecycle kind = type instanceof GeneratedTransferObject
- && ((GeneratedTransferObject) type).isUnionTypeBuilder()
- ? GeneratedFileLifecycle.PERSISTENT : GeneratedFileLifecycle.TRANSIENT;
final GeneratedFilePath file = GeneratedFilePath.ofFilePath(
type.getPackageName().replace('.', File.separatorChar)
+ File.separator + generator.getUnitName(type) + ".java");
final GeneratedFilePath file = GeneratedFilePath.ofFilePath(
type.getPackageName().replace('.', File.separatorChar)
+ File.separator + generator.getUnitName(type) + ".java");
@@
-122,11
+118,12
@@
final class JavaFileGenerator implements FileGenerator {
+ "generated.", type.getFullyQualifiedName());
continue;
}
+ "generated.", type.getFullyQualifiedName());
continue;
}
- throw new IllegalStateException("Duplicate
" + kind + "
file '" + file.getPath() + "' for "
-
+ type.getFullyQualifiedName());
+ throw new IllegalStateException("Duplicate file '" + file.getPath() + "' for "
+ + type.getFullyQualifiedName());
}
}
- result.put(GeneratedFileType.SOURCE, file, new CodeGeneratorGeneratedFile(kind, generator, type));
+ result.put(GeneratedFileType.SOURCE, file,
+ new CodeGeneratorGeneratedFile(GeneratedFileLifecycle.TRANSIENT, generator, type));
}
}
}
}