Address more sonars in apex-pdp

[policy/apex-pdp.git] / services / services-engine / src / main / java / org / onap / policy / apex / service / engine / event / impl / filecarrierplugin / consumer / HeaderDelimitedTextBlockReader.java

diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java
index 07185c0..b127abf 100644 (file)
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java
@@ -1,19 +1,21 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -26,7 +28,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
-
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolTextTokenDelimitedParameters;
@@ -51,10 +52,7 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable
 
     // Indicates that text block processing starts at the first block of text
     private final boolean delimiterAtStart;
-    private boolean blockEndTokenUsed = false;
-
-    // The thread used to read the text from the stream
-    Thread textConsumputionThread;
+    private boolean blockEndTokenUsed;
 
     // The input stream for text
     private InputStream inputStream;
@@ -100,31 +98,26 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader# init(
-     * java.io.InputStream)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void init(final InputStream incomingInputStream) {
         this.inputStream = incomingInputStream;
 
         // Configure and start the text reading thread
-        textConsumputionThread = new ApplicationThreadFactory(this.getClass().getName()).newThread(this);
+        var textConsumputionThread = new ApplicationThreadFactory(this.getClass().getName()).newThread(this);
         textConsumputionThread.setDaemon(true);
         textConsumputionThread.start();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader# readTextBlock()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public TextBlock readTextBlock() throws IOException {
         // Holder for the current text block
-        final StringBuilder textBlockBuilder = new StringBuilder();
+        final var textBlockBuilder = new StringBuilder();
 
         // Wait for the timeout period if there is no input
         if (!eofOnInputStream && textLineQueue.isEmpty()) {
@@ -162,7 +155,7 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable
 
         // Condition the text block and return it
         final String textBlock = textBlockBuilder.toString().trim();
-        final boolean endOfText = (eofOnInputStream && textLineQueue.isEmpty() ? true : false);
+        final boolean endOfText = eofOnInputStream && textLineQueue.isEmpty();
 
         if (textBlock.length() > 0) {
             return new TextBlock(endOfText, textBlock);
@@ -171,16 +164,12 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Runnable#run()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void run() {
-        final BufferedReader textReader = new BufferedReader(new InputStreamReader(inputStream));
-
-        try {
+        try (var textReader = new BufferedReader(new InputStreamReader(inputStream))) {
             // Read the input line by line until we see end of file on the stream
             String line;
             while ((line = textReader.readLine()) != null) {