JAX-RS 2.1-m08

Change-Id: Id90b6049b1296cd4b4bfdd01cc882f9897121785

Author: pavelbucek

connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/MethodTest.java

@@ -164,7 +164,7 @@ public void testDeleteAsync() throws ExecutionException, InterruptedException {
 
     @Test
     public void testPatch() {
-        Response response = target(PATH).request().patch(Entity.entity("PATCH", MediaType.TEXT_PLAIN));
+        Response response = target(PATH).request().method("PATCH", Entity.entity("PATCH", MediaType.TEXT_PLAIN));
         assertEquals("PATCH", response.readEntity(String.class));
     }
 }

core-client/src/main/java/org/glassfish/jersey/client/AbstractRxInvoker.java

@@ -186,21 +186,6 @@ public <R> T trace(final GenericType<R> responseType) {
         return method("TRACE", responseType);
     }
 
-    @Override
-    public T patch(final Entity<?> entity) {
-        return method("PATCH", entity);
-    }
-
-    @Override
-    public <R> T patch(final Entity<?> entity, Class<R> responseType) {
-        return method("PATCH", entity, responseType);
-    }
-
-    @Override
-    public <R> T patch(final Entity<?> entity, GenericType<R> responseType) {
-        return method("PATCH", entity, responseType);
-    }
-
     @Override
     public T method(final String name) {
         return method(name, Response.class);

core-client/src/main/java/org/glassfish/jersey/client/JerseyClientBuilder.java

@@ -43,6 +43,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Configuration;
@@ -156,6 +157,26 @@ public ClientBuilder scheduledExecutorService(ScheduledExecutorService scheduled
         return this;
     }
 
+    @Override
+    public ClientBuilder connectTimeout(long timeout, TimeUnit unit) {
+        if (timeout < 0) {
+            throw new IllegalArgumentException("Negative timeout.");
+        }
+
+        this.property(ClientProperties.CONNECT_TIMEOUT, Math.toIntExact(unit.toMillis(timeout)));
+        return this;
+    }
+
+    @Override
+    public ClientBuilder readTimeout(long timeout, TimeUnit unit) {
+        if (timeout < 0) {
+            throw new IllegalArgumentException("Negative timeout.");
+        }
+
+        this.property(ClientProperties.READ_TIMEOUT, Math.toIntExact(unit.toMillis(timeout)));
+        return this;
+    }
+
     @Override
     public JerseyClient build() {
         if (sslContext != null) {

core-client/src/main/java/org/glassfish/jersey/client/JerseyInvocation.java

@@ -412,21 +412,6 @@ public <T> T trace(final GenericType<T> responseType) throws ProcessingException
             return method("TRACE", responseType);
         }
 
-        @Override
-        public Response patch(final Entity<?> entity) {
-            return method("PATCH", entity);
-        }
-
-        @Override
-        public <T> T patch(final Entity<?> entity, Class<T> responseType) {
-            return method("PATCH", entity, responseType);
-        }
-
-        @Override
-        public <T> T patch(final Entity<?> entity, GenericType<T> responseType) {
-            return method("PATCH", entity, responseType);
-        }
-
         @Override
         public Response method(final String name) throws ProcessingException {
             requestContext.setMethod(name);
@@ -690,27 +675,6 @@ public <T> Future<T> trace(final InvocationCallback<T> callback) {
             return method("TRACE", callback);
         }
 
-        @Override
-        public Future<Response> patch(final Entity<?> entity) {
-            return method("PATCH", entity);
-        }
-
-        @Override
-        public <T> Future<T> patch(final Entity<?> entity, Class<T> responseType) {
-            return method("PATCH", entity, responseType);
-
-        }
-
-        @Override
-        public <T> Future<T> patch(final Entity<?> entity, GenericType<T> responseType) {
-            return method("PATCH", entity, responseType);
-        }
-
-        @Override
-        public <T> Future<T> patch(final Entity<?> entity, InvocationCallback<T> callback) {
-            return method("PATCH", entity, callback);
-        }
-
         @Override
         public Future<Response> method(final String name) {
             builder.requestContext.setMethod(name);

core-client/src/test/java/org/glassfish/jersey/client/JerseyClientBuilderTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -43,6 +43,7 @@
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -56,7 +57,9 @@
 import javax.net.ssl.SSLContext;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
@@ -71,6 +74,9 @@
  */
 public class JerseyClientBuilderTest {
 
+    @Rule
+    public final ExpectedException exception = ExpectedException.none();
+
     private JerseyClientBuilder builder;
 
     @Before
@@ -224,4 +230,20 @@ public void _testCreateClientWithAnotherConfig(final boolean clientInFilter) thr
         assertThat(response.getStatus(), equalTo(200));
         assertThat(response.readEntity(String.class), equalTo("ok"));
     }
+
+    @Test
+    public void testNegativeConnectTimeout() {
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+
+        exception.expect(IllegalArgumentException.class);
+        clientBuilder.connectTimeout(-1, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testNegativeReadTimeout() {
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+
+        exception.expect(IllegalArgumentException.class);
+        clientBuilder.readTimeout(-1, TimeUnit.SECONDS);
+    }
 }

core-common/src/main/java/org/glassfish/jersey/message/internal/OutboundJaxrsResponse.java

@@ -406,6 +406,34 @@ public javax.ws.rs.core.Response.ResponseBuilder status(StatusType status) {
             return this;
         }
 
+        @Override
+        public ResponseBuilder status(int status, final String reasonPhrase) {
+            if (status < 100 || status > 599) {
+                throw new IllegalArgumentException("Response status must not be less than '100' or greater than '599'");
+            }
+
+            final Status.Family family = Status.Family.familyOf(status);
+
+            this.status = new StatusType() {
+                @Override
+                public int getStatusCode() {
+                    return status;
+                }
+
+                @Override
+                public Status.Family getFamily() {
+                    return family;
+                }
+
+                @Override
+                public String getReasonPhrase() {
+                    return reasonPhrase;
+                }
+            };
+
+            return this;
+        }
+
         @Override
         public javax.ws.rs.core.Response.ResponseBuilder status(int code) {
             this.status = Statuses.from(code);

core-common/src/test/java/org/glassfish/jersey/message/internal/ResponseTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -45,6 +45,7 @@
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.Response.StatusType;
 
+import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
@@ -55,13 +56,15 @@
  */
 public class ResponseTest {
 
+    @Test
     public void testDeclaredStatusCodes() {
         for (Status s : Status.values()) {
             StatusType _s = Response.status(s.getStatusCode()).build().getStatusInfo();
             assertSame(s, _s);
         }
     }
 
+    @Test
     public void testUndeclaredStatusCodes() {
         StatusType st = Response.status(199).build().getStatusInfo();
         assertNotNull(st);
@@ -93,4 +96,13 @@ public void testUndeclaredStatusCodes() {
         assertEquals("", st.getReasonPhrase());
         assertEquals(Family.SERVER_ERROR, st.getFamily());
     }
+
+    @Test
+    public void reasonPhraseTest() {
+        Response response = Response.status(123, "test").build();
+
+        assertNotNull(response);
+        assertEquals(123, response.getStatus());
+        assertEquals("test", response.getStatusInfo().getReasonPhrase());
+    }
 }

pom.xml

@@ -1872,7 +1872,7 @@
         <jsonb.api.version>1.0.0-M2</jsonb.api.version>
         <jsonb.ri.version>1.0.0-M2</jsonb.ri.version>
         <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
-        <jaxrs.api.impl.version>2.1-m07</jaxrs.api.impl.version>
+        <jaxrs.api.impl.version>2.1-m08</jaxrs.api.impl.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
         <jersey1.version>1.19.3</jersey1.version>
         <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>

tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/JaxRsTimeoutTest.java

@@ -0,0 +1,118 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.tests.e2e.client;
+
+import java.net.SocketTimeoutException;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.client.JerseyWebTarget;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Pavel Bucek (pavel.bucek at oracle.com)
+ */
+public class JaxRsTimeoutTest extends JerseyTest {
+
+    private final Client client =
+            ClientBuilder.newBuilder().readTimeout(2000, TimeUnit.MILLISECONDS).build();
+
+    @Path("/test")
+    public static class TimeoutResource {
+        @GET
+        public String get() {
+            return "GET";
+        }
+
+        @GET
+        @Path("timeout")
+        public String getTimeout() {
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            return "GET";
+        }
+    }
+
+    @Override
+    protected Application configure() {
+        return new ResourceConfig(TimeoutTest.TimeoutResource.class);
+    }
+
+    @Override
+    protected Client getClient() {
+        return client;
+    }
+
+    @Test
+    public void testFast() {
+        Response r = target("test").request().get();
+        assertEquals(200, r.getStatus());
+        assertEquals("GET", r.readEntity(String.class));
+    }
+
+    @Test
+    public void testSlow() {
+        try {
+            target("test/timeout").request().get();
+            fail("Timeout expected.");
+        } catch (ProcessingException e) {
+            if (!(e.getCause() instanceof SocketTimeoutException)) {
+                e.printStackTrace();
+                fail();
+            }
+        }
+    }
+}