From e54ae2e063838b4da8626c2646f8e8fe7dfabc92 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 29 Aug 2014 23:47:37 +0200 Subject: [PATCH] Remove explicit final keywords These context use the filan modifier needlessly, so remove them to get rid of sonar warnings. Change-Id: I1ec3133c3978b0cfaa31c74ba57393ff9973ddc6 Signed-off-by: Robert Varga --- .../builder/GeneratedTypeBuilderBase.java | 22 +++++++++---------- .../yang/binding/BindingMapping.java | 18 ++++++++------- .../data/api/NodeModificationBuilder.java | 22 +++++++++---------- .../yang/data/impl/schema/ImmutableNodes.java | 9 ++++---- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java index 628029f028..f405215059 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java @@ -30,7 +30,7 @@ public interface GeneratedTypeBuilderBase> * Name of Enclosing Type * @return new Instance of Generated Type Builder. */ - GeneratedTOBuilder addEnclosingTransferObject(final String name); + GeneratedTOBuilder addEnclosingTransferObject(String name); /** * Adds new Enclosing Transfer Object genTOBuilder into @@ -49,7 +49,7 @@ public interface GeneratedTypeBuilderBase> * @param genTOBuilder * Name of Enclosing Type */ - T addEnclosingTransferObject(final GeneratedTOBuilder genTOBuilder); + T addEnclosingTransferObject(GeneratedTOBuilder genTOBuilder); /** * Adds String definition of comment into Method Signature definition.
@@ -59,7 +59,7 @@ public interface GeneratedTypeBuilderBase> * @param comment * Comment String. */ - T addComment(final String comment); + T addComment(String comment); /** * The method creates new AnnotationTypeBuilder containing specified package @@ -74,7 +74,7 @@ public interface GeneratedTypeBuilderBase> * Name of Annotation Type * @return new instance of Annotation Type Builder. */ - AnnotationTypeBuilder addAnnotation(final String packageName, final String name); + AnnotationTypeBuilder addAnnotation(String packageName, String name); boolean isAbstract(); @@ -96,7 +96,7 @@ public interface GeneratedTypeBuilderBase> * Type to implement * @return true if the addition of type is successful. */ - T addImplementsType(final Type genType); + T addImplementsType(Type genType); /** * Adds Constant definition and returns new Constant instance.
@@ -113,7 +113,7 @@ public interface GeneratedTypeBuilderBase> * Assigned Value * @return new Constant instance. */ - Constant addConstant(final Type type, final String name, final Object value); + Constant addConstant(Type type, String name, Object value); /** * Adds new Enumeration definition for Generated Type Builder and returns @@ -128,7 +128,7 @@ public interface GeneratedTypeBuilderBase> * Enumeration Name * @return new instance of Enumeration Builder. */ - EnumBuilder addEnumeration(final String name); + EnumBuilder addEnumeration(String name); List getMethodDefinitions(); @@ -146,7 +146,7 @@ public interface GeneratedTypeBuilderBase> * Name of Method * @return new instance of Method Signature Builder. */ - MethodSignatureBuilder addMethod(final String name); + MethodSignatureBuilder addMethod(String name); /** * Checks if GeneratedTypeBuilder contains method with name @@ -155,7 +155,7 @@ public interface GeneratedTypeBuilderBase> * @param methodName * is method name */ - boolean containsMethod(final String methodName); + boolean containsMethod(String methodName); List getProperties(); @@ -169,7 +169,7 @@ public interface GeneratedTypeBuilderBase> * Name of Property * @return new instance of Generated Property Builder. */ - GeneratedPropertyBuilder addProperty(final String name); + GeneratedPropertyBuilder addProperty(String name); /** * Check whether GeneratedTOBuilder contains property with name @@ -179,7 +179,7 @@ public interface GeneratedTypeBuilderBase> * of property which existance is checked * @return true if property name exists in list of properties. */ - boolean containsProperty(final String name); + boolean containsProperty(String name); /** * Set a string that contains a human-readable textual description of type diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java index 2966fb982f..d628de016c 100644 --- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java +++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java @@ -12,10 +12,12 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; + import java.text.SimpleDateFormat; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -66,11 +68,11 @@ public final class BindingMapping { throw new UnsupportedOperationException("Utility class should not be instantiated"); } - public static final String getRootPackageName(final QName module) { + public static String getRootPackageName(final QName module) { return getRootPackageName(module.getModule()); } - public static final String getRootPackageName(final QNameModule module) { + public static String getRootPackageName(final QNameModule module) { checkArgument(module != null, "Module must not be null"); checkArgument(module.getRevision() != null, "Revision must not be null"); checkArgument(module.getNamespace() != null, "Namespace must not be null"); @@ -132,22 +134,22 @@ public final class BindingMapping { return builder.toString(); } - public static final String getMethodName(final QName name) { + public static String getMethodName(final QName name) { checkArgument(name != null, "Name should not be null."); return getMethodName(name.getLocalName()); } - public static final String getClassName(final String localName) { + public static String getClassName(final String localName) { checkArgument(localName != null, "Name should not be null."); return toFirstUpper(toCamelCase(localName)); } - public static final String getMethodName(final String yangIdentifier) { + public static String getMethodName(final String yangIdentifier) { checkArgument(yangIdentifier != null,"Identifier should not be null"); return toFirstLower(toCamelCase(yangIdentifier)); } - public static final String getClassName(final QName name) { + public static String getClassName(final QName name) { checkArgument(name != null, "Name should not be null."); return toFirstUpper(toCamelCase(name.getLocalName())); } @@ -160,7 +162,7 @@ public final class BindingMapping { return potential; } - private static final String toCamelCase(final String rawString) { + private static String toCamelCase(final String rawString) { checkArgument(rawString != null, "String should not be null"); Iterable components = CAMEL_SPLITTER.split(rawString); StringBuilder builder = new StringBuilder(); @@ -170,7 +172,7 @@ public final class BindingMapping { return checkNumericPrefix(builder.toString()); } - private static final String checkNumericPrefix(final String rawString) { + private static String checkNumericPrefix(final String rawString) { if (rawString == null || rawString.isEmpty()) { return rawString; } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java index b8b6d14d1b..fc86f71e13 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java @@ -16,26 +16,26 @@ package org.opendaylight.yangtools.yang.data.api; @Deprecated public interface NodeModificationBuilder { - abstract Node getMutableEquivalent(Node originalNode); + Node getMutableEquivalent(Node originalNode); - abstract CompositeNode buildDiffTree(); + CompositeNode buildDiffTree(); - abstract void mergeNode(MutableCompositeNode alteredNode); + void mergeNode(MutableCompositeNode alteredNode); - abstract void removeNode(MutableCompositeNode deadNode); + void removeNode(MutableCompositeNode deadNode); - abstract void removeNode(MutableSimpleNode deadNode); + void removeNode(MutableSimpleNode deadNode); - abstract void deleteNode(MutableSimpleNode deadNode); + void deleteNode(MutableSimpleNode deadNode); - abstract void deleteNode(MutableCompositeNode deadNode); + void deleteNode(MutableCompositeNode deadNode); - abstract void replaceNode(MutableCompositeNode replacementNode); + void replaceNode(MutableCompositeNode replacementNode); - abstract void replaceNode(MutableSimpleNode replacementNode); + void replaceNode(MutableSimpleNode replacementNode); - abstract void addNode(MutableCompositeNode newNode); + void addNode(MutableCompositeNode newNode); - abstract void addNode(MutableSimpleNode newNode); + void addNode(MutableSimpleNode newNode); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java index fc5c20e6fd..73361f1922 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java @@ -27,11 +27,11 @@ public final class ImmutableNodes { throw new UnsupportedOperationException("Utilities class should not be instantiated"); } - public static final CollectionNodeBuilder mapNodeBuilder() { + public static CollectionNodeBuilder mapNodeBuilder() { return ImmutableMapNodeBuilder.create(); } - public static final CollectionNodeBuilder mapNodeBuilder(final QName name) { + public static CollectionNodeBuilder mapNodeBuilder(final QName name) { return ImmutableMapNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(name)); } @@ -42,7 +42,7 @@ public final class ImmutableNodes { * @param value Value of leaf node * @return Leaf node with supplied identifier and value */ - public static final LeafNode leafNode(final NodeIdentifier name,final T value) { + public static LeafNode leafNode(final NodeIdentifier name,final T value) { return ImmutableLeafNodeBuilder.create() .withNodeIdentifier(name) .withValue(value) @@ -50,14 +50,13 @@ public final class ImmutableNodes { } /** - * * Construct immutable leaf node * * @param name QName which will be used as node identifier * @param value Value of leaf node. * @return Leaf node with supplied identifier and value */ - public static final LeafNode leafNode(final QName name,final T value) { + public static LeafNode leafNode(final QName name,final T value) { return leafNode(new NodeIdentifier(name), value); } -- 2.36.6