X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdmf%2Fmr%2Fservice%2Fimpl%2FEventsServiceImpl.java;h=de33fbe5b14150ed2f1c5f0a017f2340e1a823a3;hb=d56955b6ed0374643531bec5b81d6bf2bdd25b74;hp=ec5bfc09e0493c300cb2bda4336453172cf10710;hpb=3d53d9c961c0fc04e004b3d3158bf9cacdab52b8;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

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 ec5bfc0..de33fbe 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
@@ -41,6 +41,7 @@ import java.util.Date;
 import java.util.LinkedList;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.http.HttpStatus;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -237,7 +238,7 @@ public class EventsServiceImpl implements EventsService {
 					throw new DMaaPAccessDeniedException(errRes);
 
 				}
-			} else if( null != metaTopic.getOwner() && !metaTopic.getOwner().isEmpty()) {
+			} else if(metaTopic!=null && null != metaTopic.getOwner() && !metaTopic.getOwner().isEmpty()) {
 				final NsaApiKey user = DMaaPAuthenticatorImpl.getAuthenticatedUser(ctx);
 				if(SUBSCRIBE_ACTION.equals(action)) {
 					metaTopic.checkUserRead(user);
@@ -264,7 +265,7 @@ public class EventsServiceImpl implements EventsService {
 
 	private int getMessageTimeout(HttpServletRequest request) {
 		String timeoutMsAsString = getPropertyFromAJSCmap(TIMEOUT_PROPERTY);
-		int defaultTimeoutMs = timeoutMsAsString!=null ? NumberUtils.toInt(timeoutMsAsString, CambriaConstants.kNoTimeout) :
+		int defaultTimeoutMs = StringUtils.isNotEmpty(timeoutMsAsString) ? NumberUtils.toInt(timeoutMsAsString, CambriaConstants.kNoTimeout) :
 			CambriaConstants.kNoTimeout;
 
 		String timeoutProperty = request.getParameter(TIMEOUT_PROPERTY);
@@ -281,17 +282,17 @@ public class EventsServiceImpl implements EventsService {
 
 	private boolean isTopicNameEnforcedAaf(String topicName) {
 		String topicNameStd = getPropertyFromAJSCmap("enforced.topic.name.AAF");
-		return !topicNameStd.isEmpty() && topicName.startsWith(topicNameStd);
+		return StringUtils.isNotEmpty(topicNameStd) && topicName.startsWith(topicNameStd);
 	}
 
 	private boolean isCacheEnabled() {
 		String cachePropsSetting = getPropertyFromAJSCmap(ConsumerFactory.kSetting_EnableCache);
-		return !cachePropsSetting.isEmpty() ? Boolean.parseBoolean(cachePropsSetting) : ConsumerFactory.kDefault_IsCacheEnabled;
+		return StringUtils.isNotEmpty(cachePropsSetting) ? Boolean.parseBoolean(cachePropsSetting) : ConsumerFactory.kDefault_IsCacheEnabled;
 	}
 
 	private void verifyHostId() {
 		String lhostId = getPropertyFromAJSCmap("clusterhostid");
-		if (lhostId.isEmpty()) {
+		if (StringUtils.isEmpty(lhostId)) {
 			try {
 				InetAddress.getLocalHost().getCanonicalHostName();
 			} catch (UnknownHostException e) {
@@ -303,7 +304,7 @@ public class EventsServiceImpl implements EventsService {
 
 	private String getMetricTopicName() {
 		String metricTopicFromProps = getPropertyFromAJSCmap("metrics.send.cambria.topic");
-		return !metricTopicFromProps.isEmpty() ? metricTopicFromProps : "msgrtr.apinode.metrics.dmaap";
+		return StringUtils.isNotEmpty(metricTopicFromProps) ? metricTopicFromProps : "msgrtr.apinode.metrics.dmaap";
 	}
 
 	/**
@@ -324,9 +325,6 @@ public class EventsServiceImpl implements EventsService {
 		validateIpBlacklist(errRespProvider, ctx);
 
 		final Topic metaTopic = ctx.getConfigReader().getfMetaBroker().getTopic(topic);
-		if (metaTopic == null) {
-			throw new CambriaApiException(errRespProvider.getTopicNotFoundError());
-		}
 
 		final boolean isAAFTopic = authorizeClientWhenNeeded(ctx, metaTopic, topic, errRespProvider, PUBLISH_ACTION);
 
@@ -360,7 +358,8 @@ public class EventsServiceImpl implements EventsService {
 	}
 
 	private boolean isTransactionIdRequired() {
-		return getPropertyFromAJSCmap("transidUEBtopicreqd").equalsIgnoreCase("true");
+		String transIdReqProperty = getPropertyFromAJSCmap("transidUEBtopicreqd");
+		return StringUtils.isNotEmpty(transIdReqProperty) && transIdReqProperty.equalsIgnoreCase("true");
 	}
 
 	/**