From d63b9924cf19a86da93cb6f3e09810389c41e547 Mon Sep 17 00:00:00 2001 From: mjindalmotiv8 <87622838+mjindalmotiv8@users.noreply.github.com> Date: Thu, 16 Sep 2021 10:43:31 -0700 Subject: [PATCH] Updating the protos in the client SDK to use ECacheResult (#32) --- messages/src/client_protos | 2 +- .../intTest/java/momento/sdk/CacheTest.java | 16 +++++------ .../momento/sdk/messages/BaseResponse.java | 20 +++++++------- .../sdk/messages/ClientGetResponse.java | 8 +++--- .../sdk/messages/ClientSetResponse.java | 8 +++--- .../sdk/messages/MomentoCacheResult.java | 27 +++++++++++++++++++ .../momento/sdk/messages/MomentoResult.java | 27 ------------------- 7 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 momento-sdk/src/main/java/momento/sdk/messages/MomentoCacheResult.java delete mode 100644 momento-sdk/src/main/java/momento/sdk/messages/MomentoResult.java diff --git a/messages/src/client_protos b/messages/src/client_protos index 20d489df..df09b825 160000 --- a/messages/src/client_protos +++ b/messages/src/client_protos @@ -1 +1 @@ -Subproject commit 20d489df6d092b2302871239cacd095be8b9338f +Subproject commit df09b8254c8e4e64c040d166fa20f62d749df67d diff --git a/momento-sdk/src/intTest/java/momento/sdk/CacheTest.java b/momento-sdk/src/intTest/java/momento/sdk/CacheTest.java index a0b90a1a..51aeb8a3 100644 --- a/momento-sdk/src/intTest/java/momento/sdk/CacheTest.java +++ b/momento-sdk/src/intTest/java/momento/sdk/CacheTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import momento.sdk.messages.ClientGetResponse; import momento.sdk.messages.ClientSetResponse; -import momento.sdk.messages.MomentoResult; +import momento.sdk.messages.MomentoCacheResult; import java.io.BufferedReader; import java.io.IOException; @@ -97,12 +97,12 @@ void testHappyPath (Cache cache) { ByteBuffer.wrap("bar".getBytes(StandardCharsets.UTF_8)), 2 ); - Assertions.assertEquals(MomentoResult.Ok, setRsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Ok, setRsp.getResult()); // Get Key that was just set ClientGetResponse rsp = cache.get(key); - Assertions.assertEquals(MomentoResult.Hit, rsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Hit, rsp.getResult()); Assertions.assertEquals("bar", StandardCharsets.US_ASCII.decode(rsp.getBody()).toString()); } catch (IOException e) { @@ -136,12 +136,12 @@ void testAsyncHappyPath(Cache client) { ByteBuffer.wrap("bar".getBytes(StandardCharsets.UTF_8)), 10 ); - Assertions.assertEquals(MomentoResult.Ok, setRsp.toCompletableFuture().get().getResult()); + Assertions.assertEquals(MomentoCacheResult.Ok, setRsp.toCompletableFuture().get().getResult()); // Get Key Async ClientGetResponse rsp = client.getAsync(key).toCompletableFuture().get(); - Assertions.assertEquals(MomentoResult.Hit, rsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Hit, rsp.getResult()); Assertions.assertEquals("bar", StandardCharsets.US_ASCII.decode(rsp.getBody()).toString()); } catch (IOException | InterruptedException | ExecutionException e) { @@ -175,14 +175,14 @@ void testTtlHappyPath(Cache client) { ByteBuffer.wrap("bar".getBytes(StandardCharsets.UTF_8)), 1 ); - Assertions.assertEquals(MomentoResult.Ok, setRsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Ok, setRsp.getResult()); Thread.sleep(1500); // Get Key that was just set ClientGetResponse rsp = client.get(key); - Assertions.assertEquals(MomentoResult.Miss, rsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Miss, rsp.getResult()); } catch (IOException | InterruptedException e) { Assertions.fail(e); @@ -211,7 +211,7 @@ void testMissHappyPathInternal(Cache client) { // Get Key that was just set ClientGetResponse rsp = client.get(UUID.randomUUID().toString()); - Assertions.assertEquals(MomentoResult.Miss, rsp.getResult()); + Assertions.assertEquals(MomentoCacheResult.Miss, rsp.getResult()); } catch (IOException e) { Assertions.fail(e); diff --git a/momento-sdk/src/main/java/momento/sdk/messages/BaseResponse.java b/momento-sdk/src/main/java/momento/sdk/messages/BaseResponse.java index 8067a9b1..048b21b9 100644 --- a/momento-sdk/src/main/java/momento/sdk/messages/BaseResponse.java +++ b/momento-sdk/src/main/java/momento/sdk/messages/BaseResponse.java @@ -1,19 +1,19 @@ package momento.sdk.messages; -import grpc.cache_client.Result; +import grpc.cache_client.ECacheResult; // TODO: This should be made package default public class BaseResponse { - MomentoResult resultMapper(Result result) { + MomentoCacheResult resultMapper(ECacheResult result) { switch (result) { - case Ok: return MomentoResult.Ok; - case Hit: return MomentoResult.Hit; - case Miss: return MomentoResult.Miss; - case Unauthorized: return MomentoResult.Unauthorized; - case Bad_Request: return MomentoResult.Bad_Request; - case Service_Unavailable: return MomentoResult.Service_Unavailable; - case Internal_Server_Error: return MomentoResult.Internal_Server_Error; - default: return MomentoResult.Unknown; + case Ok: return MomentoCacheResult.Ok; + case Hit: return MomentoCacheResult.Hit; + case Miss: return MomentoCacheResult.Miss; + case Unauthorized: return MomentoCacheResult.Unauthorized; + case Bad_Request: return MomentoCacheResult.Bad_Request; + case Service_Unavailable: return MomentoCacheResult.Service_Unavailable; + case Internal_Server_Error: return MomentoCacheResult.Internal_Server_Error; + default: return MomentoCacheResult.Unknown; } } } diff --git a/momento-sdk/src/main/java/momento/sdk/messages/ClientGetResponse.java b/momento-sdk/src/main/java/momento/sdk/messages/ClientGetResponse.java index 7370a9aa..dada6b54 100644 --- a/momento-sdk/src/main/java/momento/sdk/messages/ClientGetResponse.java +++ b/momento-sdk/src/main/java/momento/sdk/messages/ClientGetResponse.java @@ -1,17 +1,17 @@ package momento.sdk.messages; -import grpc.cache_client.Result; +import grpc.cache_client.ECacheResult; public class ClientGetResponse extends BaseResponse { private T body; - private Result result; + private ECacheResult result; - public ClientGetResponse(Result result, T body) { + public ClientGetResponse(ECacheResult result, T body) { this.body = body; this.result = result; } - public MomentoResult getResult() { + public MomentoCacheResult getResult() { return this.resultMapper(this.result); } diff --git a/momento-sdk/src/main/java/momento/sdk/messages/ClientSetResponse.java b/momento-sdk/src/main/java/momento/sdk/messages/ClientSetResponse.java index 943a2bd8..11f0597a 100644 --- a/momento-sdk/src/main/java/momento/sdk/messages/ClientSetResponse.java +++ b/momento-sdk/src/main/java/momento/sdk/messages/ClientSetResponse.java @@ -1,15 +1,15 @@ package momento.sdk.messages; -import grpc.cache_client.Result; +import grpc.cache_client.ECacheResult; public class ClientSetResponse extends BaseResponse { - private Result result; + private ECacheResult result; - public ClientSetResponse(Result result) { + public ClientSetResponse(ECacheResult result) { this.result = result; } - public MomentoResult getResult() { + public MomentoCacheResult getResult() { return this.resultMapper(this.result); } } diff --git a/momento-sdk/src/main/java/momento/sdk/messages/MomentoCacheResult.java b/momento-sdk/src/main/java/momento/sdk/messages/MomentoCacheResult.java new file mode 100644 index 00000000..871d0c84 --- /dev/null +++ b/momento-sdk/src/main/java/momento/sdk/messages/MomentoCacheResult.java @@ -0,0 +1,27 @@ +package momento.sdk.messages; +import grpc.cache_client.ECacheResult; + +public enum MomentoCacheResult { + Internal_Server_Error(ECacheResult.Internal_Server_Error), + Ok(ECacheResult.Ok), + Hit(ECacheResult.Hit), + Miss(ECacheResult.Miss), + Bad_Request(ECacheResult.Bad_Request), + Unauthorized(ECacheResult.Unauthorized), + Service_Unavailable(ECacheResult.Service_Unavailable), + Unknown(65535); + + private int result; + + MomentoCacheResult(grpc.cache_client.ECacheResult num) { + this.result = num.getNumber(); + } + + MomentoCacheResult(int num) { + this.result = num; + } + + public int getResult() { + return this.result; + } +} diff --git a/momento-sdk/src/main/java/momento/sdk/messages/MomentoResult.java b/momento-sdk/src/main/java/momento/sdk/messages/MomentoResult.java deleted file mode 100644 index dc333558..00000000 --- a/momento-sdk/src/main/java/momento/sdk/messages/MomentoResult.java +++ /dev/null @@ -1,27 +0,0 @@ -package momento.sdk.messages; -import grpc.cache_client.Result; - -public enum MomentoResult { - Internal_Server_Error(Result.Internal_Server_Error), - Ok(Result.Ok), - Hit(Result.Hit), - Miss(Result.Miss), - Bad_Request(Result.Bad_Request), - Unauthorized(Result.Unauthorized), - Service_Unavailable(Result.Service_Unavailable), - Unknown(65535); - - private int result; - - MomentoResult(grpc.cache_client.Result num) { - this.result = num.getNumber(); - } - - MomentoResult(int num) { - this.result = num; - } - - public int getResult() { - return this.result; - } -}