-#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178988019
-#Mon Aug 13 09:49:48 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=GET
-password=secret
-routeOffer=MR1
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-username=key
-Version=1.0
-group=junit-client
-timeout=1000
-SubContextPath=/
-authDate=2016-02-18T13\:57\:37-0800
-filter=
-authKey=01234567890abcde\:01234567890abcdefghijklmn
-Environment=TEST
-host=192.168.1.1
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-id=junit-consumer-one
-Latitude=50.000000
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPNOAUTH
-AFT_ENVIRONMENT=AFTUAT
-limit=5
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120536\r
+#Fri Nov 23 13:18:40 EST 2018\r
+AFT_DME2_EP_CONN_TIMEOUT=15000\r
+MethodType=GET\r
+password=admin\r
+routeOffer=MR1\r
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties\r
+Longitude=-100.000000\r
+username=admin\r
+Version=1.0\r
+group=junit-client\r
+timeout=15000\r
+SubContextPath=/\r
+authDate=2016-02-18T13\:57\:37-0800\r
+filter=none\r
+authKey=01234567890abcde\:01234567890abcdefghijklmn\r
+Environment=TEST\r
+host=192.168.10.10\r
+Protocol=http\r
+Partner=BOT_R\r
+contenttype=application/json\r
+id=junit-consumer-one\r
+Latitude=50.000000\r
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events\r
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler\r
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler\r
+topic=JunitTopicOne\r
+TransportType=HTTPNOAUTH\r
+AFT_ENVIRONMENT=AFTUAT\r
+limit=1000\r
+AFT_DME2_EP_READ_TIMEOUT_MS=50000\r
+sessionstickinessrequired=NO\r
+AFT_DME2_REQ_TRACE_ON=true\r
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000\r
-#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178854566
-#Mon Aug 13 09:47:34 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=GET
-routeOffer=MR1
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-Version=1.0
-group=junit-client
-timeout=15000
-SubContextPath=/
-filter=none
-Environment=TEST
-host=192.168.10.10
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-Latitude=50.000000
-id=junit-consumer-two
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPAAF
-AFT_ENVIRONMENT=AFTUAT
-limit=1000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120526\r
+#Fri Nov 23 13:18:40 EST 2018\r
+AFT_DME2_EP_CONN_TIMEOUT=15000\r
+MethodType=GET\r
+routeOffer=MR1\r
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties\r
+Longitude=-100.000000\r
+Version=1.0\r
+group=junit-client\r
+timeout=15000\r
+SubContextPath=/\r
+filter=none\r
+Environment=TEST\r
+host=192.168.10.10\r
+Protocol=http\r
+Partner=BOT_R\r
+contenttype=application/json\r
+Latitude=50.000000\r
+id=junit-consumer-two\r
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events\r
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler\r
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler\r
+topic=JunitTopicOne\r
+TransportType=HTTPAAF\r
+AFT_ENVIRONMENT=AFTUAT\r
+limit=1000\r
+AFT_DME2_EP_READ_TIMEOUT_MS=50000\r
+sessionstickinessrequired=NO\r
+AFT_DME2_REQ_TRACE_ON=true\r
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000\r
-#producer.properties file created on the fly for topic:JunitTopicOne on:1534178854558
-#Mon Aug 13 09:47:34 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=POST
-password=admin
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-username=admin
-partition=2
-Version=1.0
-maxBatchSize=100
-group=junit-client
-SubContextPath=/
-authDate=2016-07-20T11\:30\:56-0700
-filter=none
-authKey=01234567890abcde\:01234567890abcdefghijklmn
-Environment=TEST
-host=192.168.10.10
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-id=junit-producer-one
-Latitude=50.000000
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPNOAUTH
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-MessageSentThreadOccurance=50
-maxAgeMs=250
+#producer.properties file created on the fly for topic:JunitTopicOne on:1542997120515\r
+#Fri Nov 23 13:18:40 EST 2018\r
+AFT_DME2_EP_CONN_TIMEOUT=15000\r
+MethodType=POST\r
+password=admin\r
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties\r
+Longitude=-100.000000\r
+username=admin\r
+partition=2\r
+Version=1.0\r
+maxBatchSize=100\r
+group=junit-client\r
+SubContextPath=/\r
+authDate=2016-07-20T11\:30\:56-0700\r
+filter=none\r
+authKey=01234567890abcde\:01234567890abcdefghijklmn\r
+Environment=TEST\r
+host=192.168.10.10\r
+Protocol=http\r
+Partner=BOT_R\r
+contenttype=application/json\r
+id=junit-producer-one\r
+Latitude=50.000000\r
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events\r
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler\r
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler\r
+topic=JunitTopicOne\r
+TransportType=HTTPNOAUTH\r
+AFT_ENVIRONMENT=AFTUAT\r
+AFT_DME2_EP_READ_TIMEOUT_MS=50000\r
+sessionstickinessrequired=NO\r
+AFT_DME2_REQ_TRACE_ON=true\r
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000\r
+MessageSentThreadOccurance=50\r
+maxAgeMs=250\r
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
import org.onap.appc.configuration.Configuration;
import org.onap.appc.configuration.ConfigurationFactory;
import org.onap.appc.metricservice.MetricRegistry;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
import org.onap.appc.configuration.Configuration;
import org.onap.appc.configuration.ConfigurationFactory;
import org.onap.appc.metricservice.MetricRegistry;
* ============LICENSE_END=========================================================
*/
-package org.onap.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.utils;
import java.io.File;
import java.io.FileInputStream;
import org.onap.appc.configuration.Configuration;
import org.onap.appc.configuration.ConfigurationFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
public class DmaapUtil {
static final String DMAAP_PROPERTIES_PATH = "org.onap.appc.dmaap.profile.path";
- private static final Logger log = LoggerFactory.getLogger(DmaapUtil.class);
+ private static final EELFLogger log = EELFManager.getInstance().getLogger(DmaapUtil.class);
private DmaapUtil() {
}
import com.att.nsa.mr.client.MRConsumer;
import org.json.JSONObject;
-import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
import com.att.nsa.mr.client.MRBatchingPublisher;
import com.att.nsa.mr.client.MRClientFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
<Private-Package>org.onap.appc.dg.common.impl.*</Private-Package>
<Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*,
*;resolution:=optional</Import-Package>
- <Embed-Dependency>appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
+ <Embed-Dependency>appc-dmaap-adapter-bundle,appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
<!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
<Embed-Transitive>true</Embed-Transitive>