You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/10/15 13:45:51 UTC
[camel-kafka-connector] branch master updated (b5b38c7 -> 9d6db14)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from b5b38c7 Updated CHANGELOG.md
new 22a5f56 core: remove unused methods from TaskHelper
new 7a0e751 core: compute content log level once upon startup
new 72bc2f1 TaskHelperTest: cleanup MyLogger class
new 1ccc60a TaskHelperTest: replace raw Map with generic version
new 176244b TaskHelperTest: replace double brace initialization with Camel's helpers
new 9d6db14 TaskHelperTest: iuse assertFalse instead of negated assertTrue
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/kafkaconnector/CamelSinkTask.java | 14 +-
.../camel/kafkaconnector/CamelSourceTask.java | 14 +-
.../camel/kafkaconnector/utils/TaskHelper.java | 86 ++-----
.../camel/kafkaconnector/utils/TaskHelperTest.java | 263 +++++----------------
4 files changed, 102 insertions(+), 275 deletions(-)
[camel-kafka-connector] 03/06: TaskHelperTest: cleanup MyLogger
class
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 72bc2f1891095235fd3f8e291927fe247bb44039
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 12:21:11 2020 +0200
TaskHelperTest: cleanup MyLogger class
---
.../org/apache/camel/kafkaconnector/utils/TaskHelperTest.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index f8e4758..8cb949f 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -176,8 +176,8 @@ public class TaskHelperTest {
assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
}
- class MyLogger extends LoggerWrapper {
- private Queue<String> events = new ConcurrentLinkedQueue<String>();
+ static class MyLogger extends LoggerWrapper {
+ private final Queue<String> events = new ConcurrentLinkedQueue<>();
public MyLogger(Logger logger, String fqcn) {
super(logger, fqcn);
@@ -188,9 +188,7 @@ public class TaskHelperTest {
}
private void log(LoggingLevel level, String msg) {
- StringBuilder sb = new StringBuilder()
- .append(level).append(" ").append(msg);
- events.add(sb.toString());
+ events.add(level + " " + msg);
}
@Override
[camel-kafka-connector] 02/06: core: compute content log level once
upon startup
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 7a0e751ee9ee2643627a344465e954765676f7e0
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 12:18:27 2020 +0200
core: compute content log level once upon startup
---
.../apache/camel/kafkaconnector/CamelSinkTask.java | 14 ++++-
.../camel/kafkaconnector/CamelSourceTask.java | 14 ++++-
.../camel/kafkaconnector/utils/TaskHelper.java | 58 ++++++++-----------
.../camel/kafkaconnector/utils/TaskHelperTest.java | 66 ++++++++--------------
4 files changed, 67 insertions(+), 85 deletions(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index 25d94f1..e64ee16 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.kafkaconnector.utils.CamelKafkaConnectMain;
@@ -55,8 +56,8 @@ public class CamelSinkTask extends SinkTask {
private CamelKafkaConnectMain cms;
private ProducerTemplate producer;
- private CamelSinkConnectorConfig config;
private Endpoint localEndpoint;
+ private LoggingLevel loggingLevel = LoggingLevel.OFF;
@Override
public String version() {
@@ -68,7 +69,14 @@ public class CamelSinkTask extends SinkTask {
try {
LOG.info("Starting CamelSinkTask connector task");
Map<String, String> actualProps = TaskHelper.mergeProperties(getDefaultConfig(), props);
- config = getCamelSinkConnectorConfig(actualProps);
+ CamelSinkConnectorConfig config = getCamelSinkConnectorConfig(actualProps);
+
+ try {
+ String levelStr = config.getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF);
+ loggingLevel = LoggingLevel.valueOf(levelStr.toUpperCase());
+ } catch (Exception e) {
+ LOG.debug("Invalid value for " + CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF + "property");
+ }
String remoteUrl = config.getString(CamelSinkConnectorConfig.CAMEL_SINK_URL_CONF);
final String marshaller = config.getString(CamelSinkConnectorConfig.CAMEL_SINK_MARSHAL_CONF);
@@ -124,7 +132,7 @@ public class CamelSinkTask extends SinkTask {
@Override
public void put(Collection<SinkRecord> sinkRecords) {
for (SinkRecord record : sinkRecords) {
- TaskHelper.logRecordContent(LOG, record, config);
+ TaskHelper.logRecordContent(LOG, loggingLevel, record);
Exchange exchange = new DefaultExchange(producer.getCamelContext());
exchange.getMessage().setBody(record.value());
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index c793f1b..247edd3 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.PollingConsumer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.kafkaconnector.utils.CamelKafkaConnectMain;
@@ -52,12 +53,12 @@ public class CamelSourceTask extends SourceTask {
private static final String LOCAL_URL = "direct:end";
private CamelKafkaConnectMain cms;
- private CamelSourceConnectorConfig config;
private PollingConsumer consumer;
private String[] topics;
private Long maxBatchPollSize;
private Long maxPollDuration;
private String camelMessageHeaderKey;
+ private LoggingLevel loggingLevel = LoggingLevel.OFF;
@Override
public String version() {
@@ -69,7 +70,14 @@ public class CamelSourceTask extends SourceTask {
try {
LOG.info("Starting CamelSourceTask connector task");
Map<String, String> actualProps = TaskHelper.mergeProperties(getDefaultConfig(), props);
- config = getCamelSourceConnectorConfig(actualProps);
+ CamelSourceConnectorConfig config = getCamelSourceConnectorConfig(actualProps);
+
+ try {
+ String levelStr = config.getString(CamelSourceConnectorConfig.CAMEL_SOURCE_CONTENT_LOG_LEVEL_CONF);
+ loggingLevel = LoggingLevel.valueOf(levelStr.toLowerCase());
+ } catch (Exception e) {
+ LOG.debug("Invalid value for " + CamelSourceConnectorConfig.CAMEL_SOURCE_CONTENT_LOG_LEVEL_CONF + "property");
+ }
maxBatchPollSize = config.getLong(CamelSourceConnectorConfig.CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_CONF);
maxPollDuration = config.getLong(CamelSourceConnectorConfig.CAMEL_SOURCE_MAX_POLL_DURATION_CONF);
@@ -156,7 +164,7 @@ public class CamelSourceTask extends SourceTask {
setAdditionalHeaders(record, exchange.getProperties(), PROPERTY_CAMEL_PREFIX);
}
- TaskHelper.logRecordContent(LOG, record, config);
+ TaskHelper.logRecordContent(LOG, loggingLevel, record);
records.add(record);
}
collectedRecords++;
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
index ecdb5a3..e7f8c83 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
@@ -24,14 +24,10 @@ import java.util.Set;
import org.apache.camel.LoggingLevel;
import org.apache.camel.catalog.RuntimeCamelCatalog;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
import org.apache.camel.tooling.model.BaseOptionModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.JsonMapper;
-import org.apache.kafka.common.config.AbstractConfig;
import org.apache.kafka.connect.connector.ConnectRecord;
-import org.apache.kafka.connect.source.SourceRecord;
import org.slf4j.Logger;
public final class TaskHelper {
@@ -98,37 +94,29 @@ public final class TaskHelper {
return false;
}
- public static <CFG extends AbstractConfig> void logRecordContent(Logger logger, ConnectRecord<?> record, CFG config) {
- if (logger != null && record != null && config != null) {
- // do not log record's content by default, as it may contain sensitive information
- LoggingLevel level = LoggingLevel.OFF;
- try {
- final String key = (record instanceof SourceRecord)
- ? CamelSourceConnectorConfig.CAMEL_SOURCE_CONTENT_LOG_LEVEL_CONF
- : CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF;
- level = LoggingLevel.valueOf(config.getString(key).toUpperCase());
- } catch (Exception e) {
- logger.warn("Invalid value for contentLogLevel property");
- }
- switch (level) {
- case TRACE:
- logger.trace(record.toString());
- break;
- case DEBUG:
- logger.debug(record.toString());
- break;
- case INFO:
- logger.info(record.toString());
- break;
- case WARN:
- logger.warn(record.toString());
- break;
- case ERROR:
- logger.error(record.toString());
- break;
- default:
- break;
- }
+ public static void logRecordContent(Logger logger, LoggingLevel level, ConnectRecord<?> record) {
+ if (level == LoggingLevel.OFF) {
+ return;
+ }
+
+ switch (level) {
+ case TRACE:
+ logger.trace(record.toString());
+ break;
+ case DEBUG:
+ logger.debug(record.toString());
+ break;
+ case INFO:
+ logger.info(record.toString());
+ break;
+ case WARN:
+ logger.warn(record.toString());
+ break;
+ case ERROR:
+ logger.error(record.toString());
+ break;
+ default:
+ break;
}
}
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index 5da421c..f8e4758 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -27,13 +27,13 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
import org.apache.kafka.connect.source.SourceRecord;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.ext.LoggerWrapper;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -144,58 +144,36 @@ public class TaskHelperTest {
assertEquals("cql:localhost:8080/test", result);
}
- private CamelSourceConnectorConfig getSourceConnectorConfig(String logLevel) {
- return new CamelSourceConnectorConfig(CamelSourceConnectorConfig.conf(),
- Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_CONTENT_LOG_LEVEL_CONF, logLevel));
- }
-
@Test
public void testlogRecordContent() {
- String partName = "abc123";
- Logger logger = new MyLogger(LoggerFactory.getLogger(TaskHelperTest.class), null);
- SourceRecord record = new SourceRecord(Collections.singletonMap("partition", partName),
+ final String partName = "abc123";
+ final MyLogger logger = new MyLogger(LoggerFactory.getLogger(TaskHelperTest.class), null);
+ final SourceRecord record = new SourceRecord(
+ Collections.singletonMap("partition", partName),
Collections.singletonMap("offset", "0"), null, null, null, null);
- Queue<String> logEvents = ((MyLogger)logger).getEvents();
-
- String offLevel = LoggingLevel.OFF.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(offLevel));
- assertNull(logEvents.poll());
-
- String traceLevel = LoggingLevel.TRACE.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(traceLevel));
- assertTrue(logEvents.peek().contains(traceLevel) && logEvents.poll().contains(partName));
-
- String debugLevel = LoggingLevel.DEBUG.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(debugLevel));
- assertTrue(logEvents.peek().contains(debugLevel) && logEvents.poll().contains(partName));
-
- String infoLevel = LoggingLevel.INFO.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(infoLevel));
- assertTrue(logEvents.peek().contains(infoLevel) && logEvents.poll().contains(partName));
-
- String warnLevel = LoggingLevel.WARN.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(warnLevel));
- assertTrue(logEvents.peek().contains(warnLevel) && logEvents.poll().contains(partName));
- String errorLevel = LoggingLevel.ERROR.toString();
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(errorLevel));
- assertTrue(logEvents.peek().contains(errorLevel) && logEvents.poll().contains(partName));
+ TaskHelper.logRecordContent(logger, LoggingLevel.OFF, record);
+ assertNull(logger.getEvents().poll());
- TaskHelper.logRecordContent(null, record, getSourceConnectorConfig(debugLevel));
- assertNull(logEvents.poll());
+ TaskHelper.logRecordContent(logger, LoggingLevel.TRACE, record);
+ assertThat(logger.getEvents().peek()).isNotNull().contains(LoggingLevel.TRACE.toString());
+ assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
- TaskHelper.logRecordContent(logger, null, getSourceConnectorConfig(debugLevel));
- assertNull(logEvents.poll());
+ TaskHelper.logRecordContent(logger, LoggingLevel.DEBUG, record);
+ assertThat(logger.getEvents().peek()).isNotNull().contains(LoggingLevel.DEBUG.toString());
+ assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
- TaskHelper.logRecordContent(logger, record, null);
- assertNull(logEvents.poll());
+ TaskHelper.logRecordContent(logger, LoggingLevel.INFO, record);
+ assertThat(logger.getEvents().peek()).isNotNull().contains(LoggingLevel.INFO.toString());
+ assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
- String invalidLevel = "NOLOG";
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(invalidLevel));
- assertTrue(logEvents.poll().contains(warnLevel));
+ TaskHelper.logRecordContent(logger, LoggingLevel.WARN, record);
+ assertThat(logger.getEvents().peek()).isNotNull().contains(LoggingLevel.WARN.toString());
+ assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
- TaskHelper.logRecordContent(logger, record, getSourceConnectorConfig(null));
- assertTrue(logEvents.poll().contains(warnLevel));
+ TaskHelper.logRecordContent(logger, LoggingLevel.ERROR, record);
+ assertThat(logger.getEvents().peek()).isNotNull().contains(LoggingLevel.ERROR.toString());
+ assertThat(logger.getEvents().poll()).isNotNull().contains(partName);
}
class MyLogger extends LoggerWrapper {
[camel-kafka-connector] 01/06: core: remove unused methods from
TaskHelper
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 22a5f56dea6c35fcb112a33c83044085885c06e9
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 11:56:48 2020 +0200
core: remove unused methods from TaskHelper
---
.../camel/kafkaconnector/utils/TaskHelper.java | 28 -------
.../camel/kafkaconnector/utils/TaskHelperTest.java | 98 ----------------------
2 files changed, 126 deletions(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
index 78e489d..ecdb5a3 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
@@ -69,30 +69,6 @@ public final class TaskHelper {
return rcc.asEndpointUri(componentSchema, filteredProps, false);
}
- public static String buildUrl(Map<String, String> props, String componentSchema, String endpointPropertiesPrefix, String pathPropertiesPrefix) {
- final String urlPath = createUrlPathFromProperties(props, pathPropertiesPrefix);
- final String endpointOptions = createEndpointOptionsFromProperties(props, endpointPropertiesPrefix);
-
- return componentSchema + ":" + urlPath + endpointOptions;
- }
-
- public static String createEndpointOptionsFromProperties(Map<String, String> props, String prefix) {
- return props.keySet().stream()
- .filter(k -> k.startsWith(prefix))
- .map(k -> k.replace(prefix, "") + "=" + props.get(k))
- .reduce((o1, o2) -> o1 + "&" + o2)
- .map(result -> result.isEmpty() ? "" : "?" + result)
- .orElse("");
- }
-
- public static String createUrlPathFromProperties(Map<String, String> props, String prefix) {
- return props.keySet().stream()
- .filter(k -> k.startsWith(prefix))
- .map(props::get)
- .reduce((p1, p2) -> p1 + ":" + p2)
- .orElse("");
- }
-
public static Map<String, String> mergeProperties(Map<String, String> defaultProps, Map<String, String> loadedProps) {
if (loadedProps == null && defaultProps == null) {
return Collections.emptyMap();
@@ -110,10 +86,6 @@ public final class TaskHelper {
}
}
- private static String getStringPrefix(String s) {
- return s.lastIndexOf(".") > 0 ? s.substring(0, s.lastIndexOf(".")) : "";
- }
-
private static Boolean stringStartWithOneOfPrefixes(String s, Set<String> prefixes) {
if (s == null || prefixes == null) {
return false;
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index bc0f537..5da421c 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -117,104 +117,6 @@ public class TaskHelperTest {
}
@Test
- public void testCreateEndpointOptionsFromProperties() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("notprefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createEndpointOptionsFromProperties(props, "prefix.");
-
- assertEquals("?key1=value1", result);
- }
-
- @Test
- public void testCreateEndpointOptionsFromPropertiesConcatenation() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("prefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createEndpointOptionsFromProperties(props, "prefix.");
-
- assertEquals("?key1=value1&key2=value2", result);
- }
-
- @Test
- public void testCreateEndpointOptionsFromPropertiesEmpty() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("notprefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createEndpointOptionsFromProperties(props, "anotherprefix");
-
- assertEquals("", result);
- }
-
- @Test
- public void testCreateUrlPathFromProperties() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("notprefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createUrlPathFromProperties(props, "prefix.");
-
- assertEquals("value1", result);
- }
-
- @Test
- public void testCreateUrlPathFromPropertiesConcatenation() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("prefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createUrlPathFromProperties(props, "prefix.");
-
- assertEquals("value1:value2", result);
- }
-
- @Test
- public void testCreateUrlPathFromPropertiesEmpty() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("notprefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.createUrlPathFromProperties(props, "anotherprefix");
-
- assertEquals("", result);
- }
-
- @Test
- public void testBuildUrl() {
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("prefix.key1", "value1");
- put("anotherPrefix.key2", "value2");
- }
- };
-
- String result = TaskHelper.buildUrl(props, "test", "prefix.", "anotherPrefix.");
-
- assertEquals("test:value2?key1=value1", result);
- }
-
- @Test
public void testBuildUrlWithRuntimeCatalog() throws URISyntaxException {
DefaultCamelContext dcc = new DefaultCamelContext();
RuntimeCamelCatalog rcc = dcc.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog();
[camel-kafka-connector] 05/06: TaskHelperTest: replace double brace
initialization with Camel's helpers
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 176244bff17db1f5d7734c83e1505d7d6c966755
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 12:27:27 2020 +0200
TaskHelperTest: replace double brace initialization with Camel's helpers
---
.../camel/kafkaconnector/utils/TaskHelperTest.java | 78 +++++++---------------
1 file changed, 25 insertions(+), 53 deletions(-)
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index 14d162a..91087dc 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.kafkaconnector.utils;
import java.net.URISyntaxException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -33,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.ext.LoggerWrapper;
+import static org.apache.camel.util.CollectionHelper.mapOf;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -49,18 +49,8 @@ public class TaskHelperTest {
@Test
public void testMergePropertiesDefaultAreAdded() {
- Map<String, String> defaults = new HashMap<String, String>() {
- {
- put("property", "defaultValue");
- }
- };
-
- Map<String, String> loaded = new HashMap<String, String>() {
- {
- put("anotherProperty", "loadedValue");
- }
- };
-
+ Map<String, String> defaults = mapOf("property", "defaultValue");
+ Map<String, String> loaded = mapOf("anotherProperty", "loadedValue");
Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
assertTrue(result.containsKey("property"));
@@ -71,18 +61,8 @@ public class TaskHelperTest {
@Test
public void testMergePropertiesLoadedHavePrecedence() {
- Map<String, String> defaults = new HashMap<String, String>() {
- {
- put("property", "defaultValue");
- }
- };
-
- Map<String, String> loaded = new HashMap<String, String>() {
- {
- put("property", "loadedValue");
- }
- };
-
+ Map<String, String> defaults = mapOf("property", "defaultValue");
+ Map<String, String> loaded = mapOf("property", "loadedValue");
Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
assertTrue(result.containsKey("property"));
@@ -91,21 +71,17 @@ public class TaskHelperTest {
@Test
public void testMergePropertiesLoadedHavePrecedenceWithPrefixFiltering() {
- Map<String, String> defaults = new HashMap<String, String>() {
- {
- put("property", "defaultValue");
- put("camel.component.x.objectProperty", "#class:my.package.MyClass");
- put("camel.component.x.objectProperty.field", "defaultValue");
- }
- };
-
- Map<String, String> loaded = new HashMap<String, String>() {
- {
- put("camel.component.x.objectProperty", "#class:my.package.MyOtherClass");
- put("camel.component.x.objectProperty.anotherField", "loadedValue");
- put("camel.component.x.normalProperty", "loadedValue");
- }
- };
+ Map<String, String> defaults = mapOf(
+ "property", "defaultValue",
+ "camel.component.x.objectProperty", "#class:my.package.MyClass",
+ "camel.component.x.objectProperty.field", "defaultValue"
+ );
+
+ Map<String, String> loaded = mapOf(
+ "camel.component.x.objectProperty", "#class:my.package.MyOtherClass",
+ "camel.component.x.objectProperty.anotherField", "loadedValue",
+ "camel.component.x.normalProperty", "loadedValue"
+ );
Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
@@ -120,24 +96,20 @@ public class TaskHelperTest {
public void testBuildUrlWithRuntimeCatalog() throws URISyntaxException {
DefaultCamelContext dcc = new DefaultCamelContext();
RuntimeCamelCatalog rcc = dcc.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog();
- Map<String, String> props = new HashMap<String, String>() {
- {
- put("camel.source.path.name", "test");
- put("camel.source.endpoint.synchronous", "true");
- }
- };
+ Map<String, String> props = mapOf(
+ "camel.source.path.name", "test",
+ "camel.source.endpoint.synchronous", "true"
+ );
String result = TaskHelper.buildUrl(rcc, props, "direct", "camel.source.endpoint.", "camel.source.path.");
assertEquals("direct:test?synchronous=true", result);
- props = new HashMap<String, String>() {
- {
- put("camel.source.path.port", "8080");
- put("camel.source.path.keyspace", "test");
- put("camel.source.path.hosts", "localhost");
- }
- };
+ props = mapOf(
+ "camel.source.path.port", "8080",
+ "camel.source.path.keyspace", "test",
+ "camel.source.path.hosts", "localhost"
+ );
result = TaskHelper.buildUrl(rcc, props, "cql", "camel.source.endpoint.", "camel.source.path.");
[camel-kafka-connector] 06/06: TaskHelperTest: iuse assertFalse
instead of negated assertTrue
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 9d6db1472264e43a00c00f5ae1962507187d8c85
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 12:28:58 2020 +0200
TaskHelperTest: iuse assertFalse instead of negated assertTrue
---
.../java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index 91087dc..26ca86e 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -35,6 +35,7 @@ import org.slf4j.ext.LoggerWrapper;
import static org.apache.camel.util.CollectionHelper.mapOf;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -89,7 +90,7 @@ public class TaskHelperTest {
assertEquals("#class:my.package.MyOtherClass", result.get("camel.component.x.objectProperty"));
assertEquals("loadedValue", result.get("camel.component.x.objectProperty.anotherField"));
assertEquals("loadedValue", result.get("camel.component.x.normalProperty"));
- assertTrue(!result.containsKey("camel.component.x.objectProperty.field"));
+ assertFalse(result.containsKey("camel.component.x.objectProperty.field"));
}
@Test
[camel-kafka-connector] 04/06: TaskHelperTest: replace raw Map with
generic version
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 1ccc60ac26b67244bb86e95bae9628b2e608c766
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Oct 15 12:22:40 2020 +0200
TaskHelperTest: replace raw Map with generic version
---
.../org/apache/camel/kafkaconnector/utils/TaskHelperTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index 8cb949f..14d162a 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -42,7 +42,7 @@ public class TaskHelperTest {
@Test
public void testMergePropertiesNull() {
- Map result = TaskHelper.mergeProperties(null, null);
+ Map<String, String> result = TaskHelper.mergeProperties(null, null);
assertEquals(Collections.EMPTY_MAP, result);
}
@@ -61,7 +61,7 @@ public class TaskHelperTest {
}
};
- Map result = TaskHelper.mergeProperties(defaults, loaded);
+ Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
assertTrue(result.containsKey("property"));
assertTrue(result.containsKey("anotherProperty"));
@@ -83,7 +83,7 @@ public class TaskHelperTest {
}
};
- Map result = TaskHelper.mergeProperties(defaults, loaded);
+ Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
assertTrue(result.containsKey("property"));
assertEquals("loadedValue", result.get("property"));
@@ -107,7 +107,7 @@ public class TaskHelperTest {
}
};
- Map result = TaskHelper.mergeProperties(defaults, loaded);
+ Map<String, String> result = TaskHelper.mergeProperties(defaults, loaded);
assertEquals("defaultValue", result.get("property"));
assertEquals("#class:my.package.MyOtherClass", result.get("camel.component.x.objectProperty"));