Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove 'java' part from package name #1103

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-connectors/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

allprojects {

group = "io.lenses.java.streamreactor"
group = "io.lenses.streamreactor"
version = "1.0-SNAPSHOT"

apply plugin: 'java'
Expand Down Expand Up @@ -114,7 +114,7 @@ allprojects {
dependencies {
// // UNCOMMENT BELOW IF NEED CLEAN JAR
// exclude(dependency {
// it.moduleGroup != 'io.lenses.java.streamreactor'
// it.moduleGroup != 'io.lenses.streamreactor'
// })
// exclude(dependency('org.apache.logging.log4j:log4j-core:2.11.1'))
// exclude(dependency("org.apache.avro:.*"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.config;
package io.lenses.streamreactor.connect.azure.eventhubs.config;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.AzureEventHubsSourceConnector;
import io.lenses.streamreactor.connect.azure.eventhubs.source.AzureEventHubsSourceConnector;

/**
* Class represents Config Constants for AzureEventHubsSourceConnector Config Definition.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.config;
package io.lenses.streamreactor.connect.azure.eventhubs.config;

import io.lenses.java.streamreactor.common.config.base.BaseConfig;
import io.lenses.java.streamreactor.common.config.base.intf.ConnectorPrefixed;
import io.lenses.streamreactor.common.config.base.BaseConfig;
import io.lenses.streamreactor.common.config.base.intf.ConnectorPrefixed;
import java.util.List;
import java.util.Map;
import java.util.function.UnaryOperator;
Expand Down Expand Up @@ -88,7 +88,7 @@ public static String getPrefixedKafkaConsumerConfigKey(String kafkaConsumerConfi

@Override
public String connectorPrefix() {
return AzureEventHubsConfigConstants.CONNECTOR_PREFIX;
return connectorPrefix;
}

private static ConfigDef getKafkaConsumerConfigToExpose() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.config;
package io.lenses.streamreactor.connect.azure.eventhubs.config;

import java.util.Arrays;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.mapping;
package io.lenses.streamreactor.connect.azure.eventhubs.mapping;

import java.util.Map;
import org.apache.kafka.clients.consumer.ConsumerRecord;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static io.lenses.java.streamreactor.common.util.AsciiArtPrinter.printAsciiHeader;
import static io.lenses.streamreactor.common.util.AsciiArtPrinter.printAsciiHeader;

import io.lenses.java.streamreactor.common.util.JarManifest;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.java.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.streamreactor.common.util.JarManifest;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.kcql.Kcql;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -59,6 +59,7 @@ public ExactlyOnceSupport exactlyOnceSupport(Map<String, String> connectorConfig

@Override
public void stop() {
// connector-specific implementation not needed
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static java.util.Optional.ofNullable;

import io.lenses.java.streamreactor.common.util.JarManifest;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.java.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.streamreactor.common.util.JarManifest;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.kcql.Kcql;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import java.time.Duration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig.getPrefixedKafkaConsumerConfigKey;

import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import io.lenses.java.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import io.lenses.streamreactor.connect.azure.eventhubs.util.KcqlConfigPort;
import io.lenses.kcql.Kcql;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -54,7 +52,7 @@ public KafkaByteBlockingQueuedProducer createProducer(

consumerProperties.put(ConsumerConfig.CLIENT_ID_CONFIG, clientId);
consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, azureEventHubsSourceConfig.getString(
getPrefixedKafkaConsumerConfigKey(ConsumerConfig.GROUP_ID_CONFIG)));
AzureEventHubsSourceConfig.getPrefixedKafkaConsumerConfigKey(ConsumerConfig.GROUP_ID_CONFIG)));
consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
keyValueTypes.getKeyType().getDeserializerClass());
consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static io.lenses.java.streamreactor.connect.azure.eventhubs.mapping.SourceRecordMapper.mapSourceRecordIncludingHeaders;
import static io.lenses.streamreactor.connect.azure.eventhubs.mapping.SourceRecordMapper.mapSourceRecordIncludingHeaders;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import io.lenses.java.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import io.lenses.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import java.util.concurrent.BlockingQueue;
import org.apache.kafka.clients.consumer.ConsumerRecords;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.util;
package io.lenses.streamreactor.connect.azure.eventhubs.util;

import io.lenses.kcql.Kcql;

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
io.lenses.java.streamreactor.connect.azure.eventhubs.source.AzureEventHubsSourceConnector
io.lenses.streamreactor.connect.azure.eventhubs.source.AzureEventHubsSourceConnector
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.config;
package io.lenses.streamreactor.connect.azure.eventhubs.config;

import static org.apache.kafka.connect.data.Schema.OPTIONAL_BYTES_SCHEMA;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.mapping;
package io.lenses.streamreactor.connect.azure.eventhubs.mapping;

import static java.util.Collections.singletonList;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -8,8 +8,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import java.util.Iterator;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.header.Header;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
Expand All @@ -7,8 +7,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import java.util.Collections;
import java.util.Optional;
import org.apache.kafka.clients.consumer.Consumer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertIterableEquals;
Expand All @@ -13,9 +13,9 @@

import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import io.lenses.java.streamreactor.common.util.JarManifest;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.common.util.JarManifest;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig.getPrefixedKafkaConsumerConfigKey;
import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -12,8 +11,8 @@

import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsSourceConfig;
import io.lenses.streamreactor.connect.azure.eventhubs.config.AzureEventHubsConfigConstants;
import java.util.concurrent.ArrayBlockingQueue;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.common.config.ConfigException;
Expand Down Expand Up @@ -86,7 +85,7 @@ void whenConstructorInvokedWithParameters_ThenMockKafkaConsumerShouldBeCreatedAn

//then
verify(azureConfigMock).getString(AzureEventHubsConfigConstants.CONNECTOR_NAME);
verify(azureConfigMock).getString(getPrefixedKafkaConsumerConfigKey(GROUP_ID_CONFIG));
verify(azureConfigMock).getString(AzureEventHubsSourceConfig.getPrefixedKafkaConsumerConfigKey(GROUP_ID_CONFIG));
assertNotNull(consumer);
assertEquals(1, logWatcher.list.size());
assertTrue(logWatcher.list.get(0).getFormattedMessage().startsWith("Attempting to create Client with Id"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -7,8 +7,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.lenses.java.streamreactor.connect.azure.eventhubs.config.SourceDataType;
import io.lenses.java.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import io.lenses.streamreactor.connect.azure.eventhubs.config.SourceDataType;
import io.lenses.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import io.lenses.java.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import io.lenses.streamreactor.connect.azure.eventhubs.config.SourceDataType.KeyValueTypes;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.concurrent.BlockingQueue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.source;
package io.lenses.streamreactor.connect.azure.eventhubs.source;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand All @@ -7,8 +7,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.java.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureOffsetMarker;
import io.lenses.streamreactor.connect.azure.eventhubs.source.TopicPartitionOffsetProvider.AzureTopicPartitionKey;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.lenses.java.streamreactor.connect.azure.eventhubs.util;
package io.lenses.streamreactor.connect.azure.eventhubs.util;

import static org.junit.jupiter.api.Assertions.*;

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading