Skip to content

Commit ce7d199

Browse files
VihasMakwanaVihasMakwana
authored
Merge pull request #412 from splunk/fix-jacoco-report
fix: add jacoco report
2 parents 83ba459 + b64fc97 commit ce7d199

File tree

8 files changed

+31
-36
lines changed

8 files changed

+31
-36
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public final class HecAckPoller implements Poller {
3333
private static final Logger log = LoggerFactory.getLogger(HecAckPoller.class);
3434
private static final ObjectMapper jsonMapper = new ObjectMapper();
3535

36-
private static final String ackEndpoint = "/services/collector/ack";
36+
private static final String ACK_ENDPOINT = "/services/collector/ack";
3737

3838
private ConcurrentHashMap<HecChannel, ConcurrentHashMap<Long, EventBatch>> outstandingEventBatches;
3939
private AtomicLong totalOutstandingEventBatches;
@@ -382,7 +382,7 @@ private static HttpUriRequest createAckPollHttpRequest(HecChannel ch, Set<Long>
382382

383383
entity.setContentType("application/json; profile=urn:splunk:event:1.0; charset=utf-8");
384384

385-
String url = ch.getIndexer().getBaseUrl() + ackEndpoint;
385+
String url = ch.getIndexer().getBaseUrl() + ACK_ENDPOINT;
386386
final HttpPost httpPost = new HttpPost(url);
387387
httpPost.setHeaders(ch.getIndexer().getHeaders());
388388
httpPost.setEntity(entity);

‎src/main/java/com/splunk/hecclient/ResponsePoller.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@ public ResponsePoller(PollerCallback callback) {
3232
}
3333

3434
@Override
35-
public void stickySessionHandler(HecChannel channel) {}
35+
public void stickySessionHandler(HecChannel channel) {
36+
// Only required while acknowledgement=true
37+
}
3638

3739
@Override
3840
public void start() {
41+
// Only required while acknowledgement=true
3942
}
4043

4144
@Override
4245
public void stop() {
46+
// Only required while acknowledgement=true
4347
}
4448

4549
@Override
@@ -68,7 +72,7 @@ public void add(HecChannel channel, EventBatch batch, String resp) {
6872
fail(channel, batch, new HecException(response.getText()));
6973
return;
7074
}
71-
if (response.getText() == "Invalid data format") {
75+
if (response.getText().equals("Invalid data format")) {
7276
log.warn("Invalid Splunk HEC data format. Ignoring events. channel={} index={} events={}", channel, channel.getIndexer(), batch.toString());
7377
}
7478
} catch (Exception ex) {

‎src/main/java/com/splunk/kafka/connect/SplunkSinkConnector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private void executeHttpRequest(final HttpUriRequest req, CloseableHttpClient ht
217217
resp.close();
218218
}
219219
} catch (Exception ex) {
220-
throw new ConfigException("failed to close http response",ex);
220+
throw new ConfigException("failed to close http response",ex); // NOSONAR
221221
}
222222
}
223223
}

