From db26fc0bc09a9e2c1190f03b159c87355d20bf8e Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 5 Mar 2018 18:41:23 -0500 Subject: [PATCH] Fix checkstyle violations in sal-common-impl Change-Id: Iff4edfb67a169cc6075be7ae87b9e2fd40e43055 Signed-off-by: Tom Pantelis --- .../impl/service/AbstractDataTransaction.java | 3 +- .../compat/DataNormalizationOperation.java | 126 +++++++++--------- .../impl/util/compat/DataNormalizer.java | 8 +- .../util/compat/DataSchemaContainerProxy.java | 4 +- 4 files changed, 73 insertions(+), 68 deletions(-) diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataTransaction.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataTransaction.java index 9b0dbb0f97..e441cfab41 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataTransaction.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataTransaction.java @@ -23,7 +23,8 @@ public abstract class AbstractDataTransaction { private static final ListenableFuture> SUCCESS_FUTURE = Futures.immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build()); - public static ListenableFuture> convertToLegacyCommitFuture(final CheckedFuture from) { + public static ListenableFuture> convertToLegacyCommitFuture( + final CheckedFuture from) { return Futures.transformAsync(from, input -> SUCCESS_FUTURE); } } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java index 5aa3ec6431..4174fac41c 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java @@ -57,7 +57,7 @@ public abstract class DataNormalizationOperation impleme protected DataNormalizationOperation(final T identifier, final SchemaNode schema) { this.identifier = identifier; - if(schema instanceof DataSchemaNode) { + if (schema instanceof DataSchemaNode) { this.dataSchemaNode = Optional.of((DataSchemaNode) schema); } else { this.dataSchemaNode = Optional.absent(); @@ -77,7 +77,7 @@ public abstract class DataNormalizationOperation impleme return Collections.singleton(identifier.getNodeType()); } - public abstract DataNormalizationOperation getChild(final PathArgument child) throws DataNormalizationException; + public abstract DataNormalizationOperation getChild(PathArgument child) throws DataNormalizationException; public abstract DataNormalizationOperation getChild(QName child) throws DataNormalizationException; @@ -89,7 +89,8 @@ public abstract class DataNormalizationOperation impleme return dataSchemaNode; } - private static abstract class SimpleTypeNormalization extends DataNormalizationOperation { + private abstract static class SimpleTypeNormalization + extends DataNormalizationOperation { protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { super(identifier,potential); @@ -114,7 +115,6 @@ public abstract class DataNormalizationOperation impleme public boolean isLeaf() { return true; } - } private static final class LeafNormalization extends SimpleTypeNormalization { @@ -127,7 +127,7 @@ public abstract class DataNormalizationOperation impleme private static final class LeafListEntryNormalization extends SimpleTypeNormalization { - public LeafListEntryNormalization(final LeafListSchemaNode potential) { + LeafListEntryNormalization(final LeafListSchemaNode potential) { super(new NodeWithValue(potential.getQName(), null),potential); } @@ -137,8 +137,8 @@ public abstract class DataNormalizationOperation impleme } } - private static abstract class CompositeNodeNormalizationOperation extends - DataNormalizationOperation { + private abstract static class CompositeNodeNormalizationOperation + extends DataNormalizationOperation { protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { super(identifier,schema); @@ -152,14 +152,15 @@ public abstract class DataNormalizationOperation impleme } - private static abstract class DataContainerNormalizationOperation extends - CompositeNodeNormalizationOperation { + private abstract static class DataContainerNormalizationOperation + extends CompositeNodeNormalizationOperation { private final DataNodeContainer schema; private final Map> byQName; private final Map> byArg; - protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, final DataSchemaNode node) { + protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, + final DataSchemaNode node) { super(identifier,node); this.schema = schema; this.byArg = new ConcurrentHashMap<>(); @@ -176,14 +177,6 @@ public abstract class DataNormalizationOperation impleme return register(potential); } - private DataNormalizationOperation fromLocalSchema(final PathArgument child) throws DataNormalizationException { - if (child instanceof AugmentationIdentifier) { - return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames() - .iterator().next()); - } - return fromSchemaAndQNameChecked(schema, child.getNodeType()); - } - @Override public DataNormalizationOperation getChild(final QName child) throws DataNormalizationException { DataNormalizationOperation potential = byQName.get(child); @@ -194,15 +187,25 @@ public abstract class DataNormalizationOperation impleme return register(potential); } - protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema2, final QName child) throws DataNormalizationException { + private DataNormalizationOperation fromLocalSchema(final PathArgument child) + throws DataNormalizationException { + if (child instanceof AugmentationIdentifier) { + return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames() + .iterator().next()); + } + return fromSchemaAndQNameChecked(schema, child.getNodeType()); + } + + protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema2, + final QName child) throws DataNormalizationException { return fromSchemaAndQNameChecked(schema2, child); } private DataNormalizationOperation register(final DataNormalizationOperation potential) { if (potential != null) { byArg.put(potential.getIdentifier(), potential); - for (final QName qName : potential.getQNameIdentifiers()) { - byQName.put(qName, potential); + for (final QName qname : potential.getQNameIdentifiers()) { + byQName.put(qname, potential); } } return potential; @@ -211,20 +214,18 @@ public abstract class DataNormalizationOperation impleme } private static final class ListItemNormalization extends - DataContainerNormalizationOperation { - - private final List keyDefinition; + DataContainerNormalizationOperation { protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { - super(identifier, schema,schema); - keyDefinition = schema.getKeyDefinition(); + super(identifier, schema, schema); } @Override public NormalizedNode createDefault(final PathArgument currentArg) { final DataContainerNodeAttrBuilder builder = Builders .mapEntryBuilder().withNodeIdentifier((NodeIdentifierWithPredicates) currentArg); - for (final Entry keyValue : ((NodeIdentifierWithPredicates) currentArg).getKeyValues().entrySet()) { + for (final Entry keyValue : + ((NodeIdentifierWithPredicates) currentArg).getKeyValues().entrySet()) { builder.addChild(Builders.leafBuilder() // .withNodeIdentifier(new NodeIdentifier(keyValue.getKey())).withValue(keyValue.getValue()) @@ -240,7 +241,8 @@ public abstract class DataNormalizationOperation impleme } } - private static final class UnkeyedListItemNormalization extends DataContainerNormalizationOperation { + private static final class UnkeyedListItemNormalization + extends DataContainerNormalizationOperation { protected UnkeyedListItemNormalization(final ListSchemaNode schema) { super(new NodeIdentifier(schema.getQName()), schema,schema); @@ -266,8 +268,8 @@ public abstract class DataNormalizationOperation impleme } - private static abstract class MixinNormalizationOp extends - CompositeNodeNormalizationOperation { + private abstract static class MixinNormalizationOp + extends CompositeNodeNormalizationOperation { protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { super(identifier,schema); @@ -282,9 +284,7 @@ public abstract class DataNormalizationOperation impleme private static final class OrderedLeafListMixinNormalization extends UnorderedLeafListMixinNormalization { - - - public OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) { + OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) { super(potential); } @@ -298,10 +298,11 @@ public abstract class DataNormalizationOperation impleme private final DataNormalizationOperation innerOp; - public UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) { + UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) { super(new NodeIdentifier(potential.getQName()),potential); innerOp = new LeafListEntryNormalization(potential); } + @Override public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.leafSetBuilder().withNodeIdentifier(getIdentifier()).build(); @@ -324,9 +325,10 @@ public abstract class DataNormalizationOperation impleme } } - private static final class AugmentationNormalization extends DataContainerNormalizationOperation { + private static final class AugmentationNormalization + extends DataContainerNormalizationOperation { - public AugmentationNormalization(final AugmentationSchemaNode augmentation, final DataNodeContainer schema) { + AugmentationNormalization(final AugmentationSchemaNode augmentation, final DataNodeContainer schema) { super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema),null); } @@ -338,8 +340,8 @@ public abstract class DataNormalizationOperation impleme @Override - protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, final QName child) - throws DataNormalizationException { + protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, + final QName child) throws DataNormalizationException { final Optional potential = findChildSchemaNode(schema, child); if (!potential.isPresent()) { return null; @@ -369,10 +371,10 @@ public abstract class DataNormalizationOperation impleme private final ListItemNormalization innerNode; - public UnorderedMapMixinNormalization(final ListSchemaNode list) { + UnorderedMapMixinNormalization(final ListSchemaNode list) { super(new NodeIdentifier(list.getQName()),list); this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(), - Collections. emptyMap()), list); + Collections.emptyMap()), list); } @Override @@ -403,7 +405,7 @@ public abstract class DataNormalizationOperation impleme private final UnkeyedListItemNormalization innerNode; - public UnkeyedListMixinNormalization(final ListSchemaNode list) { + UnkeyedListMixinNormalization(final ListSchemaNode list) { super(new NodeIdentifier(list.getQName()),list); this.innerNode = new UnkeyedListItemNormalization(list); } @@ -433,7 +435,7 @@ public abstract class DataNormalizationOperation impleme private static final class OrderedMapMixinNormalization extends UnorderedMapMixinNormalization { - public OrderedMapMixinNormalization(final ListSchemaNode list) { + OrderedMapMixinNormalization(final ListSchemaNode list) { super(list); } @@ -452,7 +454,8 @@ public abstract class DataNormalizationOperation impleme protected ChoiceNodeNormalization(final ChoiceSchemaNode schema) { super(new NodeIdentifier(schema.getQName()),schema); final ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); - final ImmutableMap.Builder> byArgBuilder = ImmutableMap.builder(); + final ImmutableMap.Builder> byArgBuilder = + ImmutableMap.builder(); for (final CaseSchemaNode caze : schema.getCases().values()) { for (final DataSchemaNode cazeChild : caze.getChildNodes()) { @@ -485,17 +488,17 @@ public abstract class DataNormalizationOperation impleme private static class AnyXmlNormalization extends DataNormalizationOperation { - protected AnyXmlNormalization( final AnyXmlSchemaNode schema) { - super( new NodeIdentifier(schema.getQName()), schema); + protected AnyXmlNormalization(final AnyXmlSchemaNode schema) { + super(new NodeIdentifier(schema.getQName()), schema); } @Override - public DataNormalizationOperation getChild( final PathArgument child ) throws DataNormalizationException { + public DataNormalizationOperation getChild(final PathArgument child) throws DataNormalizationException { return null; } @Override - public DataNormalizationOperation getChild( final QName child ) throws DataNormalizationException { + public DataNormalizationOperation getChild(final QName child) throws DataNormalizationException { return null; } @@ -505,15 +508,17 @@ public abstract class DataNormalizationOperation impleme } @Override - public NormalizedNode createDefault( final PathArgument currentArg ) { + public NormalizedNode createDefault(final PathArgument currentArg) { return null; } } - private static final Optional findChildSchemaNode(final DataNodeContainer parent,final QName child) { + private static Optional findChildSchemaNode(final DataNodeContainer parent, + final QName child) { DataSchemaNode potential = parent.getDataChildByName(child); if (potential == null) { - final Iterable choices = FluentIterable.from(parent.getChildNodes()).filter(ChoiceSchemaNode.class); + final Iterable choices = FluentIterable.from(parent.getChildNodes()) + .filter(ChoiceSchemaNode.class); potential = findChoice(choices, child); } return Optional.fromNullable(potential); @@ -524,7 +529,9 @@ public abstract class DataNormalizationOperation impleme final Optional potential = findChildSchemaNode(schema, child); if (!potential.isPresent()) { - throw new DataNormalizationException(String.format("Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, schema,schema.getChildNodes())); + throw new DataNormalizationException(String.format( + "Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, + schema,schema.getChildNodes())); } final DataSchemaNode result = potential.get(); @@ -566,18 +573,13 @@ public abstract class DataNormalizationOperation impleme } /** - * Returns a DataNormalizationOperation for provided child node + * Returns a DataNormalizationOperation for provided child node. * + *

* If supplied child is added by Augmentation this operation returns * a DataNormalizationOperation for augmentation, * otherwise returns a DataNormalizationOperation for child as * call for {@link #fromDataSchemaNode(DataSchemaNode)}. - * - * - * @param parent - * @param parentAug - * @param child - * @return */ private static DataNormalizationOperation fromAugmentation(final DataNodeContainer parent, final AugmentationTarget parentAug, final DataSchemaNode child) { @@ -610,24 +612,24 @@ public abstract class DataNormalizationOperation impleme } else if (potential instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) potential); } else if (potential instanceof AnyXmlSchemaNode) { - return new AnyXmlNormalization( (AnyXmlSchemaNode) potential); + return new AnyXmlNormalization((AnyXmlSchemaNode) potential); } return null; } private static DataNormalizationOperation fromListSchemaNode(final ListSchemaNode potential) { final List keyDefinition = potential.getKeyDefinition(); - if(keyDefinition == null || keyDefinition.isEmpty()) { + if (keyDefinition == null || keyDefinition.isEmpty()) { return new UnkeyedListMixinNormalization(potential); } - if(potential.isUserOrdered()) { + if (potential.isUserOrdered()) { return new OrderedMapMixinNormalization(potential); } return new UnorderedMapMixinNormalization(potential); } private static DataNormalizationOperation fromLeafListSchemaNode(final LeafListSchemaNode potential) { - if(potential.isUserOrdered()) { + if (potential.isUserOrdered()) { return new OrderedLeafListMixinNormalization(potential); } return new UnorderedLeafListMixinNormalization(potential); diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java index 10f53f05e3..df34b635cf 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java @@ -16,8 +16,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** + * Deprecated. + * * @deprecated This class provides compatibility between XML semantics - * and {@link org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree} + * and {@link org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree} */ @Deprecated public class DataNormalizer { @@ -54,7 +56,8 @@ public class DataNormalizer { return YangInstanceIdentifier.create(normalizedArgs.build()); } - public DataNormalizationOperation getOperation(final YangInstanceIdentifier legacy) throws DataNormalizationException { + public DataNormalizationOperation getOperation(final YangInstanceIdentifier legacy) + throws DataNormalizationException { DataNormalizationOperation currentOp = operation; for (PathArgument pathArgument : legacy.getPathArguments()) { @@ -78,5 +81,4 @@ public class DataNormalizer { public DataNormalizationOperation getRootOperation() { return operation; } - } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java index fc3db54ae0..132cc6e660 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java @@ -24,10 +24,10 @@ class DataSchemaContainerProxy implements DataNodeContainer { private final Set realChildSchemas; private final Map mappedChildSchemas; - public DataSchemaContainerProxy(final Set realChildSchema) { + DataSchemaContainerProxy(final Set realChildSchema) { realChildSchemas = realChildSchema; mappedChildSchemas = new HashMap<>(); - for(DataSchemaNode schema : realChildSchemas) { + for (DataSchemaNode schema : realChildSchemas) { mappedChildSchemas.put(schema.getQName(), schema); } } -- 2.36.6