Refactor/Rename jabushka to javabushka

Signed-off-by: acarbonetto <[email protected]>

java/jabushka/benchmarks/build.gradle → java/benchmarks/build.gradle

@@ -28,7 +28,7 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClass = 'javabushka.client.BenchmarkingApp'
+    mainClass = 'javababushka.benchmarks.BenchmarkingApp'
 }
 
 tasks.withType(Test) { 

java/jabushka/benchmarks/src/main/java/javabushka/client/BenchmarkingApp.java → java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java

@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -8,10 +8,10 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javabushka.client.jedis.JedisClient;
-import javabushka.client.lettuce.LettuceAsyncClient;
-import javabushka.client.utils.Benchmarking;
-import javabushka.client.utils.ChosenAction;
+import javababushka.benchmarks.jedis.JedisClient;
+import javababushka.benchmarks.lettuce.LettuceAsyncClient;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.utils.ChosenAction;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;

java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisClient.java → java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisClient.java

@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;

java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceAsyncClient.java → java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java

@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;

java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceClient.java → java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java

@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;

java/jabushka/benchmarks/src/main/java/javabushka/client/utils/Benchmarking.java → java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java

@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 import java.io.FileWriter;
 import java.io.IOException;

java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ChosenAction.java → java/benchmarks/src/main/java/javababushka/benchmarks/utils/ChosenAction.java

@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 public enum ChosenAction {
   GET_NON_EXISTING,

java/jabushka/benchmarks/src/main/java/javabushka/client/utils/LatencyResults.java → java/benchmarks/src/main/java/javababushka/benchmarks/utils/LatencyResults.java

@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 // Raw timing results in nanoseconds
 public class LatencyResults {

java/jabushka/benchmarks/src/test/java/javabushka/client/jedis/JedisClientIT.java → java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java

@@ -1,14 +1,14 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
-import javabushka.client.utils.Benchmarking;
-import javabushka.client.utils.ChosenAction;
+import javababushka.benchmarks.utils.ChosenAction;
+import javababushka.benchmarks.utils.Benchmarking;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 

java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceAsyncClientIT.java → java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceAsyncClientIT.java

@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;

java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceClientIT.java → java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceClientIT.java

@@ -1,11 +1,11 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import java.util.HashMap;
-import javabushka.client.utils.Benchmarking;
-import javabushka.client.utils.ChosenAction;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.utils.ChosenAction;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

java/rust_client/.cargo/config.toml

@@ -0,0 +1,3 @@
+[env]
+BABUSHKA_NAME = { value = "JavaBabushka", force = true }
+BABUSHKA_VERSION = "0.1.0"

java/Cargo.toml → java/rust_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "jabushka"
-version = "0.0.0"
+name = "JavaBabushka"
+version = "0.1.0"
 edition = "2021"
 license = "BSD-3-Clause"
 
@@ -10,10 +10,10 @@ name = "jabushka"
 crate-type = ["cdylib"]
 
 [dependencies]
-redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] }
-babushka = { path = "../babushka-core" }
+redis = { path = "../../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] }
+babushka = { path = "../../babushka-core" }
 tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
-logger_core = {path = "../logger_core"}
+logger_core = {path = "../../logger_core"}
 tracing-subscriber = "0.3.16"
 
 [profile.release]

java/settings.gradle

@@ -0,0 +1,5 @@
+rootProject.name = 'java-babushka'
+
+include 'client'
+include 'integTest'
+include 'benchmarks'