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 a12a57ee398f7d16e5ab0742508508a00f8933c2 Author: cketti <[email protected]> AuthorDate: Sun Sep 15 21:55:46 2019 +0200 JAMES-2884 Rename ProtocolResponse to InvocationResponse Rename class to more closely match the type name in RFC 8620. --- .../java/org/apache/james/jmap/JMAPServlet.java | 6 ++--- .../james/jmap/methods/JmapResponseWriter.java | 4 ++-- .../james/jmap/methods/JmapResponseWriterImpl.java | 6 ++--- .../apache/james/jmap/methods/RequestHandler.java | 4 ++-- ...otocolResponse.java => InvocationResponse.java} | 4 ++-- .../org/apache/james/jmap/JMAPServletTest.java | 6 ++--- .../jmap/methods/JmapResponseWriterImplTest.java | 28 +++++++++++----------- .../james/jmap/methods/RequestHandlerTest.java | 4 ++-- ...sponseTest.java => InvocationResponseTest.java} | 12 +++++----- 9 files changed, 37 insertions(+), 37 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 b660550..0b55529 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 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.james.jmap.methods.RequestHandler; import org.apache.james.jmap.model.AuthenticatedRequest; import org.apache.james.jmap.model.InvocationRequest; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.metrics.api.TimeMetric; import org.slf4j.Logger; @@ -75,7 +75,7 @@ public class JMAPServlet extends HttpServlet { .map(InvocationRequest::deserialize) .map(x -> AuthenticatedRequest.decorate(x, req)) .flatMap(this::handle) - .map(ProtocolResponse::asProtocolSpecification) + .map(InvocationResponse::asProtocolSpecification) .collect(Collectors.toList()); resp.setContentType(JSON_CONTENT_TYPE); @@ -100,7 +100,7 @@ public class JMAPServlet extends HttpServlet { } } - private Stream<? extends ProtocolResponse> handle(AuthenticatedRequest request) { + private Stream<? extends InvocationResponse> handle(AuthenticatedRequest request) { try { return requestHandler.handle(request); } catch (IOException e) { diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java index fc2e2ef..000134b 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java @@ -21,10 +21,10 @@ package org.apache.james.jmap.methods; import java.util.stream.Stream; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; public interface JmapResponseWriter { - Stream<ProtocolResponse> formatMethodResponse(Stream<JmapResponse> jmapResponse); + Stream<InvocationResponse> formatMethodResponse(Stream<JmapResponse> jmapResponse); } \ No newline at end of file diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriterImpl.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriterImpl.java index c2c3d47..d4bc420 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriterImpl.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriterImpl.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import org.apache.james.jmap.json.ObjectMapperFactory; import org.apache.james.jmap.model.Property; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ser.FilterProvider; @@ -47,11 +47,11 @@ public class JmapResponseWriterImpl implements JmapResponseWriter { } @Override - public Stream<ProtocolResponse> formatMethodResponse(Stream<JmapResponse> jmapResponses) { + public Stream<InvocationResponse> formatMethodResponse(Stream<JmapResponse> jmapResponses) { return jmapResponses.map(jmapResponse -> { ObjectMapper objectMapper = newConfiguredObjectMapper(jmapResponse); - return new ProtocolResponse( + return new InvocationResponse( jmapResponse.getResponseName(), objectMapper.valueToTree(jmapResponse.getResponse()), jmapResponse.getClientId()); diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java index 4ad67cd..1836eb3 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java @@ -33,7 +33,7 @@ import javax.inject.Inject; import org.apache.james.core.User; import org.apache.james.jmap.JmapFieldNotSupportedException; import org.apache.james.jmap.model.AuthenticatedRequest; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import org.apache.james.mailbox.MailboxSession; import org.apache.james.util.MDCBuilder; import org.slf4j.Logger; @@ -55,7 +55,7 @@ public class RequestHandler { .collect(Collectors.toMap(Method::requestHandled, Function.identity())); } - public Stream<ProtocolResponse> handle(AuthenticatedRequest request) throws IOException { + public Stream<InvocationResponse> handle(AuthenticatedRequest request) throws IOException { Optional<MailboxSession> mailboxSession = Optional.ofNullable(request.getMailboxSession()); try (Closeable closeable = MDCBuilder.create() diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolResponse.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationResponse.java similarity index 94% rename from server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolResponse.java rename to server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationResponse.java index 3a674ab..822d92c 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ProtocolResponse.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/InvocationResponse.java @@ -23,13 +23,13 @@ import org.apache.james.jmap.methods.Method; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Preconditions; -public class ProtocolResponse { +public class InvocationResponse { private final Method.Response.Name name; private final ObjectNode results; private final ClientId clientId; - public ProtocolResponse(Method.Response.Name name, ObjectNode results, ClientId clientId) { + public InvocationResponse(Method.Response.Name name, ObjectNode results, ClientId clientId) { Preconditions.checkNotNull(name, "method is mandatory"); Preconditions.checkNotNull(results, "results is mandatory"); Preconditions.checkNotNull(clientId, "clientId is mandatory"); diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java index 151a9e2..3a0e7fa 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java @@ -35,7 +35,7 @@ import org.apache.james.jmap.methods.ErrorResponse; import org.apache.james.jmap.methods.Method; import org.apache.james.jmap.methods.RequestHandler; import org.apache.james.jmap.model.ClientId; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import org.apache.james.metrics.api.NoopMetricFactory; import org.junit.After; import org.junit.Before; @@ -99,7 +99,7 @@ public class JMAPServletTest { json.put("type", "invalidArgument"); when(requestHandler.handle(any())) - .thenReturn(Stream.of(new ProtocolResponse(ErrorResponse.ERROR_METHOD, json, ClientId.of("#0")))); + .thenReturn(Stream.of(new InvocationResponse(ErrorResponse.ERROR_METHOD, json, ClientId.of("#0")))); given() .body("[[\"getAccounts\", {\"state\":false}, \"#0\"]]") @@ -121,7 +121,7 @@ public class JMAPServletTest { arrayNode.add(list); when(requestHandler.handle(any())) - .thenReturn(Stream.of(new ProtocolResponse(Method.Response.name("accounts"), json, ClientId.of("#0")))); + .thenReturn(Stream.of(new InvocationResponse(Method.Response.name("accounts"), json, ClientId.of("#0")))); given() .body("[[\"getAccounts\", {}, \"#0\"]]") 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 aefe0b7..cb63463 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 @@ -31,7 +31,7 @@ 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.InvocationRequest; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMessageId; import org.junit.Before; @@ -61,15 +61,15 @@ public class JmapResponseWriterImplTest { String expectedClientId = "#1"; String expectedId = "myId"; - Stream<ProtocolResponse> response = testee.formatMethodResponse(Stream.of(JmapResponse + Stream<InvocationResponse> response = testee.formatMethodResponse(Stream.of(JmapResponse .builder() .clientId(ClientId.of(expectedClientId)) .response(null) .build())); - List<ProtocolResponse> responseList = response.collect(Collectors.toList()); + List<InvocationResponse> responseList = response.collect(Collectors.toList()); assertThat(responseList).hasSize(1) - .extracting(ProtocolResponse::getResponseName, x -> x.getResults().get("id").asText(), ProtocolResponse::getClientId) + .extracting(InvocationResponse::getResponseName, x -> x.getResults().get("id").asText(), InvocationResponse::getClientId) .containsExactly(tuple(expectedMethod, expectedId, expectedClientId)); } @@ -81,7 +81,7 @@ public class JmapResponseWriterImplTest { ResponseClass responseClass = new ResponseClass(); responseClass.id = expectedId; - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .responseName(Method.Response.name("unknownMethod")) @@ -91,7 +91,7 @@ public class JmapResponseWriterImplTest { .collect(Collectors.toList()); assertThat(response).hasSize(1) - .extracting(ProtocolResponse::getResponseName, x -> x.getResults().get("id").asText(), ProtocolResponse::getClientId) + .extracting(InvocationResponse::getResponseName, x -> x.getResults().get("id").asText(), InvocationResponse::getClientId) .containsExactly(tuple(Method.Response.name("unknownMethod"), expectedId, ClientId.of(expectedClientId))); } @@ -108,7 +108,7 @@ public class JmapResponseWriterImplTest { responseClass.list = ImmutableList.of(new ObjectResponseClass.Foo("id", "name")); Property property = () -> "id"; - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .responseName(Method.Response.name("unknownMethod")) @@ -133,7 +133,7 @@ public class JmapResponseWriterImplTest { Property property = () -> "id"; @SuppressWarnings("unused") - Stream<ProtocolResponse> ignoredResponse = testee.formatMethodResponse( + Stream<InvocationResponse> ignoredResponse = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .responseName(Method.Response.name("unknownMethod")) @@ -142,7 +142,7 @@ public class JmapResponseWriterImplTest { .response(responseClass) .build())); - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .responseName(Method.Response.name("unknownMethod")) @@ -165,7 +165,7 @@ public class JmapResponseWriterImplTest { Property idProperty = () -> "id"; Property nameProperty = () -> "name"; - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .responseName(Method.Response.name("unknownMethod")) @@ -216,7 +216,7 @@ public class JmapResponseWriterImplTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode(expectedClientId)}; - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .clientId(InvocationRequest.deserialize(nodes).getClientId()) @@ -225,7 +225,7 @@ public class JmapResponseWriterImplTest { .collect(Collectors.toList()); assertThat(response).hasSize(1) - .extracting(ProtocolResponse::getResponseName, x -> x.getResults().get("type").asText(), ProtocolResponse::getClientId) + .extracting(InvocationResponse::getResponseName, x -> x.getResults().get("type").asText(), InvocationResponse::getClientId) .containsExactly(tuple(ErrorResponse.ERROR_METHOD, ErrorResponse.DEFAULT_ERROR_MESSAGE, ClientId.of(expectedClientId))); } @@ -239,7 +239,7 @@ public class JmapResponseWriterImplTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode(expectedClientId)}; - List<ProtocolResponse> response = testee.formatMethodResponse( + List<InvocationResponse> response = testee.formatMethodResponse( Stream.of(JmapResponse .builder() .clientId(InvocationRequest.deserialize(nodes).getClientId()) @@ -252,7 +252,7 @@ public class JmapResponseWriterImplTest { .collect(Collectors.toList()); assertThat(response).hasSize(1) - .extracting(ProtocolResponse::getResponseName, x -> x.getResults().get("type").asText(), x -> x.getResults().get("description").asText(), ProtocolResponse::getClientId) + .extracting(InvocationResponse::getResponseName, x -> x.getResults().get("type").asText(), x -> x.getResults().get("description").asText(), InvocationResponse::getClientId) .containsExactly(tuple(ErrorResponse.ERROR_METHOD, "errorType", "complete description", ClientId.of(expectedClientId))); } 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 ed24b24..1f54023 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 @@ -34,7 +34,7 @@ import org.apache.james.jmap.json.ObjectMapperFactory; import org.apache.james.jmap.model.AuthenticatedRequest; import org.apache.james.jmap.model.ClientId; import org.apache.james.jmap.model.InvocationRequest; -import org.apache.james.jmap.model.ProtocolResponse; +import org.apache.james.jmap.model.InvocationResponse; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMessageId; @@ -208,7 +208,7 @@ public class RequestHandlerTest { parameters, new ObjectNode(new JsonNodeFactory(false)).textNode("#1")}; - List<ProtocolResponse> responses = testee.handle(AuthenticatedRequest.decorate(InvocationRequest.deserialize(nodes), mockHttpServletRequest)) + List<InvocationResponse> responses = testee.handle(AuthenticatedRequest.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/ProtocolResponseTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationResponseTest.java similarity index 76% rename from server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java rename to server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationResponseTest.java index d092b62..5af92e2 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/InvocationResponseTest.java @@ -27,31 +27,31 @@ import org.junit.Test; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -public class ProtocolResponseTest { +public class InvocationResponseTest { @Test(expected = NullPointerException.class) public void newInstanceShouldThrowWhenMethodIsNull() { - new ProtocolResponse(null, new ObjectNode(JsonNodeFactory.instance), ClientId.of("id")); + new InvocationResponse(null, new ObjectNode(JsonNodeFactory.instance), ClientId.of("id")); } @Test(expected = IllegalArgumentException.class) public void newInstanceShouldThrowWhenMethodIsEmpty() { - new ProtocolResponse(Method.Response.name(""), new ObjectNode(JsonNodeFactory.instance), ClientId.of("id")); + new InvocationResponse(Method.Response.name(""), new ObjectNode(JsonNodeFactory.instance), ClientId.of("id")); } @Test(expected = NullPointerException.class) public void newInstanceShouldThrowWhenResultsIsNull() { - new ProtocolResponse(Method.Response.name("method"), null, ClientId.of("id")); + new InvocationResponse(Method.Response.name("method"), null, ClientId.of("id")); } @Test(expected = NullPointerException.class) public void newInstanceShouldThrowWhenClientIdIsNull() { - new ProtocolResponse(Method.Response.name("method"), new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), null); + new InvocationResponse(Method.Response.name("method"), new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), null); } @Test public void asProtocolSpecificationShouldReturnAnArrayWithThreeElements() { - Object[] asProtocolSpecification = new ProtocolResponse(Method.Response.name("method"), new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), ClientId.of("#1")) + Object[] asProtocolSpecification = new InvocationResponse(Method.Response.name("method"), new ObjectNode(new JsonNodeFactory(false)).putObject("{}"), ClientId.of("#1")) .asProtocolSpecification(); assertThat(asProtocolSpecification).hasSize(3); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
