[DMAAP-CLIENT] First sonar issues review part2

update Copyright informations
fix checkstyle warning and fix code review comments
remove Prop

Issue-ID: DMAAP-1585
Change-Id: I445ca5d0888a555acbac70af7ed571be26d74f79
Signed-off-by: sliard <samuel.liard@gmail.com>

1 files changed, 42 insertions, 38 deletions

diff --git a/src/test/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchConsumerTest.java b/src/test/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchConsumerTest.java
index af5ccd2..26fee9e 100644
--- a/src/test/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchConsumerTest.java
+++ b/src/test/java/org/onap/dmaap/mr/client/impl/MRSimplerBatchConsumerTest.java
@@ -4,11 +4,13 @@
  *  ================================================================================
  *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *  ================================================================================
+ *  Modifications Copyright © 2021 Orange.
+ *  ================================================================================
  *  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.
@@ -17,54 +19,56 @@
  *  ============LICENSE_END=========================================================
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
+ *
  *******************************************************************************/
 
 package org.onap.dmaap.mr.client.impl;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
 
-import org.onap.dmaap.mr.client.MRClientFactory;
-import org.onap.dmaap.mr.client.MRConsumer;
 import static org.junit.Assert.assertNotNull;
 
 public class MRSimplerBatchConsumerTest {
-	
-	File outFile;
-	@Before
-	public void setUp() throws Exception {
-		Properties properties = new Properties();
-		properties.load(MRSimplerBatchConsumerTest.class.getClassLoader().getResourceAsStream("dme2/consumer.properties"));
-		
-		String routeFilePath="dme2/preferredRoute.txt";
-		
-		File file = new File(MRSimplerBatchConsumerTest.class.getClassLoader().getResource(routeFilePath).getFile());
-		properties.put("DME2preferredRouterFilePath", MRSimplerBatchConsumerTest.class.getClassLoader().getResource(routeFilePath).getFile());
-		
-		outFile = new File(file.getParent() + "/consumer_tmp.properties");
-		properties.store(new FileOutputStream(outFile), "");
-	}
-
-	@Test
-	public void testSend() throws IOException, InterruptedException {
-				
-		final MRConsumer cc = MRClientFactory.createConsumer(outFile.getPath());	
-		
-		try {
-			for(String msg : cc.fetch()){
-				System.out.println(msg);
-			}
-		} catch (Exception e) {
-			System.err.println ( e.getClass().getName () + ": " + e.getMessage () );
-		}
-		assertNotNull(cc);
-		
-	}
-	
+
+    File outFile;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties properties = new Properties();
+        properties.load(MRSimplerBatchConsumerTest.class.getClassLoader().getResourceAsStream("dme2/consumer.properties"));
+
+        String routeFilePath = "dme2/preferredRoute.txt";
+
+        File file = new File(MRSimplerBatchConsumerTest.class.getClassLoader().getResource(routeFilePath).getFile());
+        properties.put("DME2preferredRouterFilePath", MRSimplerBatchConsumerTest.class.getClassLoader().getResource(routeFilePath).getFile());
+
+        outFile = new File(file.getParent() + "/consumer_tmp.properties");
+        properties.store(new FileOutputStream(outFile), "");
+    }
+
+    @Test
+    public void testSend() throws IOException, InterruptedException {
+
+        final MRConsumer cc = MRClientFactory.createConsumer(outFile.getPath());
+
+        try {
+            for (String msg : cc.fetch()) {
+                System.out.println(msg);
+            }
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+        }
+        assertNotNull(cc);
+
+    }
+
 
 }