From 22fb8af92d1ff5f6c95d0014fddce7a589085971 Mon Sep 17 00:00:00 2001 From: Ryan Goulding Date: Wed, 13 Apr 2016 14:11:42 -0400 Subject: [PATCH] Replace tabs in java files with spaces A tab may be interpreted as a different number of columns depending on environment. On the hand, a space is always interpreted as just one column. This change replaces all instances of tab characters with 4 spaces within java files. The following UNIX command was run in order to automate replacement: > find . -type f -name "*.java" -exec sed -i 's/\t/ /g' {} \; An appropriate comment was added to CheckCodingStyleTestClass.java to indicate that the class contains intentional checkstyle errors (i.e., tabs) to test the efficacy of checkstyle rules. Change-Id: Ie51eadda2169d1bb15c8aef1ce01e625b9b9972d Signed-off-by: Ryan Goulding --- .../checkstyle/CheckCodingStyleTestClass.java | 2 +- .../ArgumentsExtractorVerifierTest.java | 26 ++--- .../objcache/guava/GuavaObjectCacheTest.java | 68 +++++------ .../gson/JsonStreamToNormalizedNodeTest.java | 2 +- .../JsonStreamToNormalizedNodeTest.java | 2 +- ...omFromNormalizedNodeSerializerFactory.java | 106 +++++++++--------- .../plugin/YangToSourcesProcessor.java | 2 +- .../util/YangModelDependencyInfoTest.java | 6 +- 8 files changed, 107 insertions(+), 107 deletions(-) diff --git a/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckCodingStyleTestClass.java b/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckCodingStyleTestClass.java index 9a18b37363..8719c42528 100644 --- a/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckCodingStyleTestClass.java +++ b/common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckCodingStyleTestClass.java @@ -17,7 +17,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Lists; public class CheckCodingStyleTestClass { - + // NOTE: This test class contains intentional checkstyle issues public CheckCodingStyleTestClass() { Comparator string = CASE_INSENSITIVE_ORDER; diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java index ba3a41bc5b..bb1d7430a2 100644 --- a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java +++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java @@ -20,19 +20,19 @@ import org.mockito.MockitoAnnotations; public class ArgumentsExtractorVerifierTest { - @Mock - List mockedList; + @Mock + List mockedList; - @Test - public void test() { - MockitoAnnotations.initMocks(this); - doReturn(true).when(this.mockedList).add(any(String.class)); - final String argument = "something"; - this.mockedList.add(argument); - // retrieve argument - final ArgumentsExtractorVerifier argumentsExtractorVerifier = new ArgumentsExtractorVerifier(); - verify(this.mockedList, argumentsExtractorVerifier).add(any(String.class)); - assertArrayEquals(new Object[] { argument }, argumentsExtractorVerifier.getArguments()); - } + @Test + public void test() { + MockitoAnnotations.initMocks(this); + doReturn(true).when(this.mockedList).add(any(String.class)); + final String argument = "something"; + this.mockedList.add(argument); + // retrieve argument + final ArgumentsExtractorVerifier argumentsExtractorVerifier = new ArgumentsExtractorVerifier(); + verify(this.mockedList, argumentsExtractorVerifier).add(any(String.class)); + assertArrayEquals(new Object[] { argument }, argumentsExtractorVerifier.getArguments()); + } } diff --git a/common/object-cache-guava/src/test/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCacheTest.java b/common/object-cache-guava/src/test/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCacheTest.java index b32ac84e9f..69218873ca 100644 --- a/common/object-cache-guava/src/test/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCacheTest.java +++ b/common/object-cache-guava/src/test/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCacheTest.java @@ -17,39 +17,39 @@ import org.opendaylight.yangtools.objcache.ObjectCache; import org.opendaylight.yangtools.objcache.ObjectCacheFactory; public class GuavaObjectCacheTest { - private ObjectCache cache; - - @Before - public void setUp() { - cache = ObjectCacheFactory.getObjectCache(String.class); - } - - @Test - public void testCorrectWiring() { - assertEquals(GuavaObjectCache.class, cache.getClass()); - } - - @Test - public void testInitialReference() { - final String s1 = "abcd"; - final String s2 = cache.getReference(s1); - assertSame(s1, s2); - } - - @Test - // This test is based on using different references - @SuppressWarnings("RedundantStringConstructorCall") - public void testMultipleReferences() { - final String s1 = "abcd"; - final String s2 = new String(s1); - - // Preliminary check - assertEquals(s1, s2); - assertNotSame(s1, s2); - - assertSame(s1, cache.getReference(s1)); - assertSame(s1, cache.getReference(s2)); - assertNotSame(s2, cache.getReference(s2)); - } + private ObjectCache cache; + + @Before + public void setUp() { + cache = ObjectCacheFactory.getObjectCache(String.class); + } + + @Test + public void testCorrectWiring() { + assertEquals(GuavaObjectCache.class, cache.getClass()); + } + + @Test + public void testInitialReference() { + final String s1 = "abcd"; + final String s2 = cache.getReference(s1); + assertSame(s1, s2); + } + + @Test + // This test is based on using different references + @SuppressWarnings("RedundantStringConstructorCall") + public void testMultipleReferences() { + final String s1 = "abcd"; + final String s2 = new String(s1); + + // Preliminary check + assertEquals(s1, s2); + assertNotSame(s1, s2); + + assertSame(s1, cache.getReference(s1)); + assertSame(s1, cache.getReference(s2)); + assertNotSame(s2, cache.getReference(s2)); + } } diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java index 8c0d8b46ec..5582d508c4 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java @@ -171,7 +171,7 @@ public class JsonStreamToNormalizedNodeTest { try { //second parameter isn't necessary because error will be raised before it is used. verifyTransformationToNormalizedNode(inputJson, null); - fail("Expected exception not raised"); + fail("Expected exception not raised"); } catch (final IllegalStateException e) { final String errorMessage = e.getMessage(); assertTrue(errorMessage.contains("Choose suitable module name for element lf11-namesake:")); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/JsonStreamToNormalizedNodeTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/JsonStreamToNormalizedNodeTest.java index d218bcbad5..682e6508ef 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/JsonStreamToNormalizedNodeTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/JsonStreamToNormalizedNodeTest.java @@ -173,7 +173,7 @@ public class JsonStreamToNormalizedNodeTest { try { //second parameter isn't necessary because error will be raised before it is used. verifyTransformationToNormalizedNode(inputJson, null); - fail("Expected exception not raised"); + fail("Expected exception not raised"); } catch (final IllegalStateException e) { final String errorMessage = e.getMessage(); assertTrue(errorMessage.contains("Choose suitable module name for element lf11-namesake:")); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomFromNormalizedNodeSerializerFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomFromNormalizedNodeSerializerFactory.java index 3fe79dc22c..3181403fcb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomFromNormalizedNodeSerializerFactory.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomFromNormalizedNodeSerializerFactory.java @@ -45,10 +45,10 @@ public final class DomFromNormalizedNodeSerializerFactory implements FromNormali private final MapEntryNodeDomSerializer mapEntryNodeSerializer; private final UnkeyedListEntryNodeDomSerializer unkeyedListEntryNodeSerializer; - private DomFromNormalizedNodeSerializerFactory(final Document doc, final XmlCodecProvider codecProvider) { - final NodeSerializerDispatcher.BaseNodeSerializerDispatcher dispatcher = new NodeSerializerDispatcher.BaseNodeSerializerDispatcher(this) { + private DomFromNormalizedNodeSerializerFactory(final Document doc, final XmlCodecProvider codecProvider) { + final NodeSerializerDispatcher.BaseNodeSerializerDispatcher dispatcher = new NodeSerializerDispatcher.BaseNodeSerializerDispatcher(this) { - }; + }; containerSerializer = new ContainerNodeDomSerializer(doc, dispatcher); choiceSerializer = new ChoiceNodeDomSerializer(dispatcher); @@ -63,56 +63,56 @@ public final class DomFromNormalizedNodeSerializerFactory implements FromNormali unkeyedListEntryNodeSerializer = new UnkeyedListEntryNodeDomSerializer(doc, dispatcher); unkeyedListNodeSerializer = new UnkeyedListNodeDomSerializer(unkeyedListEntryNodeSerializer); - } - - public static DomFromNormalizedNodeSerializerFactory getInstance(final Document doc, final XmlCodecProvider codecProvider) { - return new DomFromNormalizedNodeSerializerFactory(doc, codecProvider); - } - - @Override - public FromNormalizedNodeSerializer getAugmentationNodeSerializer() { - return augmentSerializer; - } - - @Override - public FromNormalizedNodeSerializer getChoiceNodeSerializer() { - return choiceSerializer; - } - - @Override - public FromNormalizedNodeSerializer getContainerNodeSerializer() { - return containerSerializer; - } - - @Override - public FromNormalizedNodeSerializer, LeafSchemaNode> getLeafNodeSerializer() { - return leafNodeSerializer; - } - - @Override - public FromNormalizedNodeSerializer, LeafListSchemaNode> getLeafSetEntryNodeSerializer() { - return leafSetEntryNodeSerializer; - } - - @Override - public FromNormalizedNodeSerializer, LeafListSchemaNode> getLeafSetNodeSerializer() { - return leafSetSerializer; - } - - @Override - public FromNormalizedNodeSerializer getMapEntryNodeSerializer() { - return mapEntryNodeSerializer; - } - - @Override - public FromNormalizedNodeSerializer getMapNodeSerializer() { - return mapNodeSerializer; - } - - @Override - public FromNormalizedNodeSerializer getUnkeyedListNodeSerializer() { - return unkeyedListNodeSerializer; - } + } + + public static DomFromNormalizedNodeSerializerFactory getInstance(final Document doc, final XmlCodecProvider codecProvider) { + return new DomFromNormalizedNodeSerializerFactory(doc, codecProvider); + } + + @Override + public FromNormalizedNodeSerializer getAugmentationNodeSerializer() { + return augmentSerializer; + } + + @Override + public FromNormalizedNodeSerializer getChoiceNodeSerializer() { + return choiceSerializer; + } + + @Override + public FromNormalizedNodeSerializer getContainerNodeSerializer() { + return containerSerializer; + } + + @Override + public FromNormalizedNodeSerializer, LeafSchemaNode> getLeafNodeSerializer() { + return leafNodeSerializer; + } + + @Override + public FromNormalizedNodeSerializer, LeafListSchemaNode> getLeafSetEntryNodeSerializer() { + return leafSetEntryNodeSerializer; + } + + @Override + public FromNormalizedNodeSerializer, LeafListSchemaNode> getLeafSetNodeSerializer() { + return leafSetSerializer; + } + + @Override + public FromNormalizedNodeSerializer getMapEntryNodeSerializer() { + return mapEntryNodeSerializer; + } + + @Override + public FromNormalizedNodeSerializer getMapNodeSerializer() { + return mapNodeSerializer; + } + + @Override + public FromNormalizedNodeSerializer getUnkeyedListNodeSerializer() { + return unkeyedListNodeSerializer; + } @Override public FromNormalizedNodeSerializer getAnyXmlNodeSerializer() { diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java index 3de8eef5eb..925fc17a7d 100644 --- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java +++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java @@ -117,7 +117,7 @@ class YangToSourcesProcessor { } if (allFiles.isEmpty()) { - LOG.info("{} No input files found", LOG_PREFIX); + LOG.info("{} No input files found", LOG_PREFIX); return null; } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfoTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfoTest.java index ebe97ad6a1..3935ac5d80 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfoTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfoTest.java @@ -52,13 +52,13 @@ public class YangModelDependencyInfoTest { @Test public void testEquals() { - InputStream stream1 = getClass().getResourceAsStream("/ietf/ietf-inet-types@2010-09-24.yang"); + InputStream stream1 = getClass().getResourceAsStream("/ietf/ietf-inet-types@2010-09-24.yang"); YangModelDependencyInfo info1 = YangModelDependencyInfo.fromInputStream(stream1); InputStream stream2 = getClass().getResourceAsStream("/no-revision/module-without-revision.yang"); YangModelDependencyInfo info2 = YangModelDependencyInfo.fromInputStream(stream2); - assertTrue(info1.equals(info1)); - assertFalse(info1.equals(null)); + assertTrue(info1.equals(info1)); + assertFalse(info1.equals(null)); assertFalse(info1.equals(stream1)); assertFalse(info1.equals(info2)); } -- 2.36.6