Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Unify GeneratedType verification
[mdsal.git]
/
binding
/
mdsal-binding-generator
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
binding
/
generator
/
impl
/
reactor
/
IdentityGenerator.java
diff --git
a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java
b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java
index efffb79ecc0b9e4e018eaee8cda25994fd8e76e4..9ead95229f34c61dbdddbf954f5eb6ad0da19d65 100644
(file)
--- a/
binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java
+++ b/
binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java
@@
-7,7
+7,6
@@
*/
package org.opendaylight.mdsal.binding.generator.impl.reactor;
*/
package org.opendaylight.mdsal.binding.generator.impl.reactor;
-import static com.google.common.base.Verify.verify;
import static org.opendaylight.mdsal.binding.model.ri.BindingTypes.BASE_IDENTITY;
import java.util.List;
import static org.opendaylight.mdsal.binding.model.ri.BindingTypes.BASE_IDENTITY;
import java.util.List;
@@
-15,11
+14,11
@@
import java.util.stream.Collectors;
import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultIdentityRuntimeType;
import org.opendaylight.mdsal.binding.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultIdentityRuntimeType;
import org.opendaylight.mdsal.binding.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase;
import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType;
import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase;
import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType;
-import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
import org.opendaylight.yangtools.yang.binding.BaseIdentity;
import org.opendaylight.yangtools.yang.binding.BaseIdentity;
+import org.opendaylight.yangtools.yang.binding.contract.Naming;
+import org.opendaylight.yangtools.yang.binding.contract.StatementNamespace;
import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement;
import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement;
import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
@@
-55,22
+54,24
@@
public final class IdentityGenerator
@Override
GeneratedType createTypeImpl(final TypeBuilderFactory builderFactory) {
@Override
GeneratedType createTypeImpl(final TypeBuilderFactory builderFactory) {
- final
GeneratedTypeBuilde
r builder = builderFactory.newGeneratedTypeBuilder(typeName());
+ final
va
r builder = builderFactory.newGeneratedTypeBuilder(typeName());
if (!baseIdentities.isEmpty()) {
if (!baseIdentities.isEmpty()) {
- for (
IdentityGenerato
r baseIdentity : baseIdentities) {
+ for (
va
r baseIdentity : baseIdentities) {
builder.addImplementsType(baseIdentity.getGeneratedType(builderFactory));
}
} else {
builder.addImplementsType(BASE_IDENTITY);
}
builder.addImplementsType(baseIdentity.getGeneratedType(builderFactory));
}
} else {
builder.addImplementsType(BASE_IDENTITY);
}
+ annotateDeprecatedIfNecessary(statement(), builder);
+
narrowImplementedInterface(builder);
narrowImplementedInterface(builder);
- final
ModuleGenerato
r module = currentModule();
+ final
va
r module = currentModule();
module.addQNameConstant(builder, localName());
// Constant implementation
module.addQNameConstant(builder, localName());
// Constant implementation
- builder.addConstant(Type.of(builder),
BindingMapp
ing.VALUE_STATIC_FIELD_NAME, BaseIdentity.class);
+ builder.addConstant(Type.of(builder),
Nam
ing.VALUE_STATIC_FIELD_NAME, BaseIdentity.class);
builderFactory.addCodegenInformation(module, statement(), builder);
builder.setModuleName(module.statement().argument().getLocalName());
builderFactory.addCodegenInformation(module, statement(), builder);
builder.setModuleName(module.statement().argument().getLocalName());
@@
-79,15
+80,9
@@
public final class IdentityGenerator
return builder.build();
}
return builder.build();
}
- @Override
- GeneratedType runtimeJavaType() {
- return generatedType().orElse(null);
- }
-
@Override
IdentityRuntimeType createExternalRuntimeType(final Type type) {
@Override
IdentityRuntimeType createExternalRuntimeType(final Type type) {
- verify(type instanceof GeneratedType, "Unexpected type %s", type);
- return new DefaultIdentityRuntimeType((GeneratedType) type, statement());
+ return new DefaultIdentityRuntimeType(verifyGeneratedType(type), statement());
}
@Override
}
@Override