Fix checkstyle warnings in netconf-cli

Change-Id: Ic434bf4aac666c312e41781588aa9fca94acca4e
Signed-off-by: Marian Dubai <mdubai@cisco.com>

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/Main.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/Main.java
index 8605501a9c603b01c421b6c209f9ebb96bd75241..79c083c1ed4a24d065ff0c8223ec6fa6a9672291 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/Main.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/Main.java
@@ -105,8 +105,7 @@ public class Main {
     }
 
     private static void handleException(final Exception e, final String message) {
     }
 
     private static void handleException(final Exception e, final String message) {

-        System.err.println(message);
-        e.printStackTrace(System.err);
+        // FIXME syserr the exception and stacktrace

     }
 
     private static void writeStatus(final ConsoleIO io, final String blueprint, final Object... args) {
     }
 
     private static void writeStatus(final ConsoleIO io, final String blueprint, final Object... args) {

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/commands/local/Disconnect.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/commands/local/Disconnect.java
index e9383886eaac79f2462ff262bf6097789142205d..73088b4f5ddf29e0c715ec96950ebbafe84ad18b 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/commands/local/Disconnect.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/commands/local/Disconnect.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.controller.netconf.cli.commands.local;
 
  */
 package org.opendaylight.controller.netconf.cli.commands.local;
 

+import com.google.common.collect.Lists;

 import org.opendaylight.controller.netconf.cli.NetconfDeviceConnectionManager;
 import org.opendaylight.controller.netconf.cli.commands.AbstractCommand;
 import org.opendaylight.controller.netconf.cli.commands.Command;
 import org.opendaylight.controller.netconf.cli.NetconfDeviceConnectionManager;
 import org.opendaylight.controller.netconf.cli.commands.AbstractCommand;
 import org.opendaylight.controller.netconf.cli.commands.Command;


@@ -20,8 +21,6 @@ import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl;
 import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 
 import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 

-import com.google.common.collect.Lists;
-

 /**
  * Local disconnect command
  */
 /**
  * Local disconnect command
  */

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/BasicDataHolderReader.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/BasicDataHolderReader.java
index ef41e7fe7ad0ce8922a5277441b1359dcfff0d68..b44ec41f7e3006c310f43408045e18184c997363 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/BasicDataHolderReader.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/BasicDataHolderReader.java
@@ -245,11 +245,11 @@ public abstract class BasicDataHolderReader<T extends DataSchemaNode> extends Ab
 
             return new StringsCompleter(Collections2.transform(((IdentityrefTypeDefinition) getType()).getIdentity()
                     .getDerivedIdentities(), new Function<IdentitySchemaNode, String>() {
 
             return new StringsCompleter(Collections2.transform(((IdentityrefTypeDefinition) getType()).getIdentity()
                     .getDerivedIdentities(), new Function<IdentitySchemaNode, String>() {

-                @Override
-                public String apply(final IdentitySchemaNode input) {
-                    return identityMap.inverse().get(input.getQName());
-                }
-            })).complete(buffer, cursor, candidates);
+                        @Override
+                        public String apply(final IdentitySchemaNode input) {
+                            return identityMap.inverse().get(input.getQName());
+                        }
+                    })).complete(buffer, cursor, candidates);

         }
     }
 }
         }
     }
 }

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/LeafListEntryReader.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/LeafListEntryReader.java
index a05a169c991fc71fa5259729c15df6ce883426cb..2a00101c3d912100f3335b8565c0c18c0b9735b7 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/LeafListEntryReader.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/reader/impl/LeafListEntryReader.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.netconf.cli.reader.impl;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;

+import java.util.List;

 import jline.console.completer.Completer;
 import org.opendaylight.controller.netconf.cli.io.BaseConsoleContext;
 import org.opendaylight.controller.netconf.cli.io.ConsoleContext;
 import jline.console.completer.Completer;
 import org.opendaylight.controller.netconf.cli.io.BaseConsoleContext;
 import org.opendaylight.controller.netconf.cli.io.ConsoleContext;


@@ -19,8 +20,6 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 

