Merge pull request #411 from splunk/fix-sonar-issue

Fix sonar issue

Author: VihasMakwana

pom.xml

@@ -21,6 +21,7 @@
         <jackson.version>2.14.2</jackson.version>
         <kafka.version>3.4.0</kafka.version>
         <slf4j.version>2.0.7</slf4j.version>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/coverage-reports/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <dependencies>
@@ -194,6 +195,11 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId> 
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.9</version>
+        </dependency>
 
     </dependencies>
 
@@ -321,6 +327,12 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.10.0.2594</version>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0</version>

sonar-project.properties

@@ -2,3 +2,5 @@ sonar.projectKey=github-mirrors.kafka-connect-splunk
 sonar.sources=src/main/java/
 sonar.language=java
 sonar.java.binaries=.
+sonar.exclusions=src/java/test/**,**/examples/**
+sonar.java.coveragePlugin=jacoco

src/main/java/com/splunk/hecclient/ConcurrentHec.java

@@ -74,7 +74,6 @@ public final void close() {
         }
 
         stopped = true;
-        // executorService.shutdownNow();
         executorService.shutdown();
     }
 

src/main/java/com/splunk/hecclient/DoubleSerializer.java

@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 /*
  * Copyright 2017 Splunk, Inc..
@@ -26,7 +27,7 @@
 public class DoubleSerializer extends JsonSerializer<Double> {
     @Override
     public void serialize(Double value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-        String d = new BigDecimal(value).setScale(6, BigDecimal.ROUND_HALF_UP).toPlainString();
+        String d = BigDecimal.valueOf(value).setScale(6, RoundingMode.HALF_UP).toPlainString();
         jgen.writeNumber(d);
     }
 }

src/main/java/com/splunk/hecclient/Hec.java

@@ -351,7 +351,7 @@ public static SSLContext loadTrustManagerFactory(KeyStore keyStore) {
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
             tmf.init(keyStore);
 
-            SSLContext sslContext = SSLContext.getInstance("SSL");
+            SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
             sslContext.init(null, tmf.getTrustManagers(), new SecureRandom());
 
             return sslContext;

src/main/java/com/splunk/hecclient/HecAckPoller.java

@@ -131,7 +131,7 @@ public void add(HecChannel channel, EventBatch batch, String response) {
             return;
         }
 
-        if (resp.getText() == "Invalid data format") {
+        if (resp.getText().equals("Invalid data format")) {
             log.warn("Invalid Splunk HEC data format. Ignoring events. channel={} index={} events={}", channel, channel.getIndexer(), batch.toString());
             batch.commit();
             List<EventBatch> committedBatches = new ArrayList<>();

src/main/java/com/splunk/hecclient/Indexer.java

@@ -62,13 +62,12 @@ final class Indexer implements IndexerInf {
     private Poller poller;
     private long backPressure;
     private long lastBackPressure;
-    private long backPressureThreshold = 60 * 1000; // 1 min
+    private long backPressureThreshold = Long.valueOf(60) * 1000; // 1 min
 
     // Indexer doesn't own client, ack poller
     public Indexer(String baseUrl,CloseableHttpClient client,Poller poller,HecConfig config) {
         this.httpClient = client;
         this.baseUrl = baseUrl;
-        this.hecToken = hecToken;
         this.hecConfig = config;
         this.hecToken = config.getToken();
         this.poller = poller;
@@ -273,7 +272,7 @@ private String readAndCloseResponse(CloseableHttpResponse resp) {
 
             String respText = (jsonNode.has("text")) ? jsonNode.get("text").asText() : null;
 
-            if (respText == "Invalid data format") {
+            if (respText.equals("Invalid data format")) {
                 ObjectNode objNode = jsonMapper.createObjectNode();
                 objNode.put("text", "Invalid data format");
                 objNode.put("code", 0); // Mark it as success

src/main/java/com/splunk/hecclient/JsonEventBatch.java

@@ -18,8 +18,8 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 public final class JsonEventBatch extends EventBatch {
-    public static final String endpoint = "/services/collector/event";
-    public static final String contentType = "application/json; profile=urn:splunk:event:1.0; charset=utf-8";
+    public static final String ENDPOINT = "/services/collector/event";
+    public static final String CONTENT_TYPE = "application/json; profile=urn:splunk:event:1.0; charset=utf-8";
 
     @Override
     public void add(Event event) {
@@ -33,12 +33,12 @@ public void add(Event event) {
 
     @Override
     public final String getRestEndpoint() {
-        return endpoint;
+        return ENDPOINT;
     }
 
     @Override
     public String getContentType() {
-        return contentType;
+        return CONTENT_TYPE;
     }
 
     @Override
@@ -49,15 +49,15 @@ public EventBatch createFromThis() {
     @Override
     public int hashCode() {
         return new HashCodeBuilder()
-        .append(endpoint)
+        .append(ENDPOINT)
         .toHashCode();
     }
 
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof JsonEventBatch) {
             final JsonEventBatch other = (JsonEventBatch) obj;
-            return endpoint.equals(endpoint);
+            return obj.equals(other);
         }
         return false;
     }

src/main/java/com/splunk/hecclient/RawEventBatch.java

@@ -20,8 +20,8 @@
 import org.apache.http.client.utils.URIBuilder;
 
 public final class RawEventBatch extends EventBatch {
-    public static final String endpoint = "/services/collector/raw";
-    public static final String contentType = "text/plain; profile=urn:splunk:event:1.0; charset=utf-8";
+    public static final String ENDPOINT = "/services/collector/raw";
+    public static final String CONTENT_TYPE = "text/plain; profile=urn:splunk:event:1.0; charset=utf-8";
 
     private String index;
     private String source;
@@ -111,12 +111,12 @@ public void add(Event event) throws HecException {
 
     @Override
     public final String getRestEndpoint() {
-        return  endpoint + getMetadataParams();
+        return  ENDPOINT + getMetadataParams();
     }
 
     @Override
     public String getContentType() {
-        return contentType;
+        return CONTENT_TYPE;
     }
 
     @Override

src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java

@@ -42,7 +42,7 @@
 
 public final class SplunkSinkTask extends SinkTask implements PollerCallback {
     private static final Logger log = LoggerFactory.getLogger(SplunkSinkTask.class);
-    private static long flushWindow = 30 * 1000; // 30 seconds
+    private static long flushWindow = Long.valueOf(30) * 1000; // 30 seconds
     private static final String HEADERTOKEN = "$$$";
 
     private HecInf hec;
@@ -71,7 +71,7 @@ public void start(Map<String, String> taskConfig) {
         tracker = new KafkaRecordTracker();
         bufferedRecords = new ArrayList<>();
         if(connectorConfig.flushWindow > 0) {
-            flushWindow = connectorConfig.flushWindow * 1000; // Flush window set to user configured value (Multiply by 1000 as all the calculations are done in milliseconds)
+            flushWindow = connectorConfig.flushWindow * Long.valueOf(1000); // Flush window set to user configured value (Multiply by 1000 as all the calculations are done in milliseconds)
         }
 
         log.info("kafka-connect-splunk task starts with config={}", connectorConfig);
@@ -569,10 +569,9 @@ private void timestampExtraction(Event event) {
 
         if (connectorConfig.timestampFormat.equalsIgnoreCase("epoch")) {
             try {
-                double epoch;
-                epoch = ((Double.parseDouble(timestamp)));
-                long long_epoch = (new Double(epoch)).longValue();
-                event.setTime(epoch / (Math.pow(10, Long.toString(long_epoch).length()-10)));
+                double epoch = (Double.parseDouble(timestamp));
+                long long_epoch = Double.valueOf(epoch).longValue();
+                event.setTime(epoch / (Math.pow(10, Long.toString(long_epoch).length()-10.00)));
 
             } catch (Exception e) {
                 log.warn("Could not set the time", e);