From 39a85fae2e43fc4c660365cd8fa8aa373fb56700 Mon Sep 17 00:00:00 2001 From: Andrew Carbonetto Date: Tue, 14 Nov 2023 21:00:09 -0800 Subject: [PATCH] Fix lib.rs Signed-off-by: Andrew Carbonetto --- .../benchmarks/babushka/JniNettyClient.java | 2 +- .../ConnectionRequestOuterClass.java | 0 .../{benchmarks => client}/RedisClient.java | 2 +- .../RedisRequestOuterClass.java | 0 .../ResponseOuterClass.java | 0 java/javababushka_client_RedisClient.h | 20 +++++++++---------- 6 files changed, 12 insertions(+), 12 deletions(-) rename java/benchmarks/src/main/java/javababushka/{benchmarks/babushka => client}/ConnectionRequestOuterClass.java (100%) rename java/benchmarks/src/main/java/javababushka/{benchmarks => client}/RedisClient.java (96%) rename java/benchmarks/src/main/java/javababushka/{benchmarks/babushka => client}/RedisRequestOuterClass.java (100%) rename java/benchmarks/src/main/java/javababushka/{benchmarks/babushka => client}/ResponseOuterClass.java (100%) diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java index af445b3cc8..f002485273 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java @@ -49,9 +49,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import javababushka.benchmarks.AsyncClient; -import javababushka.benchmarks.RedisClient; import javababushka.benchmarks.SyncClient; import javababushka.benchmarks.utils.ConnectionSettings; +import javababushka.client.RedisClient; import org.apache.commons.lang3.tuple.Pair; @VisibleForTesting diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/ConnectionRequestOuterClass.java b/java/benchmarks/src/main/java/javababushka/client/ConnectionRequestOuterClass.java similarity index 100% rename from java/benchmarks/src/main/java/javababushka/benchmarks/babushka/ConnectionRequestOuterClass.java rename to java/benchmarks/src/main/java/javababushka/client/ConnectionRequestOuterClass.java diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/RedisClient.java b/java/benchmarks/src/main/java/javababushka/client/RedisClient.java similarity index 96% rename from java/benchmarks/src/main/java/javababushka/benchmarks/RedisClient.java rename to java/benchmarks/src/main/java/javababushka/client/RedisClient.java index 9863290217..423f1a9992 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/RedisClient.java +++ b/java/benchmarks/src/main/java/javababushka/client/RedisClient.java @@ -1,4 +1,4 @@ -package javababushka.benchmarks; +package javababushka.client; public class RedisClient { public static native void startSocketListenerExternal(RedisClient callback); diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/RedisRequestOuterClass.java b/java/benchmarks/src/main/java/javababushka/client/RedisRequestOuterClass.java similarity index 100% rename from java/benchmarks/src/main/java/javababushka/benchmarks/babushka/RedisRequestOuterClass.java rename to java/benchmarks/src/main/java/javababushka/client/RedisRequestOuterClass.java diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/ResponseOuterClass.java b/java/benchmarks/src/main/java/javababushka/client/ResponseOuterClass.java similarity index 100% rename from java/benchmarks/src/main/java/javababushka/benchmarks/babushka/ResponseOuterClass.java rename to java/benchmarks/src/main/java/javababushka/client/ResponseOuterClass.java diff --git a/java/javababushka_client_RedisClient.h b/java/javababushka_client_RedisClient.h index db4d0b86e3..c315cd8b8f 100644 --- a/java/javababushka_client_RedisClient.h +++ b/java/javababushka_client_RedisClient.h @@ -1,34 +1,34 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ #include -/* Header for class javababushka_benchmarks_RedisClient */ +/* Header for class javababushka_client_RedisClient */ -#ifndef _Included_javababushka_benchmarks_RedisClient -#define _Included_javababushka_benchmarks_RedisClient +#ifndef _Included_javababushka_client_RedisClient +#define _Included_javababushka_client_RedisClient #ifdef __cplusplus extern "C" { #endif /* - * Class: javababushka_benchmarks_RedisClient + * Class: javababushka_client_RedisClient * Method: startSocketListenerExternal - * Signature: (Ljavababushka/benchmarks/RedisClient;)V + * Signature: (Ljavababushka/client/RedisClient;)V */ -JNIEXPORT void JNICALL Java_javababushka_benchmarks_RedisClient_startSocketListenerExternal__Ljavababushka_benchmarks_RedisClient_2 +JNIEXPORT void JNICALL Java_javababushka_client_RedisClient_startSocketListenerExternal__Ljavababushka_client_RedisClient_2 (JNIEnv *, jclass, jobject); /* - * Class: javababushka_benchmarks_RedisClient + * Class: javababushka_client_RedisClient * Method: startSocketListenerExternal * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_javababushka_benchmarks_RedisClient_startSocketListenerExternal__ +JNIEXPORT jstring JNICALL Java_javababushka_client_RedisClient_startSocketListenerExternal__ (JNIEnv *, jclass); /* - * Class: javababushka_benchmarks_RedisClient + * Class: javababushka_client_RedisClient * Method: valueFromPointer * Signature: (J)Ljava/lang/Object; */ -JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_RedisClient_valueFromPointer +JNIEXPORT jobject JNICALL Java_javababushka_client_RedisClient_valueFromPointer (JNIEnv *, jclass, jlong); #ifdef __cplusplus