Rename/Refactor Jabushka to Javabushka

java/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "jabushka"
+name = "javababushka"
 version = "0.0.0"
 edition = "2021"
 license = "BSD-3-Clause"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "jabushka"
+name = "javababushka"
 crate-type = ["cdylib"]
 
 [dependencies]

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

@@ -29,7 +29,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/AsyncClient.java → java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java

@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 import java.util.concurrent.Future;
 

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

@@ -1,16 +1,16 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javabushka.client.jedis.JedisClient;
-import javabushka.client.jedis.JedisPseudoAsyncClient;
-import javabushka.client.lettuce.LettuceAsyncClient;
-import javabushka.client.lettuce.LettuceClient;
-import javabushka.client.utils.Benchmarking;
+import javababushka.benchmarks.jedis.JedisClient;
+import javababushka.benchmarks.lettuce.LettuceAsyncClient;
+import javababushka.benchmarks.lettuce.LettuceClient;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.jedis.JedisPseudoAsyncClient;
 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/Client.java → java/benchmarks/src/main/java/javababushka/benchmarks/Client.java

@@ -1,6 +1,6 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public interface Client {
   void connectToRedis();

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

@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 public interface SyncClient extends Client {
   void set(String key, String value);

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

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

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

@@ -1,9 +1,9 @@
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javabushka.client.AsyncClient;
+import javababushka.benchmarks.AsyncClient;
 
 // Jedis doesn't provide async API
 // https://github.com/redis/jedis/issues/241

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

@@ -1,16 +1,16 @@
 /*
  * 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;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javabushka.client.AsyncClient;
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.AsyncClient;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public class LettuceAsyncClient implements AsyncClient {
 

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

@@ -1,13 +1,13 @@
 /*
  * 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;
 import io.lettuce.core.api.sync.RedisStringCommands;
-import javabushka.client.SyncClient;
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.SyncClient;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public class LettuceClient implements SyncClient {
 

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;
@@ -8,10 +8,10 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javabushka.client.AsyncClient;
-import javabushka.client.BenchmarkingApp;
-import javabushka.client.Client;
-import javabushka.client.SyncClient;
+import javababushka.benchmarks.AsyncClient;
+import javababushka.benchmarks.BenchmarkingApp;
+import javababushka.benchmarks.Client;
+import javababushka.benchmarks.SyncClient;
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class Benchmarking {

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/ConnectionSettings.java → java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java

@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 public class ConnectionSettings {
   public String host;

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.Benchmarking;
+import javababushka.benchmarks.utils.ChosenAction;
 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/settings.gradle

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