Allow base type builders to be used fluently

These are final classes, hence we can return this and simplify users.

Change-Id: Ibc2a2c6e258fbeaebb042bdf81fb8cfdf269c379
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java
index 12be6a2c6fac1a59c04bcbac0135d2489e1457a3..04ee96a53f4075c7a02d83a99ba59e8d3f8b14f0 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java
@@ -24,10 +24,11 @@ public final class BitsTypeBuilder extends TypeBuilder<BitsTypeDefinition> {
         super(null, path);
     }
 
-    public void addBit(@Nonnull final Bit item) {
+    public BitsTypeBuilder addBit(@Nonnull final Bit item) {
         Preconditions.checkArgument(item.getPosition() != null, "Bit %s has null position", item);
 
         builder.put(item.getName(), item);
+        return this;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java
index 467a6217366a636256e2cea98bbd83082deaafd9..b2658372e4b1454474198ba730375c16bda1b70b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java
@@ -24,9 +24,10 @@ public final class EnumerationTypeBuilder extends TypeBuilder<EnumTypeDefinition
         super(null, path);
     }
 
-    public void addEnum(@Nonnull final EnumPair item) {
+    public EnumerationTypeBuilder addEnum(@Nonnull final EnumPair item) {
         Preconditions.checkArgument(item.getValue() != null, "Enum %s has null value", item);
         builder.put(item.getName(), item);
+        return this;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java
index b1fb8c76e9b3c6363fdeebdf9c48e57a1d2fb868..b31994f36e59f193cfedba31ad5142997e650c1f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java
@@ -20,9 +20,10 @@ public final class IdentityrefTypeBuilder extends TypeBuilder<IdentityrefTypeDef
         super(null, path);
     }
 
-    public void setIdentity(@Nonnull final IdentitySchemaNode identity) {
+    public IdentityrefTypeBuilder setIdentity(@Nonnull final IdentitySchemaNode identity) {
         Preconditions.checkState(this.identity == null, "Identity already set to %s", this.identity);
         this.identity = Preconditions.checkNotNull(identity);
+        return this;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java
index 20a3c7ebc81b267dfc2c0096d8b101cbe8ff15d7..8e159ee4766c96dfe373acb16e6135b344a2b14a 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java
@@ -19,13 +19,14 @@ public final class InstanceIdentifierTypeBuilder extends AbstractRestrictedTypeB
         this.requireInstance = baseType.requireInstance();
     }
 
-    public void setRequireInstance(final boolean requireInstance) {
+    public InstanceIdentifierTypeBuilder setRequireInstance(final boolean requireInstance) {
         if (this.requireInstance) {
             Preconditions.checkArgument(!requireInstance, "Cannot switch require-instance off in type %s", getPath());
         }
 
         this.requireInstance = requireInstance;
         touch();
+        return this;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java
index e95acf5c91d7f17e001b0988ec2397922d4c0d7d..f19b589f7683cec2414bc86dd6502a216db8d425 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java
@@ -20,9 +20,10 @@ public final class LeafrefTypeBuilder extends TypeBuilder<LeafrefTypeDefinition>
         super(null, path);
     }
 
-    public void setPathStatement(@Nonnull final RevisionAwareXPath pathStatement) {
+    public LeafrefTypeBuilder setPathStatement(@Nonnull final RevisionAwareXPath pathStatement) {
         Preconditions.checkState(this.pathStatement == null, "Path statement already set to %s", this.pathStatement);
         this.pathStatement = Preconditions.checkNotNull(pathStatement);
+        return this;
     }
 
     @Override

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java
index ae1a0b75cf355d9fb0634b975889043de970fe8a..6d34b4bd974e796379253903938a731172734203 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java
@@ -22,9 +22,10 @@ public final class StringTypeBuilder extends LengthRestrictedTypeBuilder<StringT
         super(baseType, path);
     }
 
-    public void addPatternConstraint(final PatternConstraint constraint) {
+    public StringTypeBuilder addPatternConstraint(final PatternConstraint constraint) {
         patternConstraints.add(Preconditions.checkNotNull(constraint));
         touch();
+        return this;
     }
 
     @Override
@@ -32,7 +33,7 @@ public final class StringTypeBuilder extends LengthRestrictedTypeBuilder<StringT
         return type.getLengthConstraints();
     }
 
-     @Override
+    @Override
     List<LengthConstraint> typeLengthConstraints() {
         /**
          * Length constraint imposed on YANG string type by our implementation. {@link String#length()} is an integer,

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java
index aae4ef55576102d3c8f87d144cb11fce417fc04b..4f8440e31a5df269dabec40c1a8c766945027178 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java
@@ -21,8 +21,9 @@ public final class UnionTypeBuilder extends TypeBuilder<UnionTypeDefinition> {
         super(null, path);
     }
 
-    public void addType(@Nonnull final TypeDefinition<?> type) {
+    public UnionTypeBuilder addType(@Nonnull final TypeDefinition<?> type) {
         builder.add(type);
+        return this;
     }
 
     @Override