‎src/main/java/com/splunk/kafka/connect/SplunkSinkConnectorConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,10 @@ public static ConfigDef conf() {
360360
.define(MAX_BATCH_SIZE_CONF, ConfigDef.Type.INT, 500, ConfigDef.Importance.MEDIUM, MAX_BATCH_SIZE_DOC)
361361
.define(HEADER_SUPPORT_CONF, ConfigDef.Type.BOOLEAN, false, ConfigDef.Importance.MEDIUM, HEADER_SUPPORT_DOC)
362362
.define(HEADER_CUSTOM_CONF, ConfigDef.Type.STRING, "", ConfigDef.Importance.MEDIUM, HEADER_CUSTOM_DOC)
363-
.define(HEADER_INDEX_CONF, ConfigDef.Type.STRING, "splunk.header.index", ConfigDef.Importance.MEDIUM, HEADER_INDEX_DOC)
364-
.define(HEADER_SOURCE_CONF, ConfigDef.Type.STRING, "splunk.header.source", ConfigDef.Importance.MEDIUM, HEADER_SOURCE_DOC)
365-
.define(HEADER_SOURCETYPE_CONF, ConfigDef.Type.STRING, "splunk.header.sourcetype", ConfigDef.Importance.MEDIUM, HEADER_SOURCETYPE_DOC)
366-
.define(HEADER_HOST_CONF, ConfigDef.Type.STRING, "splunk.header.host", ConfigDef.Importance.MEDIUM, HEADER_HOST_DOC)
363+
.define(HEADER_INDEX_CONF, ConfigDef.Type.STRING, HEADER_INDEX_CONF, ConfigDef.Importance.MEDIUM, HEADER_INDEX_DOC)
364+
.define(HEADER_SOURCE_CONF, ConfigDef.Type.STRING, HEADER_SOURCE_CONF, ConfigDef.Importance.MEDIUM, HEADER_SOURCE_DOC)
365+
.define(HEADER_SOURCETYPE_CONF, ConfigDef.Type.STRING, HEADER_SOURCETYPE_CONF, ConfigDef.Importance.MEDIUM, HEADER_SOURCETYPE_DOC)
366+
.define(HEADER_HOST_CONF, ConfigDef.Type.STRING, HEADER_HOST_CONF, ConfigDef.Importance.MEDIUM, HEADER_HOST_DOC)
367367
.define(LB_POLL_INTERVAL_CONF, ConfigDef.Type.INT, 120, ConfigDef.Importance.LOW, LB_POLL_INTERVAL_DOC)
368368
.define(ENABLE_COMPRESSSION_CONF, ConfigDef.Type.BOOLEAN, false, ConfigDef.Importance.MEDIUM, ENABLE_COMPRESSSION_DOC)
369369
.define(DISABLE_VALIDATION, ConfigDef.Type.BOOLEAN, false, ConfigDef.Importance.MEDIUM, DISABLE_VALIDATION_DOC)

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

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -224,40 +224,32 @@ public String headerId(SinkRecord sinkRecord) {
224224

225225
if(indexHeader != null) {
226226
headerString.append(indexHeader.value().toString());
227-
} else {
228-
if(metas != null) {
229-
headerString.append(metas.get("index"));
230-
}
227+
} else if (metas != null) {
228+
headerString.append(metas.get("index"));
231229
}
232230

233231
headerString.append(insertHeaderToken());
234232

235233
if(hostHeader != null) {
236234
headerString.append(hostHeader.value().toString());
237-
} else {
238-
if(metas != null) {
239-
headerString.append("default-host");
240-
}
235+
} else if (metas != null) {
236+
headerString.append("default-host");
241237
}
242238

243239
headerString.append(insertHeaderToken());
244240

245241
if(sourceHeader != null) {
246242
headerString.append(sourceHeader.value().toString());
247-
} else {
248-
if(metas != null) {
249-
headerString.append(metas.get("source"));
250-
}
243+
} else if (metas != null) {
244+
headerString.append(metas.get("source"));
251245
}
252246

253247
headerString.append(insertHeaderToken());
254248

255249
if(sourcetypeHeader != null) {
256250
headerString.append(sourcetypeHeader.value().toString());
257-
} else {
258-
if(metas != null) {
259-
headerString.append(metas.get("sourcetype"));
260-
}
251+
} else if (metas != null) {
252+
headerString.append(metas.get("sourcetype"));
261253
}
262254

263255
headerString.append(insertHeaderToken());
@@ -441,7 +433,7 @@ private Event createHecEventFrom(final SinkRecord record) {
441433

442434
private Event addHeaders(Event event, SinkRecord record) {
443435
Headers headers = record.headers();
444-
if(headers.isEmpty() && connectorConfig.headerCustom.isEmpty()) {
436+
if (headers.isEmpty() && connectorConfig.headerCustom.isEmpty()) {
445437
return event;
446438
}
447439

@@ -469,13 +461,10 @@ private Event addHeaders(Event event, SinkRecord record) {
469461
String[] customHeaders = connectorConfig.headerCustom.split(",\\s?");
470462
Map<String, String> headerMap = new HashMap<>();
471463
for (String header : customHeaders) {
472-
Header customHeader = headers.lastWithName(header);
464+
Header customHeader = headers.lastWithName(header);
473465
if (customHeader != null) {
474-
if (customHeader.value() == null) {
475-
headerMap.put(header, null);
476-
} else {
477-
headerMap.put(header, customHeader.value().toString());
478-
}
466+
String value = customHeader.value() == null ? null : customHeader.value().toString();
467+
headerMap.put(header, value);
479468
}
480469
}
481470
event.addFields(headerMap);

‎src/test/java/com/splunk/hecclient/PollerMock.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ public void add(HecChannel channel, EventBatch batch, String resp) {
6363
}
6464

6565
@Override
66-
public void stickySessionHandler(HecChannel channel) {}
66+
public void stickySessionHandler(HecChannel channel) {
67+
// Not required for mock
68+
}
6769

6870
public boolean isStarted() {
6971
return started;

‎target/site/jacoco/jacoco.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ splunk-kafka-connect,com.splunk.hecclient,Hec,38,298,4,14,10,74,4,20,0,15
77
splunk-kafka-connect,com.splunk.hecclient,ConcurrentHec,23,196,1,13,6,50,1,16,0,10
88
splunk-kafka-connect,com.splunk.hecclient,HecException,0,9,0,0,0,4,0,2,0,2
99
splunk-kafka-connect,com.splunk.hecclient,LoadBalancer,48,362,8,24,12,87,7,23,1,13
10-
splunk-kafka-connect,com.splunk.hecclient,HecAckPoller,122,711,11,45,34,160,9,44,0,25
10+
splunk-kafka-connect,com.splunk.hecclient,HecAckPoller,122,711,12,44,34,160,10,43,0,25
1111
splunk-kafka-connect,com.splunk.hecclient,HecAckPoller.RunAckQuery,21,26,0,0,3,8,0,2,0,2
1212
splunk-kafka-connect,com.splunk.hecclient,HttpClientBuilder,69,132,0,4,16,46,2,13,2,11
1313
splunk-kafka-connect,com.splunk.hecclient,RawEvent,11,63,0,8,3,17,0,8,0,4
@@ -38,4 +38,4 @@ splunk-kafka-connect,com.splunk.kafka.connect,SplunkSinkRecord,74,188,14,14,22,4
3838
splunk-kafka-connect,com.splunk.kafka.connect,SplunkSinkConnectorConfig,5,1255,6,72,1,195,6,47,0,14
3939
splunk-kafka-connect,com.splunk.kafka.connect,SplunkSinkConnector,57,338,3,25,11,79,4,26,1,15
4040
splunk-kafka-connect,com.splunk.kafka.connect,AbstractClientWrapper,0,3,0,0,0,1,0,1,0,1
41-
splunk-kafka-connect,com.splunk.kafka.connect,SplunkSinkTask,670,858,66,60,135,194,49,47,8,25
41+
splunk-kafka-connect,com.splunk.kafka.connect,SplunkSinkTask,668,858,66,60,134,194,49,47,8,25

‎target/site/jacoco/jacoco.xml‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)