Make DecimalTypeDefinition.getFractionDigits() return int

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / effective / MustEffectiveStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java
index e76d12296eaf852168ee29056d44c1e6bec25d4f..b03f416be22db456aef13a6a14cc8658e3e2a5ce 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java
@@ -8,15 +8,16 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective;
 
 import java.util.Objects;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
-public class MustEffectiveStatementImpl extends EffectiveStatementBase<RevisionAwareXPath, MustStatement> implements
-        MustDefinition {
+public class MustEffectiveStatementImpl extends DeclaredEffectiveStatementBase<RevisionAwareXPath, MustStatement>
+        implements MustDefinition {
 
-    private final RevisionAwareXPath xPath;
+    private final RevisionAwareXPath xpath;
     private final String description;
     private final String errorAppTag;
     private final String errorMessage;
@@ -24,51 +25,51 @@ public class MustEffectiveStatementImpl extends EffectiveStatementBase<RevisionA
 
     public MustEffectiveStatementImpl(final StmtContext<RevisionAwareXPath, MustStatement, ?> ctx) {
         super(ctx);
-        this.xPath = ctx.getStatementArgument();
+        this.xpath = ctx.getStatementArgument();
 
         DescriptionEffectiveStatementImpl descriptionStmt = firstEffective(DescriptionEffectiveStatementImpl.class);
-        this.description = (descriptionStmt == null) ? null : descriptionStmt.argument();
+        this.description = descriptionStmt == null ? null : descriptionStmt.argument();
 
         ErrorAppTagEffectiveStatementImpl errorAppTagStmt = firstEffective(ErrorAppTagEffectiveStatementImpl.class);
-        this.errorAppTag = (errorAppTagStmt == null) ? null : errorAppTagStmt.argument();
+        this.errorAppTag = errorAppTagStmt == null ? null : errorAppTagStmt.argument();
 
         ErrorMessageEffectiveStatementImpl errorMessageStmt = firstEffective(ErrorMessageEffectiveStatementImpl.class);
-        this.errorMessage = (errorMessageStmt == null) ? null : errorMessageStmt.argument();
+        this.errorMessage = errorMessageStmt == null ? null : errorMessageStmt.argument();
 
         ReferenceEffectiveStatementImpl referenceStmt = firstEffective(ReferenceEffectiveStatementImpl.class);
-        this.reference = (referenceStmt == null) ? null : referenceStmt.argument();
+        this.reference = referenceStmt == null ? null : referenceStmt.argument();
     }
 
     @Override
     public RevisionAwareXPath getXpath() {
-        return xPath;
+        return xpath;
     }
 
     @Override
-    public String getDescription() {
-        return description;
+    public Optional<String> getDescription() {
+        return Optional.ofNullable(description);
     }
 
     @Override
-    public String getErrorAppTag() {
-        return errorAppTag;
+    public Optional<String> getErrorAppTag() {
+        return Optional.ofNullable(errorAppTag);
     }
 
     @Override
-    public String getErrorMessage() {
-        return errorMessage;
+    public Optional<String> getErrorMessage() {
+        return Optional.ofNullable(errorMessage);
     }
 
     @Override
-    public String getReference() {
-        return reference;
+    public Optional<String> getReference() {
+        return Optional.ofNullable(reference);
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + Objects.hashCode(xPath);
+        result = prime * result + Objects.hashCode(xpath);
         result = prime * result + Objects.hashCode(description);
         result = prime * result + Objects.hashCode(reference);
         return result;
@@ -86,7 +87,7 @@ public class MustEffectiveStatementImpl extends EffectiveStatementBase<RevisionA
             return false;
         }
         final MustEffectiveStatementImpl other = (MustEffectiveStatementImpl) obj;
-        if (!Objects.equals(xPath, other.xPath)) {
+        if (!Objects.equals(xpath, other.xpath)) {
             return false;
         }
         if (!Objects.equals(description, other.description)) {
@@ -100,6 +101,6 @@ public class MustEffectiveStatementImpl extends EffectiveStatementBase<RevisionA
 
     @Override
     public String toString() {
-        return xPath.toString();
+        return xpath.toString();
     }
 }