This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f2826ee084f8e359a90fcc9c8523913d35e8c57d Author: cketti <[email protected]> AuthorDate: Sun Sep 15 21:39:16 2019 +0200 JAMES-2884 Rename ProtocolRequest to InvocationRequest Rename class to more closely match the type name in RFC 8620. --- .../src/main/java/org/apache/james/jmap/JMAPServlet.java | 4 ++-- .../org/apache/james/jmap/methods/JmapRequestParser.java | 4 ++-- .../apache/james/jmap/methods/JmapRequestParserImpl.java | 4 ++-- .../james/jmap/model/AuthenticatedProtocolRequest.java | 6 +++--- .../model/{ProtocolRequest.java => InvocationRequest.java} | 8 ++++---- .../james/jmap/methods/JmapRequestParserImplTest.java | 8 ++++---- .../james/jmap/methods/JmapResponseWriterImplTest.java | 6 +++--- .../org/apache/james/jmap/methods/RequestHandlerTest.java | 6 +++--- ...ProtocolRequestTest.java => InvocationRequestTest.java} | 14 +++++++------- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java index 970a358..d4a1df6 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.james.jmap.methods.RequestHandler; import org.apache.james.jmap.model.AuthenticatedProtocolRequest; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import org.apache.james.jmap.model.ProtocolResponse; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.metrics.api.TimeMetric; @@ -72,7 +72,7 @@ public class JMAPServlet extends HttpServlet { try { List<Object[]> responses = requestAsJsonStream(req) - .map(ProtocolRequest::deserialize) + .map(InvocationRequest::deserialize) .map(x -> AuthenticatedProtocolRequest.decorate(x, req)) .flatMap(this::handle) .map(ProtocolResponse::asProtocolSpecification) diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParser.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParser.java index f16e022..4bed7f7 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParser.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParser.java @@ -21,13 +21,13 @@ package org.apache.james.jmap.methods; import java.io.IOException; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; public interface JmapRequestParser { - <T extends JmapRequest> T extractJmapRequest(ProtocolRequest request, Class<T> requestClass) + <T extends JmapRequest> T extractJmapRequest(InvocationRequest request, Class<T> requestClass) throws IOException, JsonParseException, JsonMappingException; } diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParserImpl.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParserImpl.java index 030db7d..c5bef79 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParserImpl.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapRequestParserImpl.java @@ -24,7 +24,7 @@ import java.io.IOException; import javax.inject.Inject; import org.apache.james.jmap.json.ObjectMapperFactory; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; @@ -40,7 +40,7 @@ public class JmapRequestParserImpl implements JmapRequestParser { } @Override - public <T extends JmapRequest> T extractJmapRequest(ProtocolRequest request, Class<T> requestClass) + public <T extends JmapRequest> T extractJmapRequest(InvocationRequest request, Class<T> requestClass) throws IOException, JsonParseException, JsonMappingException { return objectMapper.readValue(request.getParameters().toString(), requestClass); } diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AuthenticatedProtocolRequest.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AuthenticatedProtocolRequest.java index 5311ef1..3bf0fc7 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AuthenticatedProtocolRequest.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AuthenticatedProtocolRequest.java @@ -23,15 +23,15 @@ import javax.servlet.http.HttpServletRequest; import org.apache.james.jmap.AuthenticationFilter; import org.apache.james.mailbox.MailboxSession; -public class AuthenticatedProtocolRequest extends ProtocolRequest { +public class AuthenticatedProtocolRequest extends InvocationRequest { - public static AuthenticatedProtocolRequest decorate(ProtocolRequest request, HttpServletRequest httpServletRequest) { + public static AuthenticatedProtocolRequest decorate(InvocationRequest request, HttpServletRequest httpServletRequest) { return new AuthenticatedProtocolRequest(request, httpServletRequest); } private final HttpServletRequest httpServletRequest; - private AuthenticatedProtocolRequest(ProtocolRequest request, HttpServletRequest httpServletRequest) { + private AuthenticatedProtocolRequest(InvocationRequest request, HttpServletRequest httpServletRequest) { super(request.getMethodName(), request.getParameters(), request.getClientId()); this.httpServletRequest = httpServletRequest; diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolRequest.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationRequest.java similarity index 86% rename from server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolRequest.java rename to server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationRequest.java index 9ed2985..84ee07b 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolRequest.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationRequest.java @@ -24,21 +24,21 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Preconditions; -public class ProtocolRequest { +public class InvocationRequest { - public static ProtocolRequest deserialize(JsonNode[] json) { + public static InvocationRequest deserialize(JsonNode[] json) { Preconditions.checkState(json.length == 3, "should have three elements"); Preconditions.checkState(json[0].isTextual(), "first element should be a String"); Preconditions.checkState(json[1].isObject(), "second element should be a Json"); Preconditions.checkState(json[2].isTextual(), "third element should be a String"); - return new ProtocolRequest(Method.Request.name(json[0].textValue()), (ObjectNode) json[1], ClientId.of(json[2].textValue())); + return new InvocationRequest(Method.Request.name(json[0].textValue()), (ObjectNode) json[1], ClientId.of(json[2].textValue())); } private final Method.Request.Name method; private final ObjectNode parameters; private final ClientId clientId; - protected ProtocolRequest(Method.Request.Name method, ObjectNode parameters, ClientId clientId) { + protected InvocationRequest(Method.Request.Name method, ObjectNode parameters, ClientId clientId) { this.method = method; this.parameters = parameters; this.clientId = clientId; diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java index 461fd13..3cc6e8d 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java @@ -20,7 +20,7 @@ package org.apache.james.jmap.methods; import org.apache.james.jmap.json.ObjectMapperFactory; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.junit.Before; @@ -44,7 +44,7 @@ public class JmapRequestParserImplTest { new ObjectNode(new JsonNodeFactory(false)).putObject("{\"id\": \"id\"}"), new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - testee.extractJmapRequest(ProtocolRequest.deserialize(nodes), null); + testee.extractJmapRequest(InvocationRequest.deserialize(nodes), null); } @Test @@ -55,7 +55,7 @@ public class JmapRequestParserImplTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - testee.extractJmapRequest(ProtocolRequest.deserialize(nodes), RequestClass.class); + testee.extractJmapRequest(InvocationRequest.deserialize(nodes), RequestClass.class); } @Test @@ -65,7 +65,7 @@ public class JmapRequestParserImplTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - testee.extractJmapRequest(ProtocolRequest.deserialize(nodes), RequestClass.class); + testee.extractJmapRequest(InvocationRequest.deserialize(nodes), RequestClass.class); } private static class RequestClass implements JmapRequest { diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java index 4d12608..aefe0b7 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java @@ -30,7 +30,7 @@ import java.util.stream.Stream; import org.apache.james.jmap.json.ObjectMapperFactory; import org.apache.james.jmap.model.ClientId; import org.apache.james.jmap.model.Property; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import org.apache.james.jmap.model.ProtocolResponse; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMessageId; @@ -219,7 +219,7 @@ public class JmapResponseWriterImplTest { List<ProtocolResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() - .clientId(ProtocolRequest.deserialize(nodes).getClientId()) + .clientId(InvocationRequest.deserialize(nodes).getClientId()) .error() .build())) .collect(Collectors.toList()); @@ -242,7 +242,7 @@ public class JmapResponseWriterImplTest { List<ProtocolResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() - .clientId(ProtocolRequest.deserialize(nodes).getClientId()) + .clientId(InvocationRequest.deserialize(nodes).getClientId()) .error(ErrorResponse .builder() .type("errorType") diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java index 7daee72..20d49b4 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.james.jmap.json.ObjectMapperFactory; import org.apache.james.jmap.model.AuthenticatedProtocolRequest; import org.apache.james.jmap.model.ClientId; -import org.apache.james.jmap.model.ProtocolRequest; +import org.apache.james.jmap.model.InvocationRequest; import org.apache.james.jmap.model.ProtocolResponse; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.inmemory.InMemoryId; @@ -140,7 +140,7 @@ public class RequestHandlerTest { new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; RequestHandler requestHandler = new RequestHandler(ImmutableSet.of(), jmapRequestParser, jmapResponseWriter); - requestHandler.handle(AuthenticatedProtocolRequest.decorate(ProtocolRequest.deserialize(nodes), mockHttpServletRequest)); + requestHandler.handle(AuthenticatedProtocolRequest.decorate(InvocationRequest.deserialize(nodes), mockHttpServletRequest)); } @Test(expected = IllegalStateException.class) @@ -208,7 +208,7 @@ public class RequestHandlerTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - List<ProtocolResponse> responses = testee.handle(AuthenticatedProtocolRequest.decorate(ProtocolRequest.deserialize(nodes), mockHttpServletRequest)) + List<ProtocolResponse> responses = testee.handle(AuthenticatedProtocolRequest.decorate(InvocationRequest.deserialize(nodes), mockHttpServletRequest)) .collect(Collectors.toList()); assertThat(responses).hasSize(1) diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationRequestTest.java similarity index 92% rename from server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java rename to server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationRequestTest.java index 087aa40..4122857 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationRequestTest.java @@ -32,14 +32,14 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -public class ProtocolRequestTest { +public class InvocationRequestTest { @Test(expected = IllegalStateException.class) public void deserializedRequestsShouldThrowWhenNotEnoughElements() throws Exception { JsonNode[] nodes = new JsonNode[] { new ObjectNode(new JsonNodeFactory(false)).textNode("getAccounts"), new ObjectNode(new JsonNodeFactory(false)).putObject("{}")}; - ProtocolRequest.deserialize(nodes); + InvocationRequest.deserialize(nodes); } @Test(expected = IllegalStateException.class) @@ -49,7 +49,7 @@ public class ProtocolRequestTest { new ObjectNode(new JsonNodeFactory(false)).textNode("#0"), new ObjectNode(new JsonNodeFactory(false)).textNode("tooMuch")}; - ProtocolRequest.deserialize(nodes); + InvocationRequest.deserialize(nodes); } @Test(expected = IllegalStateException.class) @@ -58,7 +58,7 @@ public class ProtocolRequestTest { new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), new ObjectNode(new JsonNodeFactory(false)).textNode("#0")}; - ProtocolRequest.deserialize(nodes); + InvocationRequest.deserialize(nodes); } @Test(expected = IllegalStateException.class) @@ -67,7 +67,7 @@ public class ProtocolRequestTest { new ObjectNode(new JsonNodeFactory(false)).textNode("true"), new ObjectNode(new JsonNodeFactory(false)).textNode("#0")}; - ProtocolRequest.deserialize(nodes); + InvocationRequest.deserialize(nodes); } @Test(expected = IllegalStateException.class) @@ -76,7 +76,7 @@ public class ProtocolRequestTest { new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), new ObjectNode(new JsonNodeFactory(false)).booleanNode(true)}; - ProtocolRequest.deserialize(nodes); + InvocationRequest.deserialize(nodes); } @Test @@ -85,7 +85,7 @@ public class ProtocolRequestTest { new ObjectNode(new JsonNodeFactory(false)).putObject("{\"id\": \"id\"}"), new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - ProtocolRequest request = ProtocolRequest.deserialize(nodes); + InvocationRequest request = InvocationRequest.deserialize(nodes); assertThat(request.getMethodName()).isEqualTo(Method.Request.name("getAccounts")); assertThat(request.getParameters()).isNotNull(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
