use builder pattern for all commands

flapdoodle-oss · Jan 15, 2023 · 78a9c7c · 78a9c7c
1 parent 4b10a95
commit 78a9c7c
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 18 deletions.
diff --git a/Howto.md b/Howto.md
@@ -82,7 +82,8 @@ Mongod mongod = new Mongod() {
   @Override
   public Transition<PersistentDir> persistentBaseDir() {
     return Start.to(PersistentDir.class)
-      .providedBy(PersistentDir.userHome(".embeddedMongodbCustomPath"));
+      .providedBy(PersistentDir.inUserHome(".embeddedMongodbCustomPath")
+        .mapToUncheckedException(RuntimeException::new));
   }
 };
 ```

diff --git a/pom.xml b/pom.xml
@@ -409,7 +409,7 @@
             org.apache.commons.io,
             org.slf4j
         </osgi.import>
-        <junit.version>5.9.1</junit.version>
+        <junit.version>5.9.2</junit.version>
         <!-- eclipse apt switch -->
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
     </properties>
@@ -443,13 +443,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.24.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>de.flapdoodle.testdoc</groupId>
             <artifactId>de.flapdoodle.testdoc</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -489,12 +489,12 @@
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.process</artifactId>
-            <version>4.3.4</version>
+            <version>4.3.5</version>
         </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo.packageresolver</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/de/flapdoodle/embed/mongo/config/Net.java b/src/main/java/de/flapdoodle/embed/mongo/config/Net.java
@@ -37,6 +37,11 @@ public abstract class Net {
 
 	public abstract boolean isIpv6();
 
+	@Value.Auxiliary
+	public Net withPort(int port) {
+		return ImmutableNet.copyOf(this).withPort(port);
+	}
+
 	@Value.Auxiliary
 	public InetAddress getServerAddress() throws UnknownHostException {
 		if (getBindIp().isPresent()) {

diff --git a/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoDump.java b/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoDump.java
@@ -27,7 +27,9 @@
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.Transitions;
 import de.flapdoodle.reverse.transitions.Start;
+import org.immutables.value.Value;
 
+@Value.Immutable
 public class MongoDump implements WorkspaceDefaults, VersionAndPlatform, ProcessDefaults, CommandName, ExtractFileSet {
 	public Transitions transitions(de.flapdoodle.embed.process.distribution.Version version) {
 		return workspaceDefaults()
@@ -50,8 +52,12 @@ public TransitionWalker.ReachedState<ExecutedMongoDumpProcess> start(Version ver
 			.initState(StateID.of(ExecutedMongoDumpProcess.class));
 	}
 
-	public static MongoDump instance() {
-		return new MongoDump();
+	public static ImmutableMongoDump instance() {
+		return builder().build();
+	}
+
+	public static ImmutableMongoDump.Builder builder() {
+		return ImmutableMongoDump.builder();
 	}
 
 }
diff --git a/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoImport.java b/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoImport.java
@@ -27,7 +27,9 @@
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.Transitions;
 import de.flapdoodle.reverse.transitions.Start;
+import org.immutables.value.Value;
 
+@Value.Immutable
 public class MongoImport implements WorkspaceDefaults, VersionAndPlatform, ProcessDefaults, CommandName, ExtractFileSet {
 	public Transitions transitions(de.flapdoodle.embed.process.distribution.Version version) {
 		return workspaceDefaults()
@@ -49,7 +51,11 @@ public TransitionWalker.ReachedState<ExecutedMongoImportProcess> start(Version v
 			.initState(StateID.of(ExecutedMongoImportProcess.class));
 	}
 
-	public static MongoImport instance() {
-		return new MongoImport();
+	public static ImmutableMongoImport instance() {
+		return builder().build();
+	}
+
+	public static ImmutableMongoImport.Builder builder() {
+		return ImmutableMongoImport.builder();
 	}
 }
diff --git a/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoRestore.java b/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoRestore.java
@@ -27,7 +27,9 @@
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.Transitions;
 import de.flapdoodle.reverse.transitions.Start;
+import org.immutables.value.Value;
 
+@Value.Immutable
 public class MongoRestore implements WorkspaceDefaults, VersionAndPlatform, ProcessDefaults, CommandName, ExtractFileSet {
 
 	public Transitions transitions(de.flapdoodle.embed.process.distribution.Version version) {
@@ -51,7 +53,11 @@ public TransitionWalker.ReachedState<ExecutedMongoRestoreProcess> start(Version
 			.initState(StateID.of(ExecutedMongoRestoreProcess.class));
 	}
 
-	public static MongoRestore instance() {
-		return new MongoRestore();
+	public static ImmutableMongoRestore instance() {
+		return builder().build();
+	}
+
+	public static ImmutableMongoRestore.Builder builder() {
+		return ImmutableMongoRestore.builder();
 	}
 }
diff --git a/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoShell.java b/src/main/java/de/flapdoodle/embed/mongo/transitions/MongoShell.java
@@ -27,7 +27,9 @@
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.Transitions;
 import de.flapdoodle.reverse.transitions.Start;
+import org.immutables.value.Value;
 
+@Value.Immutable
 public class MongoShell implements WorkspaceDefaults, VersionAndPlatform, ProcessDefaults, CommandName, ExtractFileSet {
 
 	public Transitions transitions(de.flapdoodle.embed.process.distribution.Version version) {
@@ -51,8 +53,11 @@ public TransitionWalker.ReachedState<ExecutedMongoShellProcess> start(Version ve
 			.initState(StateID.of(ExecutedMongoShellProcess.class));
 	}
 
-	public static MongoShell instance() {
-		return new MongoShell();
+	public static ImmutableMongoShell instance() {
+		return builder().build();
 	}
 
+	public static ImmutableMongoShell.Builder builder() {
+		return ImmutableMongoShell.builder();
+	}
 }
diff --git a/src/main/java/de/flapdoodle/embed/mongo/transitions/Mongos.java b/src/main/java/de/flapdoodle/embed/mongo/transitions/Mongos.java
@@ -28,7 +28,9 @@
 import de.flapdoodle.reverse.TransitionWalker;
 import de.flapdoodle.reverse.Transitions;
 import de.flapdoodle.reverse.transitions.Start;
+import org.immutables.value.Value;
 
+@Value.Immutable
 public class Mongos implements WorkspaceDefaults, VersionAndPlatform, ProcessDefaults, CommandName, ExtractFileSet {
 	public Transitions transitions(de.flapdoodle.embed.process.distribution.Version version) {
 		return workspaceDefaults()
@@ -57,9 +59,11 @@ public TransitionWalker.ReachedState<RunningMongosProcess> start(Version version
 			.initState(StateID.of(RunningMongosProcess.class));
 	}
 
-	public static Mongos instance() {
-		return new Mongos();
+	public static ImmutableMongos instance() {
+		return builder().build();
 	}
 
-
+	public static ImmutableMongos.Builder builder() {
+		return ImmutableMongos.builder();
+	}
 }
diff --git a/src/test/java/de/flapdoodle/embed/mongo/doc/HowToDocTest.java b/src/test/java/de/flapdoodle/embed/mongo/doc/HowToDocTest.java
@@ -171,7 +171,8 @@ public void testCustomizeArtifactStorage() throws UnknownHostException {
 			@Override
 			public Transition<PersistentDir> persistentBaseDir() {
 				return Start.to(PersistentDir.class)
-					.providedBy(PersistentDir.userHome(".embeddedMongodbCustomPath"));
+					.providedBy(PersistentDir.inUserHome(".embeddedMongodbCustomPath")
+						.mapToUncheckedException(RuntimeException::new));
 			}
 		};
 		recording.end();