geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1818654 [2/6] - in /geronimo/specs/trunk/geronimo-jaxrs_2.1_spec: ./ src/main/java/javax/ws/rs/ src/main/java/javax/ws/rs/client/ src/main/java/javax/ws/rs/container/ src/main/java/javax/ws/rs/core/ src/main/java/javax/ws/rs/ext/ src/main/...
Date Tue, 19 Dec 2017 11:39:15 GMT
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotSupportedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotSupportedException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotSupportedException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotSupportedException.java Tue Dec 19 11:39:13 2017
@@ -1,69 +1,60 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import javax.ws.rs.core.Response;
-
-
-public class NotSupportedException extends ClientErrorException {
-
-    private static final long serialVersionUID = -8286622745725405656L;
-
-
-    public NotSupportedException() {
-        super(Response.Status.UNSUPPORTED_MEDIA_TYPE);
-    }
-
-
-    public NotSupportedException(String message) {
-        super(message, Response.Status.UNSUPPORTED_MEDIA_TYPE);
-    }
-
-
-    public NotSupportedException(Response response) {
-        super(validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE));
-    }
-
-
-    public NotSupportedException(String message, Response response) {
-        super(message, validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE));
-    }
-
-
-    public NotSupportedException(Throwable cause) {
-        super(Response.Status.UNSUPPORTED_MEDIA_TYPE, cause);
-    }
-
-
-    public NotSupportedException(String message, Throwable cause) {
-        super(message, Response.Status.UNSUPPORTED_MEDIA_TYPE, cause);
-    }
-
-
-    public NotSupportedException(Response response, Throwable cause) {
-        super(validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE), cause);
-    }
-
-
-    public NotSupportedException(String message, Response response, Throwable cause) {
-        super(message, validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE), cause);
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import javax.ws.rs.core.Response;
+
+public class NotSupportedException extends ClientErrorException {
+
+    private static final long serialVersionUID = -8286622745725405656L;
+
+    public NotSupportedException() {
+        super(Response.Status.UNSUPPORTED_MEDIA_TYPE);
+    }
+
+    public NotSupportedException(String message) {
+        super(message, Response.Status.UNSUPPORTED_MEDIA_TYPE);
+    }
+
+    public NotSupportedException(Response response) {
+        super(validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE));
+    }
+
+    public NotSupportedException(String message, Response response) {
+        super(message, validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE));
+    }
+
+    public NotSupportedException(Throwable cause) {
+        super(Response.Status.UNSUPPORTED_MEDIA_TYPE, cause);
+    }
+
+    public NotSupportedException(String message, Throwable cause) {
+        super(message, Response.Status.UNSUPPORTED_MEDIA_TYPE, cause);
+    }
+
+    public NotSupportedException(Response response, Throwable cause) {
+        super(validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE), cause);
+    }
+
+    public NotSupportedException(String message, Response response, Throwable cause) {
+        super(message, validate(response, Response.Status.UNSUPPORTED_MEDIA_TYPE), cause);
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/OPTIONS.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/OPTIONS.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/OPTIONS.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/OPTIONS.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,19 +17,18 @@
  * limitations under the License.
  * #L%
  */
-
-package javax.ws.rs;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod(HttpMethod.OPTIONS)
-@Documented
-public @interface OPTIONS {
-}
+
+package javax.ws.rs;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod(HttpMethod.OPTIONS)
+@Documented
+public @interface OPTIONS {
+}

Added: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PATCH.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PATCH.java?rev=1818654&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PATCH.java (added)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PATCH.java Tue Dec 19 11:39:13 2017
@@ -0,0 +1,34 @@
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod(HttpMethod.PATCH)
+@Documented
+public @interface PATCH {
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/POST.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/POST.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/POST.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/POST.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,19 +17,18 @@
  * limitations under the License.
  * #L%
  */
-
-package javax.ws.rs;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod(HttpMethod.POST)
-@Documented
-public @interface POST {
-}
+
+package javax.ws.rs;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod(HttpMethod.POST)
+@Documented
+public @interface POST {
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PUT.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PUT.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PUT.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PUT.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,19 +17,18 @@
  * limitations under the License.
  * #L%
  */
-
-package javax.ws.rs;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod(HttpMethod.PUT)
-@Documented
-public @interface PUT {
-}
+
+package javax.ws.rs;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod(HttpMethod.PUT)
+@Documented
+public @interface PUT {
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Path.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Path.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Path.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Path.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,12 +26,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Path {
 
-
     String value();
 }

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PathParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PathParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PathParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PathParam.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,12 +26,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
-@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface PathParam {
 
-
     String value();
 }

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Priorities.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Priorities.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Priorities.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Priorities.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,14 +20,12 @@
 
 package javax.ws.rs;
 
-
 public final class Priorities {
 
     private Priorities() {
-
+        // prevents construction
     }
 
-
     public static final int AUTHENTICATION = 1000;
 
     public static final int AUTHORIZATION = 2000;

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ProcessingException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ProcessingException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ProcessingException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ProcessingException.java Tue Dec 19 11:39:13 2017
@@ -1,42 +1,38 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-
-public class ProcessingException extends RuntimeException {
-
-    private static final long serialVersionUID = -4232431597816056514L;
-
-
-    public ProcessingException(final Throwable cause) {
-        super(cause);
-    }
-
-
-    public ProcessingException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-
-
-    public ProcessingException(final String message) {
-        super(message);
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+public class ProcessingException extends RuntimeException {
+
+    private static final long serialVersionUID = -4232431597816056514L;
+
+    public ProcessingException(final Throwable cause) {
+        super(cause);
+    }
+
+    public ProcessingException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    public ProcessingException(final String message) {
+        super(message);
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Produces.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Produces.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Produces.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Produces.java Tue Dec 19 11:39:13 2017
@@ -1,39 +1,37 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Inherited
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Produces {
-
-
-    String[] value() default "*/*";
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Inherited
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Produces {
+
+    String[] value() default "*/*";
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/QueryParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/QueryParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/QueryParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/QueryParam.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,12 +26,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
-@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface QueryParam {
 
-
     String value();
 }

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RedirectionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RedirectionException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RedirectionException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RedirectionException.java Tue Dec 19 11:39:13 2017
@@ -1,65 +1,58 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import javax.ws.rs.core.Response;
-import java.net.URI;
-
-
-public class RedirectionException extends WebApplicationException {
-
-    private static final long serialVersionUID = -2584325408291098012L;
-
-
-    public RedirectionException(Response.Status status, URI location) {
-        super((Throwable) null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
-    }
-
-
-    public RedirectionException(String message, Response.Status status, URI location) {
-        super(message, null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
-    }
-
-
-    public RedirectionException(int status, URI location) {
-        super((Throwable) null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
-    }
-
-
-    public RedirectionException(String message, int status, URI location) {
-        super(message, null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
-    }
-
-
-    public RedirectionException(Response response) {
-        super((Throwable) null, validate(response, Response.Status.Family.REDIRECTION));
-    }
-
-
-    public RedirectionException(String message, Response response) {
-        super(message, null, validate(response, Response.Status.Family.REDIRECTION));
-    }
-
-
-    public URI getLocation() {
-        return getResponse().getLocation();
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import java.net.URI;
+
+import javax.ws.rs.core.Response;
+
+public class RedirectionException extends WebApplicationException {
+
+    private static final long serialVersionUID = -2584325408291098012L;
+
+    public RedirectionException(Response.Status status, URI location) {
+        super((Throwable) null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
+    }
+
+    public RedirectionException(String message, Response.Status status, URI location) {
+        super(message, null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
+    }
+
+    public RedirectionException(int status, URI location) {
+        super((Throwable) null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
+    }
+
+    public RedirectionException(String message, int status, URI location) {
+        super(message, null, validate(Response.status(status).location(location).build(), Response.Status.Family.REDIRECTION));
+    }
+
+    public RedirectionException(Response response) {
+        super((Throwable) null, validate(response, Response.Status.Family.REDIRECTION));
+    }
+
+    public RedirectionException(String message, Response response) {
+        super(message, null, validate(response, Response.Status.Family.REDIRECTION));
+    }
+
+    public URI getLocation() {
+        return getResponse().getLocation();
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RuntimeType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RuntimeType.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RuntimeType.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RuntimeType.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,10 +20,7 @@
 
 package javax.ws.rs;
 
-
 public enum RuntimeType {
-
     CLIENT,
-
     SERVER
 }

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServerErrorException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServerErrorException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServerErrorException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServerErrorException.java Tue Dec 19 11:39:13 2017
@@ -1,89 +1,76 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import javax.ws.rs.core.Response;
-
-
-public class ServerErrorException extends WebApplicationException {
-
-    private static final long serialVersionUID = 4730895276505569556L;
-
-
-    public ServerErrorException(Response.Status status) {
-        super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, Response.Status status) {
-        super(message, null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(int status) {
-        super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, int status) {
-        super(message, null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(Response response) {
-        super((Throwable) null, validate(response, Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, Response response) {
-        super(message, null, validate(response, Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(Response.Status status, Throwable cause) {
-        super(cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, Response.Status status, Throwable cause) {
-        super(message, cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(int status, Throwable cause) {
-        super(cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, int status, Throwable cause) {
-        super(message, cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(Response response, Throwable cause) {
-        super(cause, validate(response, Response.Status.Family.SERVER_ERROR));
-    }
-
-
-    public ServerErrorException(String message, Response response, Throwable cause) {
-        super(message, cause, validate(response, Response.Status.Family.SERVER_ERROR));
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import javax.ws.rs.core.Response;
+
+public class ServerErrorException extends WebApplicationException {
+
+    private static final long serialVersionUID = 4730895276505569556L;
+
+    public ServerErrorException(Response.Status status) {
+        super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, Response.Status status) {
+        super(message, null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(int status) {
+        super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, int status) {
+        super(message, null, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(Response response) {
+        super((Throwable) null, validate(response, Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, Response response) {
+        super(message, null, validate(response, Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(Response.Status status, Throwable cause) {
+        super(cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, Response.Status status, Throwable cause) {
+        super(message, cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(int status, Throwable cause) {
+        super(cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, int status, Throwable cause) {
+        super(message, cause, validate(Response.status(status).build(), Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(Response response, Throwable cause) {
+        super(cause, validate(response, Response.Status.Family.SERVER_ERROR));
+    }
+
+    public ServerErrorException(String message, Response response, Throwable cause) {
+        super(message, cause, validate(response, Response.Status.Family.SERVER_ERROR));
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServiceUnavailableException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServiceUnavailableException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServiceUnavailableException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServiceUnavailableException.java Tue Dec 19 11:39:13 2017
@@ -1,127 +1,111 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.RuntimeDelegate;
-import java.util.Date;
-
-import static javax.ws.rs.core.HttpHeaders.RETRY_AFTER;
-import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
-
-
-public class ServiceUnavailableException extends ServerErrorException {
-
-    private static final long serialVersionUID = 3821068205617492633L;
-
-
-    public ServiceUnavailableException() {
-        super(Response.status(SERVICE_UNAVAILABLE).build());
-    }
-
-
-    public ServiceUnavailableException(String message) {
-        super(message, Response.status(SERVICE_UNAVAILABLE).build());
-    }
-
-
-    public ServiceUnavailableException(Long retryAfter) {
-        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
-    }
-
-
-    public ServiceUnavailableException(String message, Long retryAfter) {
-        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
-    }
-
-
-    public ServiceUnavailableException(Date retryAfter) {
-        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
-    }
-
-
-    public ServiceUnavailableException(String message, Date retryAfter) {
-        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
-    }
-
-
-    public ServiceUnavailableException(Response response) {
-        super(validate(response, SERVICE_UNAVAILABLE));
-    }
-
-
-    public ServiceUnavailableException(String message, Response response) {
-        super(message, validate(response, SERVICE_UNAVAILABLE));
-    }
-
-
-    public ServiceUnavailableException(Date retryAfter, Throwable cause) {
-        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
-    }
-
-
-    public ServiceUnavailableException(String message, Date retryAfter, Throwable cause) {
-        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
-    }
-
-
-    public ServiceUnavailableException(Long retryAfter, Throwable cause) {
-        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
-    }
-
-
-    public ServiceUnavailableException(String message, Long retryAfter, Throwable cause) {
-        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
-    }
-
-
-    public ServiceUnavailableException(Response response, Throwable cause) {
-        super(validate(response, SERVICE_UNAVAILABLE), cause);
-    }
-
-
-    public ServiceUnavailableException(String message, Response response, Throwable cause) {
-        super(message, validate(response, SERVICE_UNAVAILABLE), cause);
-    }
-
-
-    public boolean hasRetryAfter() {
-        return getResponse().getHeaders().containsKey(RETRY_AFTER);
-    }
-
-
-    public Date getRetryTime(final Date requestTime) {
-        final String value = getResponse().getHeaderString(RETRY_AFTER);
-        if (value == null) {
-            return null;
-        }
-
-        try {
-            Long interval = Long.parseLong(value);
-            return new Date(requestTime.getTime() + interval * 1000);
-        } catch (NumberFormatException ex) {
-
-        }
-
-        final RuntimeDelegate.HeaderDelegate<Date> dateDelegate = RuntimeDelegate.getInstance().createHeaderDelegate(Date.class);
-        return dateDelegate.fromString(value);
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import static javax.ws.rs.core.HttpHeaders.RETRY_AFTER;
+import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
+
+import java.util.Date;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+public class ServiceUnavailableException extends ServerErrorException {
+
+    private static final long serialVersionUID = 3821068205617492633L;
+
+    public ServiceUnavailableException() {
+        super(Response.status(SERVICE_UNAVAILABLE).build());
+    }
+
+    public ServiceUnavailableException(String message) {
+        super(message, Response.status(SERVICE_UNAVAILABLE).build());
+    }
+
+    public ServiceUnavailableException(Long retryAfter) {
+        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
+    }
+
+    public ServiceUnavailableException(String message, Long retryAfter) {
+        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
+    }
+
+    public ServiceUnavailableException(Date retryAfter) {
+        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
+    }
+
+    public ServiceUnavailableException(String message, Date retryAfter) {
+        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build());
+    }
+
+    public ServiceUnavailableException(Response response) {
+        super(validate(response, SERVICE_UNAVAILABLE));
+    }
+
+    public ServiceUnavailableException(String message, Response response) {
+        super(message, validate(response, SERVICE_UNAVAILABLE));
+    }
+
+    public ServiceUnavailableException(Date retryAfter, Throwable cause) {
+        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
+    }
+
+    public ServiceUnavailableException(String message, Date retryAfter, Throwable cause) {
+        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
+    }
+
+    public ServiceUnavailableException(Long retryAfter, Throwable cause) {
+        super(Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
+    }
+
+    public ServiceUnavailableException(String message, Long retryAfter, Throwable cause) {
+        super(message, Response.status(SERVICE_UNAVAILABLE).header(RETRY_AFTER, retryAfter).build(), cause);
+    }
+
+    public ServiceUnavailableException(Response response, Throwable cause) {
+        super(validate(response, SERVICE_UNAVAILABLE), cause);
+    }
+
+    public ServiceUnavailableException(String message, Response response, Throwable cause) {
+        super(message, validate(response, SERVICE_UNAVAILABLE), cause);
+    }
+
+    public boolean hasRetryAfter() {
+        return getResponse().getHeaders().containsKey(RETRY_AFTER);
+    }
+
+    public Date getRetryTime(final Date requestTime) {
+        final String value = getResponse().getHeaderString(RETRY_AFTER);
+        if (value == null) {
+            return null;
+        }
+
+        try {
+            Long interval = Long.parseLong(value);
+            return new Date(requestTime.getTime() + interval * 1000);
+        } catch (NumberFormatException ex) {
+            // not an decimal value; ignoring exception and parsing as date
+        }
+
+        final RuntimeDelegate.HeaderDelegate<Date> dateDelegate = RuntimeDelegate.getInstance().createHeaderDelegate(Date.class);
+        return dateDelegate.fromString(value);
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/WebApplicationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/WebApplicationException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/WebApplicationException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/WebApplicationException.java Tue Dec 19 11:39:13 2017
@@ -1,146 +1,131 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs;
-
-import javax.ws.rs.core.Response;
-
-
-public class WebApplicationException extends RuntimeException {
-
-    private static final long serialVersionUID = 8273970399584007146L;
-    private final Response response;
-
-
-    public WebApplicationException() {
-        this((Throwable) null, Response.Status.INTERNAL_SERVER_ERROR);
-    }
-
-
-    public WebApplicationException(String message) {
-        this(message, null, Response.Status.INTERNAL_SERVER_ERROR);
-    }
-
-
-    public WebApplicationException(final Response response) {
-        this((Throwable) null, response);
-    }
-
-
-    public WebApplicationException(final String message, final Response response) {
-        this(message, null, response);
-    }
-
-
-    public WebApplicationException(final int status) {
-        this((Throwable) null, status);
-    }
-
-
-    public WebApplicationException(final String message, final int status) {
-        this(message, null, status);
-    }
-
-
-    public WebApplicationException(final Response.Status status) {
-        this((Throwable) null, status);
-    }
-
-
-    public WebApplicationException(final String message, final Response.Status status) {
-        this(message, null, status);
-    }
-
-
-    public WebApplicationException(final Throwable cause) {
-        this(cause, Response.Status.INTERNAL_SERVER_ERROR);
-    }
-
-
-    public WebApplicationException(final String message, final Throwable cause) {
-        this(message, cause, Response.Status.INTERNAL_SERVER_ERROR);
-    }
-
-
-    public WebApplicationException(final Throwable cause, final Response response) {
-        this(computeExceptionMessage(response), cause, response);
-    }
-
-
-    public WebApplicationException(final String message, final Throwable cause, final Response response) {
-        super(message, cause);
-        if (response == null) {
-            this.response = Response.serverError().build();
-        } else {
-            this.response = response;
-        }
-    }
-
-    private static String computeExceptionMessage(Response response) {
-        final Response.StatusType statusInfo;
-        if (response != null) {
-            statusInfo = response.getStatusInfo();
-        } else {
-            statusInfo = Response.Status.INTERNAL_SERVER_ERROR;
-        }
-        return "HTTP " + statusInfo.getStatusCode() + ' ' + statusInfo.getReasonPhrase();
-    }
-
-
-    public WebApplicationException(final Throwable cause, final int status) {
-        this(cause, Response.status(status).build());
-    }
-
-
-    public WebApplicationException(final String message, final Throwable cause, final int status) {
-        this(message, cause, Response.status(status).build());
-    }
-
-
-    public WebApplicationException(final Throwable cause, final Response.Status status) throws IllegalArgumentException {
-        this(cause, Response.status(status).build());
-    }
-
-
-    public WebApplicationException(final String message, final Throwable cause, final Response.Status status) throws IllegalArgumentException {
-        this(message, cause, Response.status(status).build());
-    }
-
-
-    public Response getResponse() {
-        return response;
-    }
-
-
-    static Response validate(final Response response, Response.Status expectedStatus) {
-        if (expectedStatus.getStatusCode() != response.getStatus()) {
-            throw new IllegalArgumentException(String.format("Invalid response status code. Expected [%d], was [%d].", expectedStatus.getStatusCode(), response.getStatus()));
-        }
-        return response;
-    }
-
-
-    static Response validate(final Response response, Response.Status.Family expectedStatusFamily) {
-        if (response.getStatusInfo().getFamily() != expectedStatusFamily) {
-            throw new IllegalArgumentException(String.format("Status code of the supplied response [%d] is not from the required status code family \"%s\".", response.getStatus(), expectedStatusFamily));
-        }
-        return response;
-    }
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs;
+
+import javax.ws.rs.core.Response;
+
+public class WebApplicationException extends RuntimeException {
+
+    private static final long serialVersionUID = 8273970399584007146L;
+
+    private final Response response;
+
+    public WebApplicationException() {
+        this((Throwable) null, Response.Status.INTERNAL_SERVER_ERROR);
+    }
+
+    public WebApplicationException(String message) {
+        this(message, null, Response.Status.INTERNAL_SERVER_ERROR);
+    }
+
+    public WebApplicationException(final Response response) {
+        this((Throwable) null, response);
+    }
+
+    public WebApplicationException(final String message, final Response response) {
+        this(message, null, response);
+    }
+
+    public WebApplicationException(final int status) {
+        this((Throwable) null, status);
+    }
+
+    public WebApplicationException(final String message, final int status) {
+        this(message, null, status);
+    }
+
+    public WebApplicationException(final Response.Status status) {
+        this((Throwable) null, status);
+    }
+
+    public WebApplicationException(final String message, final Response.Status status) {
+        this(message, null, status);
+    }
+
+    public WebApplicationException(final Throwable cause) {
+        this(cause, Response.Status.INTERNAL_SERVER_ERROR);
+    }
+
+    public WebApplicationException(final String message, final Throwable cause) {
+        this(message, cause, Response.Status.INTERNAL_SERVER_ERROR);
+    }
+
+    public WebApplicationException(final Throwable cause, final Response response) {
+        this(computeExceptionMessage(response), cause, response);
+    }
+
+    public WebApplicationException(final String message, final Throwable cause, final Response response) {
+        super(message, cause);
+        if (response == null) {
+            this.response = Response.serverError().build();
+        } else {
+            this.response = response;
+        }
+    }
+
+    private static String computeExceptionMessage(Response response) {
+        final Response.StatusType statusInfo;
+        if (response != null) {
+            statusInfo = response.getStatusInfo();
+        } else {
+            statusInfo = Response.Status.INTERNAL_SERVER_ERROR;
+        }
+        return "HTTP " + statusInfo.getStatusCode() + ' ' + statusInfo.getReasonPhrase();
+    }
+
+    public WebApplicationException(final Throwable cause, final int status) {
+        this(cause, Response.status(status).build());
+    }
+
+    public WebApplicationException(final String message, final Throwable cause, final int status) {
+        this(message, cause, Response.status(status).build());
+    }
+
+    public WebApplicationException(final Throwable cause, final Response.Status status) throws IllegalArgumentException {
+        this(cause, Response.status(status).build());
+    }
+
+    public WebApplicationException(final String message, final Throwable cause, final Response.Status status)
+            throws IllegalArgumentException {
+        this(message, cause, Response.status(status).build());
+    }
+
+    public Response getResponse() {
+        return response;
+    }
+
+    static Response validate(final Response response, Response.Status expectedStatus) {
+        if (expectedStatus.getStatusCode() != response.getStatus()) {
+            throw new IllegalArgumentException(String.format("Invalid response status code. Expected [%d], was [%d].",
+                    expectedStatus.getStatusCode(), response.getStatus()));
+        }
+        return response;
+    }
+
+    static Response validate(final Response response, Response.Status.Family expectedStatusFamily) {
+        if (response.getStatusInfo().getFamily() != expectedStatusFamily) {
+            throw new IllegalArgumentException(
+                    String.format("Status code of the supplied response [%d] is not from the required status code family \"%s\".",
+                            response.getStatus(), expectedStatusFamily));
+        }
+        return response;
+    }
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/AsyncInvoker.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/AsyncInvoker.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/AsyncInvoker.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/AsyncInvoker.java Tue Dec 19 11:39:13 2017
@@ -1,131 +1,113 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs.client;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.util.concurrent.Future;
-
-
-public interface AsyncInvoker {
-
-
-    Future<Response> get();
-
-
-    <T> Future<T> get(Class<T> responseType);
-
-
-    <T> Future<T> get(GenericType<T> responseType);
-
-
-    <T> Future<T> get(InvocationCallback<T> callback);
-
-
-    Future<Response> put(Entity<?> entity);
-
-
-    <T> Future<T> put(Entity<?> entity, Class<T> responseType);
-
-
-    <T> Future<T> put(Entity<?> entity, GenericType<T> responseType);
-
-
-    <T> Future<T> put(Entity<?> entity, InvocationCallback<T> callback);
-
-
-    Future<Response> post(Entity<?> entity);
-
-
-    <T> Future<T> post(Entity<?> entity, Class<T> responseType);
-
-
-    <T> Future<T> post(Entity<?> entity, GenericType<T> responseType);
-
-
-    <T> Future<T> post(Entity<?> entity, InvocationCallback<T> callback);
-
-
-    Future<Response> delete();
-
-
-    <T> Future<T> delete(Class<T> responseType);
-
-
-    <T> Future<T> delete(GenericType<T> responseType);
-
-
-    <T> Future<T> delete(InvocationCallback<T> callback);
-
-
-    Future<Response> head();
-
-
-    Future<Response> head(InvocationCallback<Response> callback);
-
-
-    Future<Response> options();
-
-
-    <T> Future<T> options(Class<T> responseType);
-
-
-    <T> Future<T> options(GenericType<T> responseType);
-
-
-    <T> Future<T> options(InvocationCallback<T> callback);
-
-
-    Future<Response> trace();
-
-
-    <T> Future<T> trace(Class<T> responseType);
-
-
-    <T> Future<T> trace(GenericType<T> responseType);
-
-
-    <T> Future<T> trace(InvocationCallback<T> callback);
-
-
-    Future<Response> method(String name);
-
-
-    <T> Future<T> method(String name, Class<T> responseType);
-
-
-    <T> Future<T> method(String name, GenericType<T> responseType);
-
-
-    <T> Future<T> method(String name, InvocationCallback<T> callback);
-
-
-    Future<Response> method(String name, Entity<?> entity);
-
-
-    <T> Future<T> method(String name, Entity<?> entity, Class<T> responseType);
-
-
-    <T> Future<T> method(String name, Entity<?> entity, GenericType<T> responseType);
-
-
-    <T> Future<T> method(String name, Entity<?> entity, InvocationCallback<T> callback);
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs.client;
+
+import java.util.concurrent.Future;
+
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
+
+public interface AsyncInvoker {
+
+    // GET
+
+    Future<Response> get();
+
+    <T> Future<T> get(Class<T> responseType);
+
+    <T> Future<T> get(GenericType<T> responseType);
+
+    <T> Future<T> get(InvocationCallback<T> callback);
+
+    // PUT
+
+    Future<Response> put(Entity<?> entity);
+
+    <T> Future<T> put(Entity<?> entity, Class<T> responseType);
+
+    <T> Future<T> put(Entity<?> entity, GenericType<T> responseType);
+
+    <T> Future<T> put(Entity<?> entity, InvocationCallback<T> callback);
+
+    // POST
+
+    Future<Response> post(Entity<?> entity);
+
+    <T> Future<T> post(Entity<?> entity, Class<T> responseType);
+
+    <T> Future<T> post(Entity<?> entity, GenericType<T> responseType);
+
+    <T> Future<T> post(Entity<?> entity, InvocationCallback<T> callback);
+
+    // DELETE
+
+    Future<Response> delete();
+
+    <T> Future<T> delete(Class<T> responseType);
+
+    <T> Future<T> delete(GenericType<T> responseType);
+
+    <T> Future<T> delete(InvocationCallback<T> callback);
+
+    // HEAD
+
+    Future<Response> head();
+
+    Future<Response> head(InvocationCallback<Response> callback);
+
+    // OPTIONS
+
+    Future<Response> options();
+
+    <T> Future<T> options(Class<T> responseType);
+
+    <T> Future<T> options(GenericType<T> responseType);
+
+    <T> Future<T> options(InvocationCallback<T> callback);
+
+    // TRACE
+
+    Future<Response> trace();
+
+    <T> Future<T> trace(Class<T> responseType);
+
+    <T> Future<T> trace(GenericType<T> responseType);
+
+    <T> Future<T> trace(InvocationCallback<T> callback);
+
+    // OTHERS
+
+    Future<Response> method(String name);
+
+    <T> Future<T> method(String name, Class<T> responseType);
+
+    <T> Future<T> method(String name, GenericType<T> responseType);
+
+    <T> Future<T> method(String name, InvocationCallback<T> callback);
+
+    Future<Response> method(String name, Entity<?> entity);
+
+    <T> Future<T> method(String name, Entity<?> entity, Class<T> responseType);
+
+    <T> Future<T> method(String name, Entity<?> entity, GenericType<T> responseType);
+
+    <T> Future<T> method(String name, Entity<?> entity, InvocationCallback<T> callback);
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Client.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Client.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Client.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Client.java Tue Dec 19 11:39:13 2017
@@ -1,56 +1,48 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs.client;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.core.Configurable;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.UriBuilder;
-import java.net.URI;
-
-
-public interface Client extends Configurable<Client> {
-
-
-    void close();
-
-
-    WebTarget target(String uri);
-
-
-    WebTarget target(URI uri);
-
-
-    WebTarget target(UriBuilder uriBuilder);
-
-
-    WebTarget target(Link link);
-
-
-    Invocation.Builder invocation(Link link);
-
-
-    SSLContext getSslContext();
-
-
-    HostnameVerifier getHostnameVerifier();
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs.client;
+
+import java.net.URI;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.UriBuilder;
+
+public interface Client extends Configurable<Client> {
+
+    public void close();
+
+    public WebTarget target(String uri);
+
+    public WebTarget target(URI uri);
+
+    public WebTarget target(UriBuilder uriBuilder);
+
+    public WebTarget target(Link link);
+
+    public Invocation.Builder invocation(Link link);
+
+    public SSLContext getSslContext();
+
+    public HostnameVerifier getHostnameVerifier();
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientBuilder.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientBuilder.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientBuilder.java Tue Dec 19 11:39:13 2017
@@ -1,82 +1,85 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs.client;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.core.Configurable;
-import javax.ws.rs.core.Configuration;
-import java.security.KeyStore;
-
-
-public abstract class ClientBuilder implements Configurable<ClientBuilder> {
-    public static final String JAXRS_DEFAULT_CLIENT_BUILDER_PROPERTY = "javax.ws.rs.client.ClientBuilder";
-
-    protected ClientBuilder() {
-        // no-op
-    }
-
-
-    public static ClientBuilder newBuilder() {
-        try {
-            final Object delegate = ClientFinder.find(JAXRS_DEFAULT_CLIENT_BUILDER_PROPERTY);
-            if (!ClientBuilder.class.isInstance(delegate)) {
-                throw new LinkageError(delegate + " not an instance of ClientBuilder");
-            }
-            return ClientBuilder.class.cast(delegate);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-
-    public static Client newClient() {
-        return newBuilder().build();
-    }
-
-
-    public static Client newClient(final Configuration configuration) {
-        return newBuilder().withConfig(configuration).build();
-    }
-
-
-    public abstract ClientBuilder withConfig(Configuration config);
-
-
-    public abstract ClientBuilder sslContext(final SSLContext sslContext);
-
-
-    public abstract ClientBuilder keyStore(final KeyStore keyStore, final char[] password);
-
-
-    public ClientBuilder keyStore(final KeyStore keyStore, final String password) {
-        return keyStore(keyStore, password.toCharArray());
-    }
-
-
-    public abstract ClientBuilder trustStore(final KeyStore trustStore);
-
-
-    public abstract ClientBuilder hostnameVerifier(final HostnameVerifier verifier);
-
-
-    public abstract Client build();
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs.client;
+
+import java.security.KeyStore;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Configuration;
+
+public abstract class ClientBuilder implements Configurable<ClientBuilder> {
+
+    public static final String JAXRS_DEFAULT_CLIENT_BUILDER_PROPERTY = "javax.ws.rs.client.ClientBuilder";
+
+    protected ClientBuilder() {
+        // no-op
+    }
+
+
+    public static ClientBuilder newBuilder() {
+        try {
+            final Object delegate = ClientFinder.find(JAXRS_DEFAULT_CLIENT_BUILDER_PROPERTY);
+            if (!ClientBuilder.class.isInstance(delegate)) {
+                throw new LinkageError(delegate + " not an instance of ClientBuilder");
+            }
+            return ClientBuilder.class.cast(delegate);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static Client newClient() {
+        return newBuilder().build();
+    }
+
+    public static Client newClient(final Configuration configuration) {
+        return newBuilder().withConfig(configuration).build();
+    }
+
+    public abstract ClientBuilder withConfig(Configuration config);
+
+    public abstract ClientBuilder sslContext(final SSLContext sslContext);
+
+    public abstract ClientBuilder keyStore(final KeyStore keyStore, final char[] password);
+
+    public ClientBuilder keyStore(final KeyStore keyStore, final String password) {
+        return keyStore(keyStore, password.toCharArray());
+    }
+
+    public abstract ClientBuilder trustStore(final KeyStore trustStore);
+
+    public abstract ClientBuilder hostnameVerifier(final HostnameVerifier verifier);
+
+    public abstract ClientBuilder executorService(final ExecutorService executorService);
+
+    public abstract ClientBuilder scheduledExecutorService(final ScheduledExecutorService scheduledExecutorService);
+
+    public abstract ClientBuilder connectTimeout(long timeout, TimeUnit unit);
+
+    public abstract ClientBuilder readTimeout(long timeout, TimeUnit unit);
+
+    public abstract Client build();
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java Tue Dec 19 11:39:13 2017
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,6 @@
 
 package javax.ws.rs.client;
 
-import org.apache.geronimo.osgi.locator.ProviderLocator;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,10 +28,15 @@ import java.io.InputStreamReader;
 import java.util.Properties;
 import java.util.logging.Logger;
 
+import org.apache.geronimo.osgi.locator.ProviderLocator;
+
 // pretty much the RI logic to go in java home too
 final class ClientFinder {
+
     private static final Logger LOGGER = Logger.getLogger(ClientFinder.class.getName());
+
     private static final String FACTORY_ID = ClientBuilder.class.getName();
+
     private static final String SERVICE_ID = "META-INF/services/" + FACTORY_ID;
 
     static Object find(final String defaultClazz) throws ClassNotFoundException {
@@ -65,7 +68,8 @@ final class ClientFinder {
         }
 
         try {
-            final File f = new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "jaxrs.properties");
+            final File f = new File(
+                    System.getProperty("java.home") + File.separator + "lib" + File.separator + "jaxrs.properties");
             if (f.exists()) {
                 final Properties props = new Properties();
                 props.load(new FileInputStream(f));

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestContext.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestContext.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestContext.java Tue Dec 19 11:39:13 2017
@@ -1,127 +1,104 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs.client;
-
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-
-public interface ClientRequestContext {
-
-
-    Object getProperty(String name);
-
-
-    Collection<String> getPropertyNames();
-
-
-    void setProperty(String name, Object object);
-
-
-    void removeProperty(String name);
-
-
-    URI getUri();
-
-
-    void setUri(URI uri);
-
-
-    String getMethod();
-
-
-    void setMethod(String method);
-
-
-    MultivaluedMap<String, Object> getHeaders();
-
-
-    abstract MultivaluedMap<String, String> getStringHeaders();
-
-
-    String getHeaderString(String name);
-
-
-    Date getDate();
-
-
-    Locale getLanguage();
-
-
-    MediaType getMediaType();
-
-
-    List<MediaType> getAcceptableMediaTypes();
-
-
-    List<Locale> getAcceptableLanguages();
-
-
-    Map<String, Cookie> getCookies();
-
-
-    boolean hasEntity();
-
-
-    Object getEntity();
-
-
-    Class<?> getEntityClass();
-
-
-    Type getEntityType();
-
-
-    void setEntity(final Object entity);
-
-
-    void setEntity(final Object entity, final Annotation[] annotations, final MediaType mediaType);
-
-
-    Annotation[] getEntityAnnotations();
-
-
-    OutputStream getEntityStream();
-
-
-    void setEntityStream(OutputStream outputStream);
-
-
-    Client getClient();
-
-
-    Configuration getConfiguration();
-
-
-    void abortWith(Response response);
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs.client;
+
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+public interface ClientRequestContext {
+
+    public Object getProperty(String name);
+
+
+    public Collection<String> getPropertyNames();
+
+
+    public void setProperty(String name, Object object);
+
+    public void removeProperty(String name);
+
+    public URI getUri();
+
+    public void setUri(URI uri);
+
+    public String getMethod();
+
+    public void setMethod(String method);
+
+    public MultivaluedMap<String, Object> getHeaders();
+
+    public abstract MultivaluedMap<String, String> getStringHeaders();
+
+    public String getHeaderString(String name);
+
+    public Date getDate();
+
+    public Locale getLanguage();
+
+    public MediaType getMediaType();
+
+    public List<MediaType> getAcceptableMediaTypes();
+
+    public List<Locale> getAcceptableLanguages();
+
+    public Map<String, Cookie> getCookies();
+
+    public boolean hasEntity();
+
+    public Object getEntity();
+
+    public Class<?> getEntityClass();
+
+    public Type getEntityType();
+
+    public void setEntity(final Object entity);
+
+    public void setEntity(
+            final Object entity,
+            final Annotation[] annotations,
+            final MediaType mediaType);
+
+    public Annotation[] getEntityAnnotations();
+
+
+    public OutputStream getEntityStream();
+
+    public void setEntityStream(OutputStream outputStream);
+
+    public Client getClient();
+
+    public Configuration getConfiguration();
+
+    public void abortWith(Response response);
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestFilter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestFilter.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestFilter.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestFilter.java Tue Dec 19 11:39:13 2017
@@ -22,9 +22,7 @@ package javax.ws.rs.client;
 
 import java.io.IOException;
 
-
 public interface ClientRequestFilter {
 
-
-    void filter(ClientRequestContext requestContext) throws IOException;
+    public void filter(ClientRequestContext requestContext) throws IOException;
 }

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseContext.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseContext.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseContext.java Tue Dec 19 11:39:13 2017
@@ -1,104 +1,82 @@
-/*
- * #%L
- * Apache Geronimo JAX-RS Spec 2.0
- * %%
- * Copyright (C) 2003 - 2014 The Apache Software Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-package javax.ws.rs.client;
-
-import javax.ws.rs.core.EntityTag;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-
-public interface ClientResponseContext {
-
-
-    public int getStatus();
-
-
-    public void setStatus(int code);
-
-
-    public Response.StatusType getStatusInfo();
-
-
-    public void setStatusInfo(Response.StatusType statusInfo);
-
-
-    public MultivaluedMap<String, String> getHeaders();
-
-
-    public String getHeaderString(String name);
-
-
-    public Set<String> getAllowedMethods();
-
-
-    public Date getDate();
-
-
-    public Locale getLanguage();
-
-
-    public int getLength();
-
-
-    public MediaType getMediaType();
-
-
-    public Map<String, NewCookie> getCookies();
-
-
-    public EntityTag getEntityTag();
-
-
-    public Date getLastModified();
-
-
-    public URI getLocation();
-
-
-    public Set<Link> getLinks();
-
-
-    boolean hasLink(String relation);
-
-
-    public Link getLink(String relation);
-
-
-    public Link.Builder getLinkBuilder(String relation);
-
-
-    public boolean hasEntity();
-
-
-    public InputStream getEntityStream();
-
-
-    public void setEntityStream(InputStream input);
-}
+/*
+ * #%L
+ * Apache Geronimo JAX-RS Spec 2.0
+ * %%
+ * Copyright (C) 2003 - 2014 The Apache Software Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+package javax.ws.rs.client;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+
+public interface ClientResponseContext {
+
+    public int getStatus();
+
+    public void setStatus(int code);
+
+    public Response.StatusType getStatusInfo();
+
+    public void setStatusInfo(Response.StatusType statusInfo);
+
+    public MultivaluedMap<String, String> getHeaders();
+
+    public String getHeaderString(String name);
+
+    public Set<String> getAllowedMethods();
+
+    public Date getDate();
+
+    public Locale getLanguage();
+
+    public int getLength();
+
+    public MediaType getMediaType();
+
+    public Map<String, NewCookie> getCookies();
+
+    public EntityTag getEntityTag();
+
+    public Date getLastModified();
+
+    public URI getLocation();
+
+    public Set<Link> getLinks();
+
+    boolean hasLink(String relation);
+
+    public Link getLink(String relation);
+
+    public Link.Builder getLinkBuilder(String relation);
+
+    public boolean hasEntity();
+
+    public InputStream getEntityStream();
+
+    public void setEntityStream(InputStream input);
+}

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseFilter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseFilter.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseFilter.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseFilter.java Tue Dec 19 11:39:13 2017
@@ -22,9 +22,8 @@ package javax.ws.rs.client;
 
 import java.io.IOException;
 
-
 public interface ClientResponseFilter {
 
-
-    void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException;
+    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext)
+            throws IOException;
 }



Mime
View raw message