From 16ee41de2ed43289cf693f73ce5a5dda5145e461 Mon Sep 17 00:00:00 2001 From: "sunil.unnava" Date: Tue, 16 Apr 2019 12:08:18 -0400 Subject: [PATCH] revert few sonar fixes Issue-ID: DMAAP-1169 Change-Id: I8e72f126c4b28550c18651ef7c972d2ac42cf0af Signed-off-by: sunil.unnava --- pom.xml | 2 +- .../java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java | 2 +- .../org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java | 6 +++--- src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java | 2 +- .../metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java | 2 +- .../org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java | 2 +- .../java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java | 2 +- version.properties | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 2a18ecc..2ef8c0c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.onap.dmaap.messagerouter.msgrtr msgrtr - 1.1.16-SNAPSHOT + 1.1.17-SNAPSHOT jar dmaap-messagerouter-msgrtr Message Router - Restful interface built for kafka diff --git a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java index b3f3c8f..4e54a3c 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java @@ -119,7 +119,7 @@ public class Kafka011Consumer implements Consumer { } catch (InterruptedException x) { log.warn("After size>0, pending msg take() threw InterruptedException. Ignoring. (" + x.getMessage() + ")", x); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } Callable run = new Callable() { diff --git a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java index 04d1d9e..00b6a75 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java @@ -299,7 +299,7 @@ public class KafkaConsumerCache { curator.blockUntilConnected(); } catch (InterruptedException e) { log.error("error while setting curator framework :",e); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } } @@ -512,7 +512,7 @@ public class KafkaConsumerCache { Thread.sleep(consumerHandoverWaitMs); } catch (InterruptedException e) { log.error("InterruptedException in dropTimedOutConsumer",e); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } log.info("Dropped " + key + " consumer due to timeout"); } @@ -669,7 +669,7 @@ public class KafkaConsumerCache { Thread.sleep(consumerHandoverWaitMs); } catch (InterruptedException e) { log.error("InterruptedException in signalOwnership",e); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } } diff --git a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java index f645c8d..01c46e7 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java @@ -154,7 +154,7 @@ public class DMaaPCambriaLimiter { } } catch (InterruptedException e) { log.error("Exception "+ e); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } diff --git a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java index f59f704..9c1fcb2 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java @@ -198,7 +198,7 @@ public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient } } catch (InterruptedException e) { getLog().warn("Possible message loss. " + e.getMessage(), e); - Thread.currentThread().interrupt(); + //Thread.currentThread().interrupt(); } catch (IOException e) { getLog().warn("Possible message loss. " + e.getMessage(), e); } diff --git a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java index 537fc22..27ffc89 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java @@ -333,7 +333,7 @@ public class CambriaOutboundEventStream implements StreamWriter { // FIXME: would be good to wait/signal Thread.sleep(100); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + // Thread.currentThread().interrupt(); } } }); diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java index 5ce45ac..11c544f 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java @@ -220,7 +220,7 @@ public class EventsServiceImpl implements EventsService { } } // if headers are not provided then user will be null - if (topicNameEnforced&&user == null && null != ctx.getRequest().getHeader("Authorization")) { + if (topicNameEnforced ||(user == null && null != ctx.getRequest().getHeader("Authorization"))) { // the topic name will be sent by the client DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl(); diff --git a/version.properties b/version.properties index 2740ee4..8d21b0b 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=16 +patch=17 base_version=${major}.${minor}.${patch} -- 2.16.6