Skip to content

Commit

Permalink
馃И #44 Misc. clean-up after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunnarmorling
gunnarmorling committed Jan 22, 2022
1 parent f4a2c73 commit 1f8945c
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 30 deletions.
20 changes: 12 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-core</artifactId>
<version>1.8.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-api</artifactId>
<version>1.8.0.Final</version>
</dependency>
<dependency>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>${quarkus.platform.artifact-id}</artifactId>
Expand Down Expand Up @@ -107,13 +118,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-core</artifactId>
<version>1.8.0.Final</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-testing-testcontainers</artifactId>
Expand Down Expand Up @@ -178,7 +182,7 @@
<groups>java.,javax.,org.,com.</groups>
<removeUnused>true</removeUnused>
<staticAfter>true</staticAfter>
<compliance>17</compliance>
<compliance>${java.version}</compliance>
<!-- <staticGroups>java.,javax.,org.w3c.,org.xml.,junit.</staticGroups> -->
</configuration>
</plugin>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/kcctl/command/ApplyCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
*/
package org.kcctl.command;

import static org.kcctl.util.Colors.ANSI_RESET;
import static org.kcctl.util.Colors.ANSI_WHITE_BOLD;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -41,6 +38,9 @@
import picocli.CommandLine.Option;
import picocli.CommandLine.Spec;

import static org.kcctl.util.Colors.ANSI_RESET;
import static org.kcctl.util.Colors.ANSI_WHITE_BOLD;

@Command(name = "apply", description = "Applies the given file or the stdin content for registering or updating a connector")
public class ApplyCommand implements Callable<Integer> {

Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/kcctl/command/DescribeConnectorCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.kcctl.util.Tuple;
import org.kcctl.util.Version;

import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters;
Expand All @@ -49,6 +50,9 @@
@Command(name = "connector", description = "Displays information about a given connector")
public class DescribeConnectorCommand implements Callable<Integer> {

@CommandLine.Spec
CommandLine.Model.CommandSpec spec;

@Inject
ConfigurationContext context;

Expand Down Expand Up @@ -149,10 +153,9 @@ public Integer call() {
throw e;
}

System.out.println("Connector " + name + " not found. The following connector(s) are available:");
spec.commandLine().getOut().println("Connector " + name + " not found. The following connector(s) are available:");

GetConnectorsCommand getConnectors = new GetConnectorsCommand();
getConnectors.context = context;
GetConnectorsCommand getConnectors = new GetConnectorsCommand(context);
getConnectors.run();

return 1;
Expand Down
10 changes: 6 additions & 4 deletions src/test/java/org/kcctl/IntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.nio.file.Files;
import java.util.stream.Stream;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtensionConfigurationException;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.platform.commons.util.ReflectionUtils;
import org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode;
import org.kcctl.support.InjectCommandContext;
Expand All @@ -48,7 +50,7 @@ public abstract class IntegrationTest {
protected static final KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"))
.withNetwork(network);

protected static DebeziumContainer kafkaConnect = new DebeziumContainer(DockerImageName.parse("debezium/connect:1.7.1.Final"))
protected static DebeziumContainer kafkaConnect = new DebeziumContainer(DockerImageName.parse("debezium/connect:1.8.0.Final"))
.withNetwork(network)
.withKafka(kafka)
.dependsOn(kafka);
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/kcctl/command/GetPluginsCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ public void should_print_info() {
.map(String::trim)
.containsExactly(
"TYPE CLASS VERSION",
"source io.debezium.connector.db2.Db2Connector 1.7.1.Final",
"source io.debezium.connector.mongodb.MongoDbConnector 1.7.1.Final",
"source io.debezium.connector.mysql.MySqlConnector 1.7.1.Final",
"source io.debezium.connector.oracle.OracleConnector 1.7.1.Final",
"source io.debezium.connector.postgresql.PostgresConnector 1.7.1.Final",
"source io.debezium.connector.sqlserver.SqlServerConnector 1.7.1.Final",
"source io.debezium.connector.vitess.VitessConnector 1.7.1.Final",
"source org.apache.kafka.connect.file.FileStreamSourceConnector 2.8.1",
"source io.debezium.connector.db2.Db2Connector 1.8.0.Final",
"source io.debezium.connector.mongodb.MongoDbConnector 1.8.0.Final",
"source io.debezium.connector.mysql.MySqlConnector 1.8.0.Final",
"source io.debezium.connector.oracle.OracleConnector 1.8.0.Final",
"source io.debezium.connector.postgresql.PostgresConnector 1.8.0.Final",
"source io.debezium.connector.sqlserver.SqlServerConnector 1.8.0.Final",
"source io.debezium.connector.vitess.VitessConnector 1.8.0.Final",
"source org.apache.kafka.connect.file.FileStreamSourceConnector 3.0.0",
"source org.apache.kafka.connect.mirror.MirrorCheckpointConnector 1",
"source org.apache.kafka.connect.mirror.MirrorHeartbeatConnector 1",
"source org.apache.kafka.connect.mirror.MirrorSourceConnector 1",
"sink org.apache.kafka.connect.file.FileStreamSinkConnector 2.8.1");
"sink org.apache.kafka.connect.file.FileStreamSinkConnector 3.0.0");
}
}
7 changes: 4 additions & 3 deletions src/test/java/org/kcctl/command/InfoCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
import org.junit.jupiter.api.Test;
import org.kcctl.IntegrationTest;
import org.kcctl.support.*;
import org.kcctl.support.InjectCommandContext;
import org.kcctl.support.KcctlCommandContext;

import io.quarkus.test.junit.QuarkusTest;
import picocli.CommandLine;
Expand All @@ -41,7 +42,7 @@ public void should_print_info() {
.map(String::trim)
.contains(
"URL: " + kafkaConnect.getTarget(),
"Version: 2.8.1",
"Commit: 839b886f9b732b15");
"Version: 3.0.0",
"Commit: 8cb0a5e9d3441962");
}
}

0 comments on commit 1f8945c

Please sign in to comment.