-import java.util.List;
-

 class LeafListEntryReader extends BasicDataHolderReader<LeafListSchemaNode> implements
         GenericListEntryReader<LeafListSchemaNode> {
 
 class LeafListEntryReader extends BasicDataHolderReader<LeafListSchemaNode> implements
         GenericListEntryReader<LeafListSchemaNode> {
 

diff --git a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NormalizedNodeWriter.java b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NormalizedNodeWriter.java
index ef29a76fff342c5c5e0fc87d89b1a56639aa04f6..2c7c23e7e99f745514368e7e0415d590ec9065a8 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NormalizedNodeWriter.java
+++ b/opendaylight/netconf/netconf-cli/src/main/java/org/opendaylight/controller/netconf/cli/writer/impl/NormalizedNodeWriter.java
@@ -13,12 +13,12 @@ import java.util.List;
 import org.opendaylight.controller.netconf.cli.io.ConsoleIO;
 import org.opendaylight.controller.netconf.cli.writer.OutFormatter;
 import org.opendaylight.controller.netconf.cli.writer.WriteException;
 import org.opendaylight.controller.netconf.cli.io.ConsoleIO;
 import org.opendaylight.controller.netconf.cli.writer.OutFormatter;
 import org.opendaylight.controller.netconf.cli.writer.WriteException;

-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.Node;

+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;

+import org.opendaylight.yangtools.yang.data.composite.node.schema.cnsn.parser.CnSnToNormalizedNodeParserFactory;

 import org.opendaylight.yangtools.yang.data.impl.schema.transform.base.serializer.NodeSerializerDispatcher;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.DomUtils;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.base.serializer.NodeSerializerDispatcher;
 import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.DomUtils;

-import org.opendaylight.yangtools.yang.data.composite.node.schema.cnsn.parser.CnSnToNormalizedNodeParserFactory;

 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;

diff --git a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/ConsoleIOTestImpl.java b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/ConsoleIOTestImpl.java
index 29d7abd85ae1e65e2c419cf749d8c879209042f2..368e942c972481dc5e051d46b1240e5af7554242 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/ConsoleIOTestImpl.java
+++ b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/ConsoleIOTestImpl.java
@@ -33,7 +33,7 @@ public class ConsoleIOTestImpl extends ConsoleIOImpl {
     public String read() throws IOException {
         final String prompt = buildPrompt();
         output.append(prompt);
     public String read() throws IOException {
         final String prompt = buildPrompt();
         output.append(prompt);

-        System.out.print(prompt);
+        System.console().writer().print(prompt);

 
         String value = inputValues.get(prompt).pollFirst();
         if (value == null) {
 
         String value = inputValues.get(prompt).pollFirst();
         if (value == null) {


@@ -43,7 +43,7 @@ public class ConsoleIOTestImpl extends ConsoleIOImpl {
         value = value != null ? value : "****NO VALUE****";
 
         output.append(value + "\n");
         value = value != null ? value : "****NO VALUE****";
 
         output.append(value + "\n");

-        System.out.print(value + "\n");
+        System.console().writer().println(value + "\n");

         return value;
     }
 
         return value;
     }
 


@@ -69,14 +69,14 @@ public class ConsoleIOTestImpl extends ConsoleIOImpl {
     public void write(final CharSequence data) throws IOException {
         output.append(data);
         lastMessage = (String) data;
     public void write(final CharSequence data) throws IOException {
         output.append(data);
         lastMessage = (String) data;

-        System.out.print(data);
+        System.console().writer().print(data);

     }
 
     @Override
     public void writeLn(final CharSequence data) throws IOException {
         write(data);
         output.append("\n");
     }
 
     @Override
     public void writeLn(final CharSequence data) throws IOException {
         write(data);
         output.append("\n");

-        System.out.print("\n");
+        System.console().writer().print("\n");

     }
 
     public String getConsoleOutput() {
     }
 
     public String getConsoleOutput() {

diff --git a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/NetconfCliTest.java b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/NetconfCliTest.java
index 7d85aa4f28b64f58e55505aa699cf459654197a1..874669eff8efb65f0fcfa7fb39587cb83235d9fd 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/NetconfCliTest.java
+++ b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/NetconfCliTest.java
@@ -61,7 +61,6 @@ public class NetconfCliTest {
         return parser.parseFiles(testFiles);
     }
 
         return parser.parseFiles(testFiles);
     }
 

-    // @Ignore

     @Test
     public void cliTest() throws ReadingException, IOException, WriteException, URISyntaxException {
 
     @Test
     public void cliTest() throws ReadingException, IOException, WriteException, URISyntaxException {
 


@@ -112,12 +111,11 @@ public class NetconfCliTest {
         final List<Node<?>> redData = new GenericReader(console, new CommandArgHandlerRegistry(console,
                 new SchemaContextRegistry(schemaContext)), schemaContext).read(cont1);
         assertNotNull(redData);
         final List<Node<?>> redData = new GenericReader(console, new CommandArgHandlerRegistry(console,
                 new SchemaContextRegistry(schemaContext)), schemaContext).read(cont1);
         assertNotNull(redData);

-       assertEquals(1, redData.size());
+        assertEquals(1, redData.size());

 
         assertTrue(redData.get(0) instanceof CompositeNode);
         final CompositeNode redTopLevelNode = (CompositeNode) redData.get(0);
 
 
         assertTrue(redData.get(0) instanceof CompositeNode);
         final CompositeNode redTopLevelNode = (CompositeNode) redData.get(0);
 

-        System.out.println("============================");

         new NormalizedNodeWriter(console, new OutFormatter()).write(cont1, redData);
 
     }
         new NormalizedNodeWriter(console, new OutFormatter()).write(cont1, redData);
 
     }

diff --git a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
index 5a2445279b4df24214d0c998f8fa78ba6f17d3a2..d6dabb9fe33130cb537875dab06ef0dc1b373fb3 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
+++ b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
@@ -7,16 +7,13 @@
  */
 package org.opendaylight.controller.netconf.cli.io;
 
  */
 package org.opendaylight.controller.netconf.cli.io;
 

+import com.google.common.collect.Maps;

 import java.util.Map;
 import java.util.Map;

-

 import junit.framework.Assert;
 import junit.framework.Assert;

-

 import org.junit.Test;
 import org.opendaylight.controller.netconf.cli.commands.CommandConstants;
 import org.opendaylight.yangtools.yang.common.QName;
 
 import org.junit.Test;
 import org.opendaylight.controller.netconf.cli.commands.CommandConstants;
 import org.opendaylight.yangtools.yang.common.QName;
 

-import com.google.common.collect.Maps;
-

 public class IOUtilTest {
 
     @Test
 public class IOUtilTest {
 
     @Test