Merge "Fixing checkstyle and javadoc errors"

3 files changed, 4 insertions, 6 deletions

diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
index c1d939e..4698f21 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
@@ -86,8 +86,8 @@ abstract class BaseDCAEAnalyticsCommonTest {
             final String newLine = System.getProperty("line.separator");
             String line = reader.readLine();
             while (line != null) {
-                result.append(line);
-                result.append(newLine);
+                result.append(line)
+                    .append(newLine);
                 line = reader.readLine();
             }
             jsonFileInputStream.close();
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
index 84feb1d..ddc996a 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
@@ -26,6 +26,4 @@ package org.openecomp.dcae.apod.analytics.test;
  * @author Rajiv Singla . Creation Date: 10/6/2016.
  */
 public abstract class BaseDCAEAnalyticsUnitTest extends BaseDCAEAnalyticsCommonTest {
-
-
 }
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
index 6c6071e..6353442 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
@@ -40,7 +40,7 @@ public class GuiceJUnitRunner extends BlockJUnit4ClassRunner {
 
     private static final Logger LOG = LoggerFactory.getLogger(GuiceJUnitRunner.class);
 
-    private Injector injector;
+    private final Injector injector;
 
     public GuiceJUnitRunner(Class<?> klass) throws InitializationError {
         super(klass);
@@ -71,7 +71,7 @@ public class GuiceJUnitRunner extends BlockJUnit4ClassRunner {
         Module[] modules = new Module[classes.length];
         for (int i = 0; i < classes.length; i++) {
             try {
-                modules[i] = (Module) (classes[i]).newInstance();
+                modules[i] = (Module) classes[i].newInstance();
             } catch (InstantiationException | IllegalAccessException e) {
                 throw new InitializationError(e);
             }