<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.13</version>
+ <version>1.14</version>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.20.0-GA</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusions>
</dependency>
<!-- Begin - Dependency on log4j for logging purpose -->
- <dependency>
+ <!-- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
- <!-- Log4j's enhanced pattern layout is shipped separately -->
+ Log4j's enhanced pattern layout is shipped separately
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
<version>1.2.17</version>
- </dependency>
+ </dependency> -->
<!-- End - Dependency on log4j for logging purpose -->
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.7</version>
+ </dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
+++ /dev/null
-/*******************************************************************************
- * ============LICENSE_START=======================================================
- * org.onap.dmaap
- * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *
- *******************************************************************************/
-/**
- *
- */
-package org.onap.dmaap.mr.logging;
-
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.spi.LoggingEvent;
-
-import org.onap.dmaap.mr.client.MRClientFactory;
-import org.onap.dmaap.mr.client.MRPublisher;
-
-/**
- * @author author
- *
- */
-public class MRAppender extends AppenderSkeleton {
-
- private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
- private MRPublisher fPublisher;
-
- //Provided through log4j configuration
- private String topic;
- private String partition;
- private String hosts;
- private int maxBatchSize = 1;
- private int maxAgeMs = 1000;
- private boolean compress = false;
-
- /**
- *
- */
- public MRAppender() {
- super();
- }
-
- /**
- * @param isActive
- */
- public MRAppender(boolean isActive) {
- super(isActive);
- }
-
- /* (non-Javadoc)
- * @see org.apache.log4j.Appender#close()
- */
- @Override
- public void close() {
- if (!this.closed) {
- this.closed = true;
- fPublisher.close();
- }
- }
-
- /* (non-Javadoc)
- * @see org.apache.log4j.Appender#requiresLayout()
- */
- @Override
- public boolean requiresLayout() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
- */
- @Override
- protected void append(LoggingEvent event) {
- final String message;
-
- if (this.layout == null) {
- message = event.getRenderedMessage();
- } else {
- message = this.layout.format(event);
- }
-
- try {
- fPublisher.send(partition, message);
- } catch (IOException e) {
- logger.error("IOException: ", e);
- }
- }
-
- @Override
- public void activateOptions() {
- if (hosts != null && topic != null && partition != null) {
- fPublisher = MRClientFactory.createBatchingPublisher(hosts.split(","), topic, maxBatchSize, maxAgeMs, compress);
- } else {
- logger.error("The Hosts, Topic, and Partition parameter are required to create a MR Log4J Appender");
- }
- }
- public String getTopic() {
- return topic;
- }
-
- public void setTopic(String topic) {
- this.topic = topic;
- }
-
- public String getPartition() {
- return partition;
- }
-
- public void setPartition(String partition) {
- this.partition = partition;
- }
-
- public String getHosts() {
- return hosts;
- }
-
- public void setHosts(String hosts) {
- this.hosts = hosts;
- }
-
- public int getMaxBatchSize() {
- return maxBatchSize;
- }
-
- public void setMaxBatchSize(int maxBatchSize) {
- this.maxBatchSize = maxBatchSize;
- }
-
- public int getMaxAgeMs() {
- return maxAgeMs;
- }
-
- public void setMaxAgeMs(int maxAgeMs) {
- this.maxAgeMs = maxAgeMs;
- }
-
- public boolean isCompress() {
- return compress;
- }
-
- public void setCompress(boolean compress) {
- this.compress = compress;
- }
-
-}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ HostSelectorTest.class, MRClientBuildersTest.class, MRClientFactoryTest.class})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ MRConsumerResponseTest.class, MRPublisherResponseTest.class,})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ DefaultLoggingFailoverFaultHandlerTest.class, HeaderReplyHandlerTest.class,PreferredRouteReplyHandlerTest.class,
PreferredRouteRequestHandlerTest.class,SimpleExamplePublisherTest.class })
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import junit.framework.TestSuite;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
-
-@RunWith(Suite.class)
-@SuiteClasses({ MRAppenderTest.class, })
-
-public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
-
- public static void main(String[] args) {
- LOGGER.info("Running the test suite");
-
- TestSuite tstSuite = new TestSuite();
- LOGGER.info("Total Test Counts " + tstSuite.countTestCases());
- }
-
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import static org.junit.Assert.assertTrue;
-
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class MRAppenderTest {
- private MRAppender appender = null;
-
- @Before
- public void setUp() throws Exception {
- appender = new MRAppender();
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- @Test
- public void testClose() {
- try {
- appender.close();
- } catch (NullPointerException e) {
- assertTrue(true);
- }
-
- assertTrue(true);
-
- }
-
- @Test
- public void testRequiresLayout() {
-
- appender.requiresLayout();
- assertTrue(true);
-
- }
-
- @Test
- public void testAppend() {
-
- try {
- appender.append(null);
- } catch (NullPointerException e) {
- assertTrue(true);
- }
-
- assertTrue(true);
-
- }
-
- @Test
- public void testActivateOptions() {
-
- appender.activateOptions();
- assertTrue(true);
-
- }
-
- @Test
- public void testGetTopic() {
-
- appender.getTopic();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetTopic() {
-
- appender.setTopic("testTopic");
- assertTrue(true);
-
- }
-
- @Test
- public void testGetPartition() {
-
- appender.getPartition();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetPartition() {
-
- appender.setPartition("partition");
- assertTrue(true);
-
- }
-
- @Test
- public void testGetHosts() {
-
- appender.getHosts();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetHosts() {
-
- appender.setHosts("hosts");
- assertTrue(true);
-
- }
-
- @Test
- public void testGetMaxBatchSize() {
-
- appender.getMaxBatchSize();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetMaxBatchSize() {
-
- appender.setMaxBatchSize(20);
- assertTrue(true);
-
- }
-
- @Test
- public void testGetMaxAgeMs() {
-
- appender.getMaxAgeMs();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetMaxAgeMs() {
-
- appender.setMaxAgeMs(15);
- assertTrue(true);
-
- }
-
- @Test
- public void testIsCompress() {
-
- appender.isCompress();
- assertTrue(true);
-
- }
-
- @Test
- public void testSetCompress() {
-
- appender.setCompress(true);
- assertTrue(true);
-
- }
-
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
-
-public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Result result = JUnitCore.runClasses(JUnitTestSuite.class);
- for (Failure failure : result.getFailures()) {
- LOGGER.info(failure.toString());
-
- }
- LOGGER.info(result.wasSuccessful());
- }
-
-}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ SimpleExamplePublisherTest.class, ProtocolTypeConstantsTest.class,
SimpleExamplePublisherWithResponseTest.class, SimpleExampleConsumerWithReturnResponseTest.class,})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ MRBatchingPublisherMockTest.class, MRConsumerMockTest.class,})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@SuiteClasses({ ApiKeyCommandTest.class, AuthCommandTest.class, ClusterCommandTest.class,
MessageCommandTest.class, MRCommandContextTest.class, TopicCommandTest.class, TraceCommandTest.class,})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
public static void main(String[] args) {
LOGGER.info("Running the test suite");
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.onap.dmaap.mr.client.JUnitTestSuite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
+
public static void main(String[] args) {
// TODO Auto-generated method stub
LOGGER.info(failure.toString());
}
- LOGGER.info(result.wasSuccessful());
+ LOGGER.info(String.valueOf(result.wasSuccessful()));
}
}
Code Review / dmaap / messagerouter / dmaapclient.git / commitdiff