Annotate non-null build() return

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / java / api / generator / BuilderGeneratedProperty.java

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java
index 46c18e060aa56e23eafb7c7a1aac1b54fde6d437..a9abd4b05f145ad1d28eea68408d31b2efd0c1ff 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java
@@ -16,14 +16,15 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedProperty;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics;
 import org.opendaylight.mdsal.binding.model.api.Type;
+import org.opendaylight.mdsal.binding.model.api.TypeMemberComment;
 
 final class BuilderGeneratedProperty implements GeneratedProperty {
-    private final MethodSignature method;
+    private final MethodSignature getter;
     private final String name;
 
-    BuilderGeneratedProperty(final String name, final MethodSignature method) {
+    BuilderGeneratedProperty(final String name, final MethodSignature getter) {
         this.name = requireNonNull(name);
-        this.method = requireNonNull(method);
+        this.getter = requireNonNull(getter);
     }
 
     @Override
@@ -33,11 +34,15 @@ final class BuilderGeneratedProperty implements GeneratedProperty {
 
     @Override
     public Type getReturnType() {
-        return method.getReturnType();
+        return getter.getReturnType();
     }
 
     ValueMechanics getMechanics() {
-        return method.getMechanics();
+        return getter.getMechanics();
+    }
+
+    String getGetterName() {
+        return getter.getName();
     }
 
     @Override
@@ -54,11 +59,11 @@ final class BuilderGeneratedProperty implements GeneratedProperty {
             return false;
         }
         final BuilderGeneratedProperty other = (BuilderGeneratedProperty) obj;
-        return name.equals(other.name) && method.equals(other.method);
+        return name.equals(other.name) && getter.equals(other.getter);
     }
 
     @Override
-    public String getComment() {
+    public TypeMemberComment getComment() {
         throw uoe();
     }
 
@@ -82,11 +87,6 @@ final class BuilderGeneratedProperty implements GeneratedProperty {
         throw uoe();
     }
 
-    @Override
-    public Type getDefiningType() {
-        throw uoe();
-    }
-
     @Override
     public String getValue() {
         throw uoe();