X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futil%2FInstanceIdentifierUtilsTest.java;h=18b577f9d9e19658b3eaad8720c3b55eb258930c;hp=d15f534f805ee5bc345afcfb05be903f0f9e85e0;hb=38fa2a64bd6e206b2d8a6b153154104347854408;hpb=1ca8b8853505a53b8ea00a07f865776bbe59ece6 diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java index d15f534f80..18b577f9d9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java @@ -1,11 +1,9 @@ /* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.cluster.datastore.util; @@ -25,13 +23,13 @@ import java.util.List; public class InstanceIdentifierUtilsTest { - private static QName TEST_QNAME = QName + private static final QName TEST_QNAME = QName .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test"); - private static QName NODE_WITH_VALUE_QNAME = QName + private static final QName NODE_WITH_VALUE_QNAME = QName .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)value"); - private static QName NODE_WITH_PREDICATES_QNAME = QName + private static final QName NODE_WITH_PREDICATES_QNAME = QName .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)pred"); - private static QName NAME_QNAME = QName + private static final QName NAME_QNAME = QName .create("(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)name"); @Test @@ -62,11 +60,11 @@ public class InstanceIdentifierUtilsTest { } - private void withValue(Object value) { + private static void withValue(Object value) { YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME); YangInstanceIdentifier.PathArgument p2 = - new YangInstanceIdentifier.NodeWithValue(NODE_WITH_VALUE_QNAME, value); + new YangInstanceIdentifier.NodeWithValue<>(NODE_WITH_VALUE_QNAME, value); List arguments = new ArrayList<>(); @@ -93,7 +91,7 @@ public class InstanceIdentifierUtilsTest { } - private void withPredicates(Object value) { + private static void withPredicates(Object value) { YangInstanceIdentifier.PathArgument p1 = new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME); YangInstanceIdentifier.PathArgument p2 = new YangInstanceIdentifier.NodeIdentifierWithPredicates( @@ -139,7 +137,7 @@ public class InstanceIdentifierUtilsTest { List arguments = Arrays.asList( new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME), - new YangInstanceIdentifier.NodeWithValue(NODE_WITH_VALUE_QNAME, 1), + new YangInstanceIdentifier.NodeWithValue<>(NODE_WITH_VALUE_QNAME, 1), new YangInstanceIdentifier.NodeIdentifierWithPredicates( NODE_WITH_PREDICATES_QNAME, NAME_QNAME, 2));