From bc6aa356568dac2dca17cfce807df1e2a947e5bf Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 17:25:04 +0200 Subject: [PATCH] Mechanical code cleanup (sal-clustering-commons) * Remove unnecessary type specifiers (use Java 7 <>) * Remove unnecessary "extends Object" declarations * Remove unnecessary semi-colons * Merge identical catch blocks * Remove redundant modifiers: - enum constructors are private by default - interface properties are public static final by default - interface methods are public abstract by default - interfaces are abstract by default - inner interfaces are static by default - inner classes in interfaces are public static by default Change-Id: I37133b6c4737bd33926021056c244789856622c2 Signed-off-by: Stephen Kitt --- .../cluster/common/actor/UnifiedConfig.java | 2 +- .../node/utils/NormalizedNodeVisitor.java | 2 +- .../NormalizedNodeSerializer.java | 2 +- .../serialization/PathArgumentSerializer.java | 2 +- .../utils/stream/NormalizedNodeDataInput.java | 2 +- .../stream/NormalizedNodeDataOutput.java | 2 +- .../common/NormalizedNodeMessages.java | 66 ++++++++----------- .../messages/AbstractMessagesTest.java | 2 +- 8 files changed, 33 insertions(+), 47 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/UnifiedConfig.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/UnifiedConfig.java index 62b6055f2e..903987a027 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/UnifiedConfig.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/UnifiedConfig.java @@ -26,5 +26,5 @@ public interface UnifiedConfig { * Returns an immutable instance of unified configuration * @return */ - public Config get(); + Config get(); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java index 0ad8c2b285..c04f0ced5f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java @@ -11,5 +11,5 @@ package org.opendaylight.controller.cluster.datastore.node.utils; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public interface NormalizedNodeVisitor { - public void visitNode(int level, String parentPath, NormalizedNode normalizedNode); + void visitNode(int level, String parentPath, NormalizedNode normalizedNode); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java index 67c8c439f3..e4ba73c3b1 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java @@ -421,7 +421,7 @@ public class NormalizedNodeSerializer { return PathArgumentSerializer.deSerialize(this, pathArgument); } - private static interface DeSerializationFunction { + private interface DeSerializationFunction { NormalizedNode apply(DeSerializer deserializer, NormalizedNodeMessages.Node node); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializer.java index 989bd266e6..7bbb704c1c 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/PathArgumentSerializer.java @@ -62,7 +62,7 @@ public class PathArgumentSerializer { } - private static interface PathArgumentAttributesGetter { + private interface PathArgumentAttributesGetter { Iterable get( QNameSerializationContext context, YangInstanceIdentifier.PathArgument pathArgument); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataInput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataInput.java index f2a1b9a6d2..a37d56507a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataInput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataInput.java @@ -12,7 +12,7 @@ import java.io.DataInput; import java.io.IOException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * Interface for reading {@link NormalizedNode}s, {@link YangInstanceIdentifier}s and {@link PathArgument}s. diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataOutput.java index 6efe254e09..10f412c9e2 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeDataOutput.java @@ -12,7 +12,7 @@ import java.io.DataOutput; import java.io.IOException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * Interface for emitting {@link NormalizedNode}s, {@link YangInstanceIdentifier}s and {@link PathArgument}s. diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java index 0f14c6b762..f732701d2f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java @@ -1698,8 +1698,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QNameOrBuilder> getNameFieldBuilder() { if (nameBuilder_ == null) { - nameBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QNameOrBuilder>( + nameBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( name_, getParentForChildren(), isClean()); @@ -1958,8 +1957,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> getInstanceIdentifierValueFieldBuilder() { if (instanceIdentifierValueBuilder_ == null) { - instanceIdentifierValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder>( + instanceIdentifierValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( instanceIdentifierValue_, getParentForChildren(), isClean()); @@ -3133,7 +3131,7 @@ public final class NormalizedNodeMessages { } case 34: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - attribute_ = new java.util.ArrayList(); + attribute_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000008; } attribute_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttribute.PARSER, extensionRegistry)); @@ -3141,7 +3139,7 @@ public final class NormalizedNodeMessages { } case 42: { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - attributes_ = new java.util.ArrayList(); + attributes_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000010; } attributes_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.PARSER, extensionRegistry)); @@ -4156,8 +4154,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QNameOrBuilder> getNodeTypeFieldBuilder() { if (nodeTypeBuilder_ == null) { - nodeTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QName.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.QNameOrBuilder>( + nodeTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( nodeType_, getParentForChildren(), isClean()); @@ -4171,7 +4168,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureAttributeIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - attribute_ = new java.util.ArrayList(attribute_); + attribute_ = new java.util.ArrayList<>(attribute_); bitField0_ |= 0x00000008; } } @@ -4395,8 +4392,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttributeOrBuilder> getAttributeFieldBuilder() { if (attributeBuilder_ == null) { - attributeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentAttributeOrBuilder>( + attributeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( attribute_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -4411,7 +4407,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureAttributesIsMutable() { if (!((bitField0_ & 0x00000010) == 0x00000010)) { - attributes_ = new java.util.ArrayList(attributes_); + attributes_ = new java.util.ArrayList<>(attributes_); bitField0_ |= 0x00000010; } } @@ -4707,8 +4703,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.AttributeOrBuilder> getAttributesFieldBuilder() { if (attributesBuilder_ == null) { - attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.AttributeOrBuilder>( + attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( attributes_, ((bitField0_ & 0x00000010) == 0x00000010), getParentForChildren(), @@ -4887,7 +4882,7 @@ public final class NormalizedNodeMessages { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - arguments_ = new java.util.ArrayList(); + arguments_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000001; } arguments_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument.PARSER, extensionRegistry)); @@ -5342,7 +5337,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureArgumentsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - arguments_ = new java.util.ArrayList(arguments_); + arguments_ = new java.util.ArrayList<>(arguments_); bitField0_ |= 0x00000001; } } @@ -5566,8 +5561,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentOrBuilder> getArgumentsFieldBuilder() { if (argumentsBuilder_ == null) { - argumentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentOrBuilder>( + argumentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( arguments_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -6115,7 +6109,7 @@ public final class NormalizedNodeMessages { } case 42: { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - attributes_ = new java.util.ArrayList(); + attributes_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000010; } attributes_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.PARSER, extensionRegistry)); @@ -6123,7 +6117,7 @@ public final class NormalizedNodeMessages { } case 50: { if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - child_ = new java.util.ArrayList(); + child_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000020; } child_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.PARSER, extensionRegistry)); @@ -7616,8 +7610,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentOrBuilder> getPathArgumentFieldBuilder() { if (pathArgumentBuilder_ == null) { - pathArgumentBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgument.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.PathArgumentOrBuilder>( + pathArgumentBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( pathArgument_, getParentForChildren(), isClean()); @@ -7664,7 +7657,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureAttributesIsMutable() { if (!((bitField0_ & 0x00000010) == 0x00000010)) { - attributes_ = new java.util.ArrayList(attributes_); + attributes_ = new java.util.ArrayList<>(attributes_); bitField0_ |= 0x00000010; } } @@ -7888,8 +7881,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.AttributeOrBuilder> getAttributesFieldBuilder() { if (attributesBuilder_ == null) { - attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Attribute.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.AttributeOrBuilder>( + attributesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( attributes_, ((bitField0_ & 0x00000010) == 0x00000010), getParentForChildren(), @@ -7904,7 +7896,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureChildIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { - child_ = new java.util.ArrayList(child_); + child_ = new java.util.ArrayList<>(child_); bitField0_ |= 0x00000020; } } @@ -8128,8 +8120,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder> getChildFieldBuilder() { if (childBuilder_ == null) { - childBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder>( + childBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( child_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -8503,8 +8494,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> getInstanceIdentifierValueFieldBuilder() { if (instanceIdentifierValueBuilder_ == null) { - instanceIdentifierValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder>( + instanceIdentifierValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( instanceIdentifierValue_, getParentForChildren(), isClean()); @@ -9480,8 +9470,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder> getNormalizedNodeFieldBuilder() { if (normalizedNodeBuilder_ == null) { - normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder>( + normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( normalizedNode_, getParentForChildren(), isClean()); @@ -10090,8 +10079,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> getInstanceIdentifierPathFieldBuilder() { if (instanceIdentifierPathBuilder_ == null) { - instanceIdentifierPathBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder>( + instanceIdentifierPathBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( instanceIdentifierPath_, getParentForChildren(), isClean()); @@ -10207,8 +10195,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder> getNormalizedNodeFieldBuilder() { if (normalizedNodeBuilder_ == null) { - normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeOrBuilder>( + normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder<>( normalizedNode_, getParentForChildren(), isClean()); @@ -10309,7 +10296,7 @@ public final class NormalizedNodeMessages { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - mapEntries_ = new java.util.ArrayList(); + mapEntries_ = new java.util.ArrayList<>(); mutable_bitField0_ |= 0x00000001; } mapEntries_.add(input.readMessage(org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntry.PARSER, extensionRegistry)); @@ -10668,7 +10655,7 @@ public final class NormalizedNodeMessages { java.util.Collections.emptyList(); private void ensureMapEntriesIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - mapEntries_ = new java.util.ArrayList(mapEntries_); + mapEntries_ = new java.util.ArrayList<>(mapEntries_); bitField0_ |= 0x00000001; } } @@ -10892,8 +10879,7 @@ public final class NormalizedNodeMessages { org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntry, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntry.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntryOrBuilder> getMapEntriesFieldBuilder() { if (mapEntriesBuilder_ == null) { - mapEntriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntry, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntry.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.NodeMapEntryOrBuilder>( + mapEntriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<>( mapEntries_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java index c6c4afd505..bef1f41b0a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java @@ -45,7 +45,7 @@ public abstract class AbstractMessagesTest { FileOutputStream output = new FileOutputStream(file); builder.build().writeTo(output); - output.close();; + output.close(); } -- 2.36.6