apply spotless.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/2ccedd06 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/2ccedd06 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/2ccedd06 Branch: refs/heads/feature/GEODE-2580 Commit: 2ccedd0628c4d3408d661672f4762326f8592b49 Parents: 9973c49 Author: Galen OSullivan <gosulli...@pivotal.io> Authored: Thu May 18 17:26:14 2017 -0700 Committer: Udo Kohlmeyer <ukohlme...@pivotal.io> Committed: Mon May 22 11:27:03 2017 -0700 ---------------------------------------------------------------------- .../client/ProtobufProtocolMessageHandler.java | 14 ++++++++------ .../apache/geode/protocol/client/MessageUtils.java | 12 +++++++----- .../client/ProtobufProtocolIntegrationTest.java | 15 ++++++--------- .../tier/sockets/ClientProtocolMessageHandler.java | 2 +- .../cache/tier/sockets/ServerConnection.java | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java ---------------------------------------------------------------------- diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java index 10ad7e9..85de51d 100644 --- a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java +++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java @@ -49,7 +49,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand @Override public void receiveMessage(InputStream inputStream, OutputStream outputStream, - Deserializer deserializer, Serializer serializer, Cache cache) throws IOException { + Deserializer deserializer, Serializer serializer, Cache cache) throws IOException { final Message message = Message.parseDelimitedFrom(inputStream); // can be null at EOF, see Parser.parseDelimitedFrom(java.io.InputStream) if (message == null) { @@ -73,7 +73,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand // TODO } if (responseMessage != null) { - responseMessage.writeDelimitedTo(outputStream); + responseMessage.writeDelimitedTo(outputStream); } } @@ -100,7 +100,8 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand .build(); } - private Message doGetRequest(GetRequest request, Deserializer deserializer, Serializer serializer, Cache cache) { + private Message doGetRequest(GetRequest request, Deserializer deserializer, Serializer serializer, + Cache cache) { String regionName = request.getRegionName(); BasicTypes.Key key = request.getKey(); byte[] keyBytes = key.getKey().toByteArray(); @@ -118,9 +119,10 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand private Message getResponseWithValue(byte[] value) { return Message.newBuilder() - .setResponse(Response.newBuilder().setGetResponse(RegionAPI.GetResponse.newBuilder() - .setResult(BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(value))))) - .build(); + .setResponse(Response.newBuilder() + .setGetResponse(RegionAPI.GetResponse.newBuilder() + .setResult(BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(value))))) + .build(); } public ProtobufProtocolMessageHandler() {} http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java ---------------------------------------------------------------------- diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java index 4991467..7cb5ffa 100644 --- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java +++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java @@ -85,16 +85,18 @@ public class MessageUtils { public static ClientProtocol.Message makeGetMessageFor(String region, String key) { Random random = new Random(); ClientProtocol.MessageHeader.Builder messageHeader = - ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt()); + ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt()); BasicTypes.Key.Builder keyBuilder = - BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key)); + BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key)); - RegionAPI.GetRequest.Builder getRequest = RegionAPI.GetRequest.newBuilder().setRegionName(region).setKey(keyBuilder); - ClientProtocol.Request.Builder request = ClientProtocol.Request.newBuilder().setGetRequest(getRequest); + RegionAPI.GetRequest.Builder getRequest = + RegionAPI.GetRequest.newBuilder().setRegionName(region).setKey(keyBuilder); + ClientProtocol.Request.Builder request = + ClientProtocol.Request.newBuilder().setGetRequest(getRequest); return ClientProtocol.Message.newBuilder().setMessageHeader(messageHeader).setRequest(request) - .build(); + .build(); } private static byte[] createByteArrayOfSize(int msgSize) { http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java index b3864a2..1a9b62e 100644 --- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java +++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java @@ -52,8 +52,7 @@ public class ProtobufProtocolIntegrationTest { client.printResponse(response); assertEquals(RESPONSE, response.getMessageTypeCase()); - assertEquals(PUTRESPONSE, - response.getResponse().getResponseAPICase()); + assertEquals(PUTRESPONSE, response.getResponse().getResponseAPICase()); assertTrue(response.getResponse().getPutResponse().getSuccess()); assertEquals(1, region.size()); @@ -65,7 +64,7 @@ public class ProtobufProtocolIntegrationTest { @Test public void testRoundTripEmptyGetRequest() throws IOException { try (Cache cache = createCacheOnPort(40404); - NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) { + NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) { final String testRegion = "testRegion"; final String testKey = "testKey"; Region<Object, Object> region = cache.createRegionFactory().create("testRegion"); @@ -74,8 +73,7 @@ public class ProtobufProtocolIntegrationTest { ClientProtocol.Message response = client.blockingSendMessage(message); assertEquals(RESPONSE, response.getMessageTypeCase()); - assertEquals(GETRESPONSE, - response.getResponse().getResponseAPICase()); + assertEquals(GETRESPONSE, response.getResponse().getResponseAPICase()); BasicTypes.Value value = response.getResponse().getGetResponse().getResult(); assertTrue(value.getValue().isEmpty()); @@ -85,7 +83,7 @@ public class ProtobufProtocolIntegrationTest { @Test public void testRoundTripNonEmptyGetRequest() throws IOException { try (Cache cache = createCacheOnPort(40404); - NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) { + NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) { final String testRegion = "testRegion"; final String testKey = "testKey"; final String testValue = "testValue"; @@ -93,7 +91,7 @@ public class ProtobufProtocolIntegrationTest { ClientProtocol.Message putMessage = - MessageUtils.makePutMessageFor(testRegion, testKey, testValue); + MessageUtils.makePutMessageFor(testRegion, testKey, testValue); ClientProtocol.Message putResponse = client.blockingSendMessage(putMessage); client.printResponse(putResponse); @@ -101,8 +99,7 @@ public class ProtobufProtocolIntegrationTest { ClientProtocol.Message getResponse = client.blockingSendMessage(getMessage); assertEquals(RESPONSE, getResponse.getMessageTypeCase()); - assertEquals(GETRESPONSE, - getResponse.getResponse().getResponseAPICase()); + assertEquals(GETRESPONSE, getResponse.getResponse().getResponseAPICase()); BasicTypes.Value value = getResponse.getResponse().getGetResponse().getResult(); assertEquals(value.getValue().toStringUtf8(), testValue); http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java index e7e75bf..3e37c4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java @@ -25,5 +25,5 @@ import java.io.OutputStream; public interface ClientProtocolMessageHandler { void receiveMessage(InputStream inputStream, OutputStream outputStream, Deserializer deserializer, - Serializer serializer, Cache cache) throws IOException; + Serializer serializer, Cache cache) throws IOException; } http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java index 58f1709..a61c86c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java @@ -958,7 +958,7 @@ public class ServerConnection implements Runnable { // TODO serialization types? newClientProtocol.receiveMessage(inputStream, outputStream, SerializationType.STRING.deserializer, SerializationType.STRING.serializer, - this.getCache()); + this.getCache()); } catch (IOException e) { // TODO? }
