X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fgenerator%2Fimpl%2FBindingGeneratorImpl.java;h=2235bfb2a32c7dd3fa75b887939af0e428b99827;hb=d067191495a9515e157eed95b02cd32e63e74cf3;hp=b89dbb44ac786756b60d866c02459097bbe615b4;hpb=e30d97d88520c217de770a3aa8e29b6590af349a;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java index b89dbb44ac..2235bfb2a3 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java @@ -334,7 +334,7 @@ public final class BindingGeneratorImpl implements BindingGenerator { final Type rpcRes = Types.parameterizedTypeFor( Types.typeForClass(RpcResult.class), outTypeInstance); - method.addReturnType(Types.parameterizedTypeFor(future, rpcRes)); + method.setReturnType(Types.parameterizedTypeFor(future, rpcRes)); for (DataNodeIterator it : rpcInOut) { List nContainers = it.allContainers(); if ((nContainers != null) && !nContainers.isEmpty()) { @@ -446,16 +446,16 @@ public final class BindingGeneratorImpl implements BindingGenerator { GeneratedTransferObject gto = new GeneratedTOBuilderImpl( returnTypePkgName, returnTypeName).toInstance(); - newType.addExtendsType(gto); + newType.setExtendsType(gto); } else { - newType.addExtendsType(Types.getBaseIdentityTO()); + newType.setExtendsType(Types.getBaseIdentityTO()); } - - return newType.toIdentityInstance(); + newType.setAbstract(true); + return newType.toInstance(); } private List allGroupingsToGenTypes(Module module) { - final List genTypes = new ArrayList(); + final List genTypes = new ArrayList<>(); final String basePackageName = moduleNamespaceToPackageName(module); Set groupings = module.getGroupings(); if (groupings != null && !groupings.isEmpty()) { @@ -804,8 +804,8 @@ public final class BindingGeneratorImpl implements BindingGenerator { .addProperty(parseToClassName(leafName)); propBuilder.setReadOnly(isReadOnly); - propBuilder.addReturnType(returnType); - propBuilder.addComment(leafDesc); + propBuilder.setReturnType(returnType); + propBuilder.setComment(leafDesc); toBuilder.addEqualsIdentity(propBuilder); toBuilder.addHashIdentity(propBuilder); @@ -946,8 +946,8 @@ public final class BindingGeneratorImpl implements BindingGenerator { final MethodSignatureBuilder getMethod = interfaceBuilder .addMethod(getterMethodName(schemaNodeName)); - getMethod.addComment(comment); - getMethod.addReturnType(returnType); + getMethod.setComment(comment); + getMethod.setReturnType(returnType); return getMethod; } @@ -959,10 +959,10 @@ public final class BindingGeneratorImpl implements BindingGenerator { final MethodSignatureBuilder setMethod = interfaceBuilder .addMethod(setterMethodName(schemaNodeName)); - setMethod.addComment(comment); + setMethod.setComment(comment); setMethod.addParameter(parameterType, parseToValidParamName(schemaNodeName)); - setMethod.addReturnType(Types.voidType()); + setMethod.setReturnType(Types.voidType()); return setMethod; }