From: Robert Varga Date: Fri, 20 Sep 2019 17:55:39 +0000 (+0200) Subject: Rename PathArgumentTypes to LithiumPathArgument X-Git-Tag: release/magnesium~86 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ce5a523664a789cefb9950ec9368abc35f849d7c;hp=53af8a1af8d2433788c9b9aa512930b57b19d297 Rename PathArgumentTypes to LithiumPathArgument These tokens are only used in Lithium-based streams, but the global name is slightly confusing. Rename to LithiumPathArgument, which makes the context more obvious. JIRA: CONTROLLER-1919 Change-Id: I2b92be4c469de8dffba6e071449b5ae947b9ace8 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java index c360aecfc5..e263748265 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java @@ -429,13 +429,13 @@ abstract class AbstractLithiumDataInput extends AbstractNormalizedNodeDataInput int type = input.readByte(); switch (type) { - case PathArgumentTypes.AUGMENTATION_IDENTIFIER: + case LithiumPathArgument.AUGMENTATION_IDENTIFIER: return readAugmentationIdentifier(); - case PathArgumentTypes.NODE_IDENTIFIER: + case LithiumPathArgument.NODE_IDENTIFIER: return readNodeIdentifier(); - case PathArgumentTypes.NODE_IDENTIFIER_WITH_PREDICATES: + case LithiumPathArgument.NODE_IDENTIFIER_WITH_PREDICATES: return readNormalizedNodeWithPredicates(); - case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE: + case LithiumPathArgument.NODE_IDENTIFIER_WITH_VALUE: return new NodeWithValue<>(readQName(), readObject()); default: // FIXME: throw hard error diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java index be61f7847d..47082698f9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java @@ -215,26 +215,26 @@ abstract class AbstractLithiumDataOutput extends AbstractNormalizedNodeDataOutpu @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST", justification = "The casts in the switch clauses are indirectly confirmed via the determination of 'type'.") final void writePathArgumentInternal(final PathArgument pathArgument) throws IOException { - final byte type = PathArgumentTypes.getSerializablePathArgumentType(pathArgument); + final byte type = LithiumPathArgument.getSerializablePathArgumentType(pathArgument); output.writeByte(type); switch (type) { - case PathArgumentTypes.NODE_IDENTIFIER: + case LithiumPathArgument.NODE_IDENTIFIER: NodeIdentifier nodeIdentifier = (NodeIdentifier) pathArgument; writeQNameInternal(nodeIdentifier.getNodeType()); break; - case PathArgumentTypes.NODE_IDENTIFIER_WITH_PREDICATES: + case LithiumPathArgument.NODE_IDENTIFIER_WITH_PREDICATES: NodeIdentifierWithPredicates nodeIdentifierWithPredicates = (NodeIdentifierWithPredicates) pathArgument; writeQNameInternal(nodeIdentifierWithPredicates.getNodeType()); writeKeyValueMap(nodeIdentifierWithPredicates.entrySet()); break; - case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE: + case LithiumPathArgument.NODE_IDENTIFIER_WITH_VALUE: NodeWithValue nodeWithValue = (NodeWithValue) pathArgument; writeQNameInternal(nodeWithValue.getNodeType()); writeObject(nodeWithValue.getValue()); break; - case PathArgumentTypes.AUGMENTATION_IDENTIFIER: + case LithiumPathArgument.AUGMENTATION_IDENTIFIER: // No Qname in augmentation identifier writeAugmentationIdentifier((AugmentationIdentifier) pathArgument); break; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/PathArgumentTypes.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumPathArgument.java similarity index 96% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/PathArgumentTypes.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumPathArgument.java index 07ed12ab52..764d44d49f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/PathArgumentTypes.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumPathArgument.java @@ -17,13 +17,13 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -final class PathArgumentTypes { +final class LithiumPathArgument { static final byte AUGMENTATION_IDENTIFIER = 1; static final byte NODE_IDENTIFIER = 2; static final byte NODE_IDENTIFIER_WITH_VALUE = 3; static final byte NODE_IDENTIFIER_WITH_PREDICATES = 4; - private PathArgumentTypes() { + private LithiumPathArgument() { throw new UnsupportedOperationException("Utility class"); }