Merge pull request #428 from nosan/5.0

5.0.0-SNAPSHOT

README.md

@@ -56,7 +56,7 @@ Also see [CONTRIBUTING.md](CONTRIBUTING.md) if you wish to submit pull requests.
 
 ## Build
 
-`Embedded Cassandra` can be easily built with the [maven wrapper](https://github.com/takari/maven-wrapper). You also need `JDK 1.8`.
+`Embedded Cassandra` can be easily built with the [maven wrapper](https://github.com/takari/maven-wrapper). You also need `JDK 11`.
 
 ## License
 

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.nosan</groupId>
     <artifactId>embedded-cassandra</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <description>Embedded Cassandra</description>
@@ -41,7 +41,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexus.url>https://oss.sonatype.org</nexus.url>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <junit5.version>5.11.0</junit5.version>
         <checkstyle.version>9.3</checkstyle.version>
         <cassandra-java-driver-core.version>4.17.0</cassandra-java-driver-core.version>
@@ -131,9 +131,8 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <optional>true</optional>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -239,7 +238,6 @@
                             <configLocation>src/checkstyle/checkstyle.xml</configLocation>
                             <suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
                             <headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>
-                            <encoding>UTF-8</encoding>
                             <consoleOutput>true</consoleOutput>
                             <failsOnError>true</failsOnError>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>

src/docs/asciidoc/configuration.adoc

@@ -14,9 +14,7 @@ This section covers how to configure Embedded Cassandra.
 include::{sources}/CassandraExamples.java[tag=version]
 ----
 
-NOTE: Defaults to *4.1.3*.
-
-CAUTION: Since *4.0-beta4*, Windows scripts were removed. https://issues.apache.org/jira/browse/CASSANDRA-16171[CASSANDRA-16171]
+NOTE: Defaults to *5.0.0*.
 
 == Config Properties
 
@@ -30,7 +28,6 @@ For example `cassandra.yaml`:
 ...
 storage_port: 7199
 native_transport_port: 9042
-rpc_port: 9160
 client_encryption_options:
    enabled: false
    ...
@@ -51,7 +48,6 @@ The output `cassandra.yaml`:
 ...
 storage_port: 7000
 native_transport_port: 9000
-rpc_port: 9160
 client_encryption_options:
   enabled: true
   ...
@@ -219,4 +215,5 @@ Configure a logger, that consumes Cassandra `STDOUT` and `STDERR` outputs.
 include::{sources}/CassandraExamples.java[tag=logger]
 ----
 
-NOTE: Defaults to `Logger.get(Cassandra.class)`.
+NOTE: Defaults to `LoggerFactory.getLogger(Cassandra.class)`.
+

src/docs/asciidoc/faq.adoc

@@ -6,26 +6,11 @@
 
 == What are OSs supported by Embedded Cassandra?
 
-Embedded Cassandra is tested under the `ubuntu-latest`, `macos-latest` and `windows-latest` platforms.
+Embedded Cassandra is tested under the `ubuntu-latest` and `macos-latest` platforms.
 
 == What are versions supported by Embedded Cassandra?
 
-Embedded Cassandra project is tested for `2.X.X` - `4.X.X` Cassandra versions.
-
-|===
-|OS |Version Range
-
-|Windows
-|2.X.X - 4.0-beta3
-
-|OSX
-|2.X.X - 4.X.X
-
-|Linux
-|2.X.X - 4.X.X
-|===
-
-CAUTION: Since *4.0-beta4*, Windows scripts were removed https://issues.apache.org/jira/browse/CASSANDRA-16171[CASSANDRA-16171]
+Embedded Cassandra project is tested for `>= 4.x.x` Cassandra versions.
 
 == What are compile dependencies used by Embedded Cassandra?
 
@@ -44,6 +29,11 @@ Embedded Cassandra has only two compile dependencies:
         <artifactId>snakeyaml</artifactId>
         <version>{snakeyaml-version}</version>
     </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>{logback-classic-version}</version>
+    </dependency>
 </dependecies>
 ----
 
@@ -58,4 +48,4 @@ https://downloads.apache.org/cassandra/. For older versions, https://archive.apa
 
 == Where are the files downloaded?
 
-By default, files are downloaded into *~/.embedded-cassandra/cassandra* directory
+By default, files are downloaded into *~/.embedded-cassandra/* directory

src/docs/asciidoc/getting-started.adoc

@@ -35,7 +35,7 @@ Embedded Cassandra repository can be found {github-code}[here]
 === Build Source
 
 Embedded Cassandra can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper].
-You also need `JDK 1.8`.
+You also need `JDK 11`.
 
 [source,bash]
 ----

src/main/java/com/github/nosan/embedded/cassandra/AbstractCassandraDatabase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 
 abstract class AbstractCassandraDatabase implements CassandraDatabase {
 
@@ -45,7 +44,7 @@ abstract class AbstractCassandraDatabase implements CassandraDatabase {
 
 	private final Set<String> jvmOptions;
 
-	private volatile Process process;
+	private volatile ProcessWrapper process;
 
 	AbstractCassandraDatabase(String name, Version version, Path configurationFile, Path workingDirectory,
 			Map<String, String> environmentVariables, Map<String, Object> configProperties,
@@ -67,7 +66,7 @@ public final synchronized void start() throws IOException {
 
 	@Override
 	public final synchronized void stop() throws IOException {
-		Process process = this.process;
+		ProcessWrapper process = this.process;
 		if (process != null && process.isAlive()) {
 			doStop(process);
 			if (!process.destroy().waitFor(5, TimeUnit.SECONDS)) {
@@ -105,13 +104,12 @@ public final Set<String> getJvmOptions() {
 
 	@Override
 	public final synchronized CompletableFuture<? extends CassandraDatabase> onExit() {
-		return this.process.onExit()
-				.thenApply((Function<Process, CassandraDatabase>) processHandler -> this);
+		return this.process.onExit().thenApply(p -> this);
 	}
 
 	@Override
 	public final synchronized boolean isAlive() {
-		Process process = this.process;
+		ProcessWrapper process = this.process;
 		return (process != null) && process.isAlive();
 	}
 
@@ -131,12 +129,12 @@ public final Path getConfigurationFile() {
 	}
 
 	@Override
-	public final synchronized Process.Output getStdOut() {
+	public final synchronized ProcessWrapper.Output getStdOut() {
 		return this.process.getStdOut();
 	}
 
 	@Override
-	public final synchronized Process.Output getStdErr() {
+	public final synchronized ProcessWrapper.Output getStdErr() {
 		return this.process.getStdErr();
 	}
 
@@ -145,8 +143,8 @@ public final String toString() {
 		return getClass().getSimpleName() + "{" + "process=" + this.process + '}';
 	}
 
-	protected abstract Process doStart() throws IOException;
+	protected abstract ProcessWrapper doStart() throws IOException;
 
-	protected abstract void doStop(Process process) throws IOException;
+	protected abstract void doStop(ProcessWrapper process) throws IOException;
 
 }

src/main/java/com/github/nosan/embedded/cassandra/Cassandra.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/github/nosan/embedded/cassandra/CassandraBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,10 +34,12 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.nosan.embedded.cassandra.commons.Resource;
 import com.github.nosan.embedded.cassandra.commons.StringUtils;
 import com.github.nosan.embedded.cassandra.commons.function.IOSupplier;
-import com.github.nosan.embedded.cassandra.commons.logging.Logger;
 import com.github.nosan.embedded.cassandra.commons.web.JdkHttpClient;
 
 /**
@@ -56,7 +58,7 @@ public class CassandraBuilder {
 	/**
 	 * Default Cassandra version.
 	 */
-	public static final Version DEFAULT_VERSION = Version.parse("4.1.3");
+	public static final Version DEFAULT_VERSION = Version.parse("5.0.0");
 
 	private static final AtomicInteger CASSANDRA_ID = new AtomicInteger();
 
@@ -110,8 +112,8 @@ public Cassandra build() {
 		}
 		WorkingDirectoryInitializer workingDirectoryInitializer = this.workingDirectoryInitializer;
 		if (workingDirectoryInitializer == null) {
-			workingDirectoryInitializer = new DefaultWorkingDirectoryInitializer(new WebCassandraDirectoryProvider(
-					new JdkHttpClient(Duration.ofMinutes(1), Duration.ofMinutes(1))));
+			workingDirectoryInitializer = new DefaultWorkingDirectoryInitializer(
+					new WebCassandraDirectoryProvider(new JdkHttpClient(Duration.ofMinutes(1), Duration.ofMinutes(1))));
 		}
 		WorkingDirectoryDestroyer workingDirectoryDestroyer = this.workingDirectoryDestroyer;
 		if (workingDirectoryDestroyer == null) {
@@ -123,7 +125,7 @@ public Cassandra build() {
 		}
 		Logger logger = this.logger;
 		if (logger == null) {
-			logger = Logger.get(Cassandra.class);
+			logger = LoggerFactory.getLogger(Cassandra.class);
 		}
 		Map<String, Object> environmentVariables = new LinkedHashMap<>(this.environmentVariables);
 		environmentVariables.values().removeIf(Objects::isNull);
@@ -204,7 +206,7 @@ public Version getVersion() {
 
 	/**
 	 * Sets the Cassandra logger. This logger will consume Cassandra stdout and stderr outputs.
-	 * <p>Defaults to {@code Logger.get(Cassandra.class)}
+	 * <p>Defaults to {@code LoggerFactory.getLogger(Cassandra.class)}
 	 *
 	 * @param logger the Cassandra logger
 	 * @return this builder
@@ -659,7 +661,7 @@ public CassandraBuilder addConfigProperties(Map<String, ?> configProperties) {
 	 *     }
 	 * </pre>
 	 *
-	 * @param path path (file only) within the working directory (e.g conf/cassandra.yaml)
+	 * @param path path (file only) within the working directory (e.g. conf/cassandra.yaml)
 	 * @param resource the resource
 	 * @return this builder
 	 * @see WorkingDirectoryCustomizer#addResource(Resource, String)

src/main/java/com/github/nosan/embedded/cassandra/CassandraBuilderConfigurator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/github/nosan/embedded/cassandra/CassandraDatabase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@ interface CassandraDatabase {
 
 	Path getConfigurationFile();
 
-	Process.Output getStdOut();
+	ProcessWrapper.Output getStdOut();
 
-	Process.Output getStdErr();
+	ProcessWrapper.Output getStdErr();
 
 }

src/main/java/com/github/nosan/embedded/cassandra/CassandraDatabaseFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/github/nosan/embedded/cassandra/CassandraDirectoryProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/github/nosan/embedded/cassandra/CassandraException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.