summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml26
-rw-r--r--src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java3
-rw-r--r--src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java2
-rw-r--r--src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java3
-rw-r--r--src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java4
-rw-r--r--src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java4
-rw-r--r--src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java3
-rw-r--r--version.properties2
8 files changed, 32 insertions, 15 deletions
diff --git a/pom.xml b/pom.xml
index f405389..f5aa22a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
<artifactId>msgrtr</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dmaap-messagerouter-msgrtr</name>
<description>Message Router - Restful interface built for kafka</description>
@@ -26,12 +26,13 @@
</parent>
<properties>
- <spring.version>3.2.15.RELEASE</spring.version>
+ <spring.version>3.2.18.RELEASE</spring.version>
<cxf.version>3.0.4</cxf.version>
<jstl.version>1.2</jstl.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -81,6 +82,21 @@
</developers>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>8.0.49</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>8.0.49</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>8.0.49</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -103,7 +119,7 @@
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-web</artifactId>
- <version>2.4.4</version>
+ <version>2.5.4</version>
<exclusions>
<exclusion>
<groupId>org.grails</groupId>
@@ -114,7 +130,7 @@
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-bootstrap</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -271,7 +287,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.6</version>
+ <version>3.4.10</version>
</dependency>
<!-- JSON libraries -->
diff --git a/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
index 178d143..627a433 100644
--- a/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
+++ b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
@@ -268,6 +268,7 @@ public class KafkaConsumerCache {
} catch (InterruptedException e) {
// Ignore
log.error("error while setting curator framework :" + e.getMessage());
+ Thread.currentThread().interrupt();
}
}
@@ -402,7 +403,7 @@ public class KafkaConsumerCache {
} catch (NoNodeException e) {
log.error("Exception at : " + e);
} catch (Exception e) {
- log.debug("Unexpected exception while deleting consumer: " + e.getMessage());
+ log.error("Unexpected exception while deleting consumer: " + e);
}
log.info("Dropped " + key + " consumer due to timeout");
diff --git a/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
index 59dc9bf..02ae109 100644
--- a/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
+++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaConsumerFactory.java
@@ -187,7 +187,7 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
" String consumerId, int timeoutMs) : " + x);
throw new UnavailableException("Couldn't connect to ZK.");
} catch (KafkaConsumerCacheException e) {
- log.warn("Failed to cache consumer (this may have performance implications): "
+ log.error("Failed to cache consumer (this may have performance implications): "
+ e.getMessage());
} catch (Exception e) {
throw new UnavailableException(
diff --git a/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
index 052cc78..d7e6816 100644
--- a/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
+++ b/src/main/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
@@ -190,7 +190,8 @@ public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient
+ "Consider using CambriaBatchingPublisher.close( long timeout, TimeUnit timeoutUnits ) to recapture unsent messages on close.");
}
} catch (InterruptedException e) {
- getLog().warn("Possible message loss. " + e.getMessage(), e);
+ getLog().info(" Interruption Exception is caught here : " + e.getMessage());
+ Thread.currentThread().interrupt();
} catch (IOException e) {
getLog().warn("Possible message loss. " + e.getMessage(), e);
}
diff --git a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
index 97ca1fd..6f4d9c9 100644
--- a/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImpl.java
@@ -62,7 +62,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
String permission = "";
String nameSpace ="";
- if(topicName.contains(".") && (topicName.contains("com.att")||topicName.contains("org"))) {
+ if(topicName.contains(".") && (topicName.contains("com.onap")||topicName.contains("org"))) {
//String topic = topicName.substring(topicName.lastIndexOf(".")+1);
nameSpace = topicName.substring(0,topicName.lastIndexOf("."));
}
@@ -70,7 +70,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
nameSpace = null;
nameSpace= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"defaultNSforUEB");
- if(null==nameSpace)nameSpace="com.att.dmaap.mr.ueb";
+ if(null==nameSpace)nameSpace="com.onap.dmaap.mr.ueb";
/*ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_FORBIDDEN,
diff --git a/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java
index e99def5..bb2effd 100644
--- a/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/EventsServiceImpl.java
@@ -436,7 +436,7 @@ public class EventsServiceImpl implements EventsService {
final long startMs = System.currentTimeMillis();
long count = 0;
- long maxEventBatch=1024 * 16;
+ long maxEventBatch=(long)1024 * 16;
String batchlen = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,BATCH_LENGTH);
if(null!=batchlen)maxEventBatch=Long.parseLong(batchlen);
@@ -535,7 +535,7 @@ public class EventsServiceImpl implements EventsService {
// start processing, building a batch to push to the backend
final long startMs = System.currentTimeMillis();
long count = 0;
- long maxEventBatch = 1024 * 16;
+ long maxEventBatch = (long)1024 * 16;
String evenlen = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,BATCH_LENGTH);
if(null!=evenlen)maxEventBatch=Long.parseLong(evenlen);
//final long maxEventBatch = ctx.getConfigReader().getSettings().getLong(BATCH_LENGTH, 1024 * 16);
diff --git a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
index a9c1882..f539199 100644
--- a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
@@ -224,8 +224,7 @@ public class TopicServiceImpl implements TopicService {
throw new DMaaPAccessDeniedException(errRes);
}*/
- if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization") ||
- null != dmaapContext.getRequest().getHeader("cookie"))) {
+ if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization"))) {
//if (user == null && (null!=dmaapContext.getRequest().getHeader("Authorization") || null != dmaapContext.getRequest().getHeader("cookie"))) {
// ACL authentication is not provided so we will use the aaf authentication
LOGGER.info("Authorization the topic");
diff --git a/version.properties b/version.properties
index ac02ac5..05dc9e5 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=1
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}