Replace tabs in java files with spaces 68/37568/3
authorRyan Goulding <ryandgoulding@gmail.com>
Wed, 13 Apr 2016 18:11:42 +0000 (14:11 -0400)
committerRobert Varga <nite@hq.sk>
Mon, 18 Apr 2016 08:03:48 +0000 (08:03 +0000)
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 <ryandgoulding@gmail.com>
common/checkstyle-logging/src/test/java/org/opendaylight/yangtools/checkstyle/CheckCodingStyleTestClass.java
common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
common/object-cache-guava/src/test/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCacheTest.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/JsonStreamToNormalizedNodeTest.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomFromNormalizedNodeSerializerFactory.java
yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfoTest.java

index 9a18b373632cdf379b02e877e50f64aced933b9d..8719c42528270868ab37cf82c4155e1baead4027 100644 (file)
@@ -17,7 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Lists;\r
 \r
 public class CheckCodingStyleTestClass {\r
-\r
+        // NOTE:  This test class contains intentional checkstyle issues\r
        public CheckCodingStyleTestClass() {\r
                Comparator<String> string = CASE_INSENSITIVE_ORDER; \r
                \r
index ba3a41bc5bafeea4104630ddb41debde4703d11c..bb1d7430a2694c1323f76a3b5a7408914578e878 100644 (file)
@@ -20,19 +20,19 @@ import org.mockito.MockitoAnnotations;
 
 public class ArgumentsExtractorVerifierTest {
 
-       @Mock
-       List<String> mockedList;
+    @Mock
+    List<String> 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());
+    }
 
 }
index b32ac84e9faf29c4b7266df94e3a17f8a3afef7c..69218873ca5229967a9f72aca57754732c3426ad 100644 (file)
@@ -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));
+    }
 
 }
index 8c0d8b46ece0d2077352210a329a8ef4641e78f9..5582d508c49d8a845e159734656065ff9897b467 100644 (file)
@@ -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:"));
index d218bcbad55c6aeda066ed9e71f8763273225936..682e6508ef93688658f59c9cf4bbca9c6f234e04 100644 (file)
@@ -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:"));
index 3fe79dc22c2e6d7f47f84cb75ade4f72461bef7b..3181403fcb6bfc0ed5585207f46bd9d4705f32fa 100644 (file)
@@ -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<Element> dispatcher = new NodeSerializerDispatcher.BaseNodeSerializerDispatcher<Element>(this) {
+    private DomFromNormalizedNodeSerializerFactory(final Document doc, final XmlCodecProvider codecProvider) {
+        final NodeSerializerDispatcher.BaseNodeSerializerDispatcher<Element> dispatcher = new NodeSerializerDispatcher.BaseNodeSerializerDispatcher<Element>(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<Element, AugmentationNode, AugmentationSchema> getAugmentationNodeSerializer() {
-               return augmentSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, ChoiceNode, ChoiceSchemaNode> getChoiceNodeSerializer() {
-               return choiceSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, ContainerNode, ContainerSchemaNode> getContainerNodeSerializer() {
-               return containerSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, LeafNode<?>, LeafSchemaNode> getLeafNodeSerializer() {
-               return leafNodeSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, LeafSetEntryNode<?>, LeafListSchemaNode> getLeafSetEntryNodeSerializer() {
-               return leafSetEntryNodeSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, LeafSetNode<?>, LeafListSchemaNode> getLeafSetNodeSerializer() {
-               return leafSetSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, MapEntryNode, ListSchemaNode> getMapEntryNodeSerializer() {
-               return mapEntryNodeSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, MapNode, ListSchemaNode> getMapNodeSerializer() {
-               return mapNodeSerializer;
-       }
-
-       @Override
-       public FromNormalizedNodeSerializer<Element, UnkeyedListNode, ListSchemaNode> getUnkeyedListNodeSerializer() {
-           return unkeyedListNodeSerializer;
-       }
+    }
+
+    public static DomFromNormalizedNodeSerializerFactory getInstance(final Document doc, final XmlCodecProvider codecProvider) {
+        return new DomFromNormalizedNodeSerializerFactory(doc, codecProvider);
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, AugmentationNode, AugmentationSchema> getAugmentationNodeSerializer() {
+        return augmentSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, ChoiceNode, ChoiceSchemaNode> getChoiceNodeSerializer() {
+        return choiceSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, ContainerNode, ContainerSchemaNode> getContainerNodeSerializer() {
+        return containerSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, LeafNode<?>, LeafSchemaNode> getLeafNodeSerializer() {
+        return leafNodeSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, LeafSetEntryNode<?>, LeafListSchemaNode> getLeafSetEntryNodeSerializer() {
+        return leafSetEntryNodeSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, LeafSetNode<?>, LeafListSchemaNode> getLeafSetNodeSerializer() {
+        return leafSetSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, MapEntryNode, ListSchemaNode> getMapEntryNodeSerializer() {
+        return mapEntryNodeSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, MapNode, ListSchemaNode> getMapNodeSerializer() {
+        return mapNodeSerializer;
+    }
+
+    @Override
+    public FromNormalizedNodeSerializer<Element, UnkeyedListNode, ListSchemaNode> getUnkeyedListNodeSerializer() {
+        return unkeyedListNodeSerializer;
+    }
 
         @Override
         public FromNormalizedNodeSerializer<Element, AnyXmlNode, AnyXmlSchemaNode> getAnyXmlNodeSerializer() {
index 3de8eef5ebce7c5c2823f1a7213a5b65a966669f..925fc17a7d340251c0f462aaf671526c9cccaf82 100644 (file)
@@ -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;
             }
 
index ebe97ad6a17049514e09306c5f245e45406851d8..3935ac5d80e6987e4ad1cb1cb05da59a1696b33a 100644 (file)
@@ -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));
     }