You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rm...@apache.org on 2017/12/19 11:39:15 UTC
svn commit: r1818654 [1/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/...
Author: rmannibucau
Date: Tue Dec 19 11:39:13 2017
New Revision: 1818654
URL: http://svn.apache.org/viewvc?rev=1818654&view=rev
Log:
upgrading the spec to v2.1
Added:
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PATCH.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/CompletionStageRxInvoker.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/RxInvoker.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/RxInvokerProvider.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/InboundSseEvent.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/OutboundSseEvent.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/Sse.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/SseBroadcaster.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/SseEvent.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/SseEventSink.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/SseEventSource.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/sse/SseFinder.java
- copied, changed from r1818649, geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java
Removed:
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/package-info.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/package-info.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/package-info.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/package-info.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/package-info.java
Modified:
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ApplicationPath.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BadRequestException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BeanParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ClientErrorException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ConstrainedTo.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Consumes.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/CookieParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DELETE.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DefaultValue.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Encoded.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ForbiddenException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/FormParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/GET.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HEAD.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HeaderParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HttpMethod.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/InternalServerErrorException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/MatrixParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NameBinding.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAcceptableException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAllowedException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAuthorizedException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotFoundException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotSupportedException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/OPTIONS.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/POST.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PUT.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Path.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/PathParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Priorities.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ProcessingException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Produces.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/QueryParam.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RedirectionException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/RuntimeType.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServerErrorException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ServiceUnavailableException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/WebApplicationException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/AsyncInvoker.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Client.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientBuilder.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientFinder.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientRequestFilter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ClientResponseFilter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Entity.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/Invocation.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/InvocationCallback.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/ResponseProcessingException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/SyncInvoker.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/client/WebTarget.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/AsyncResponse.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/CompletionCallback.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ConnectionCallback.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ContainerRequestContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ContainerRequestFilter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ContainerResponseContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ContainerResponseFilter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/DynamicFeature.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/PreMatching.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ResourceContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/ResourceInfo.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/Suspended.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/container/TimeoutHandler.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/AbstractMultivaluedMap.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Application.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/CacheControl.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Configurable.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Configuration.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Context.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Cookie.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/EntityTag.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Feature.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/FeatureContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Form.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/GenericEntity.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/GenericType.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/HttpHeaders.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Link.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/MediaType.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/MultivaluedHashMap.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/MultivaluedMap.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/NewCookie.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/NoContentException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/PathSegment.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Request.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Response.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/SecurityContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/StreamingOutput.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/UriBuilder.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/UriBuilderException.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/UriInfo.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/core/Variant.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ContextResolver.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ExceptionMapper.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/InterceptorContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/MessageBodyReader.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/MessageBodyWriter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ParamConverter.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ParamConverterProvider.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/Provider.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/Providers.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ReaderInterceptor.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/ReaderInterceptorContext.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/RuntimeDelegate.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/RuntimeDelegateFinder.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/WriterInterceptor.java
geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ext/WriterInterceptorContext.java
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml Tue Dec 19 11:39:13 2017
@@ -24,8 +24,8 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java6-flava</artifactId>
- <version>2.2</version>
+ <artifactId>genesis-java7-flava</artifactId>
+ <version>2.3</version>
</parent>
<groupId>org.apache.geronimo.specs</groupId>
@@ -81,6 +81,14 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ApplicationPath.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ApplicationPath.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ApplicationPath.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ApplicationPath.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;
-
@Documented
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface ApplicationPath {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BadRequestException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BadRequestException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BadRequestException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BadRequestException.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 BadRequestException extends ClientErrorException {
-
- private static final long serialVersionUID = 7264647684649480265L;
-
-
- public BadRequestException() {
- super(Response.Status.BAD_REQUEST);
- }
-
-
- public BadRequestException(String message) {
- super(message, Response.Status.BAD_REQUEST);
- }
-
-
- public BadRequestException(Response response) {
- super(validate(response, Response.Status.BAD_REQUEST));
- }
-
-
- public BadRequestException(String message, Response response) {
- super(message, validate(response, Response.Status.BAD_REQUEST));
- }
-
-
- public BadRequestException(Throwable cause) {
- super(Response.Status.BAD_REQUEST, cause);
- }
-
-
- public BadRequestException(String message, Throwable cause) {
- super(message, Response.Status.BAD_REQUEST, cause);
- }
-
-
- public BadRequestException(Response response, Throwable cause) {
- super(validate(response, Response.Status.BAD_REQUEST), cause);
- }
-
-
- public BadRequestException(String message, Response response, Throwable cause) {
- super(message, validate(response, Response.Status.BAD_REQUEST), 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 BadRequestException extends ClientErrorException {
+
+ private static final long serialVersionUID = 7264647684649480265L;
+
+ public BadRequestException() {
+ super(Response.Status.BAD_REQUEST);
+ }
+
+ public BadRequestException(String message) {
+ super(message, Response.Status.BAD_REQUEST);
+ }
+
+ public BadRequestException(Response response) {
+ super(validate(response, Response.Status.BAD_REQUEST));
+ }
+
+ public BadRequestException(String message, Response response) {
+ super(message, validate(response, Response.Status.BAD_REQUEST));
+ }
+
+ public BadRequestException(Throwable cause) {
+ super(Response.Status.BAD_REQUEST, cause);
+ }
+
+ public BadRequestException(String message, Throwable cause) {
+ super(message, Response.Status.BAD_REQUEST, cause);
+ }
+
+ public BadRequestException(Response response, Throwable cause) {
+ super(validate(response, Response.Status.BAD_REQUEST), cause);
+ }
+
+ public BadRequestException(String message, Response response, Throwable cause) {
+ super(message, validate(response, Response.Status.BAD_REQUEST), cause);
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BeanParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BeanParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BeanParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/BeanParam.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,18 +17,17 @@
* 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.PARAMETER, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface BeanParam {
-}
+
+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.PARAMETER, ElementType.METHOD, ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface BeanParam {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ClientErrorException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ClientErrorException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ClientErrorException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ClientErrorException.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 ClientErrorException extends WebApplicationException {
-
- private static final long serialVersionUID = -4101970664444907990L;
-
-
- public ClientErrorException(Response.Status status) {
- super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, Response.Status status) {
- super(message, null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(int status) {
- super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, int status) {
- super(message, null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(Response response) {
- super((Throwable) null, validate(response, Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, Response response) {
- super(message, null, validate(response, Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(Response.Status status, Throwable cause) {
- super(cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, Response.Status status, Throwable cause) {
- super(message, cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(int status, Throwable cause) {
- super(cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, int status, Throwable cause) {
- super(message, cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(Response response, Throwable cause) {
- super(cause, validate(response, Response.Status.Family.CLIENT_ERROR));
- }
-
-
- public ClientErrorException(String message, Response response, Throwable cause) {
- super(message, cause, validate(response, Response.Status.Family.CLIENT_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 ClientErrorException extends WebApplicationException {
+
+ private static final long serialVersionUID = -4101970664444907990L;
+
+ public ClientErrorException(Response.Status status) {
+ super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, Response.Status status) {
+ super(message, null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(int status) {
+ super((Throwable) null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, int status) {
+ super(message, null, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(Response response) {
+ super((Throwable) null, validate(response, Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, Response response) {
+ super(message, null, validate(response, Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(Response.Status status, Throwable cause) {
+ super(cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, Response.Status status, Throwable cause) {
+ super(message, cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(int status, Throwable cause) {
+ super(cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, int status, Throwable cause) {
+ super(message, cause, validate(Response.status(status).build(), Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(Response response, Throwable cause) {
+ super(cause, validate(response, Response.Status.Family.CLIENT_ERROR));
+ }
+
+ public ClientErrorException(String message, Response response, Throwable cause) {
+ super(message, cause, validate(response, Response.Status.Family.CLIENT_ERROR));
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ConstrainedTo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ConstrainedTo.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ConstrainedTo.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ConstrainedTo.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,13 +26,10 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ConstrainedTo {
-
RuntimeType value();
}
-
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Consumes.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Consumes.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Consumes.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Consumes.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 Consumes {
-
-
- 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 Consumes {
+
+ String[] value() default "*/*";
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/CookieParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/CookieParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/CookieParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/CookieParam.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 CookieParam {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DELETE.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DELETE.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DELETE.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DELETE.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.DELETE)
-@Documented
-public @interface DELETE {
-}
+
+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.DELETE)
+@Documented
+public @interface DELETE {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DefaultValue.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DefaultValue.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DefaultValue.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/DefaultValue.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 DefaultValue {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Encoded.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Encoded.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Encoded.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/Encoded.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,18 +17,17 @@
* 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.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Encoded {
-}
+
+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.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Encoded {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ForbiddenException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ForbiddenException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ForbiddenException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/ForbiddenException.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 ForbiddenException extends ClientErrorException {
-
- private static final long serialVersionUID = -2740045367479165061L;
-
-
- public ForbiddenException() {
- super(Response.Status.FORBIDDEN);
- }
-
-
- public ForbiddenException(String message) {
- super(message, Response.Status.FORBIDDEN);
- }
-
-
- public ForbiddenException(Response response) {
- super(validate(response, Response.Status.FORBIDDEN));
- }
-
-
- public ForbiddenException(String message, Response response) {
- super(message, validate(response, Response.Status.FORBIDDEN));
- }
-
-
- public ForbiddenException(Throwable cause) {
- super(Response.Status.FORBIDDEN, cause);
- }
-
-
- public ForbiddenException(String message, Throwable cause) {
- super(message, Response.Status.FORBIDDEN, cause);
- }
-
-
- public ForbiddenException(Response response, Throwable cause) {
- super(validate(response, Response.Status.FORBIDDEN), cause);
- }
-
-
- public ForbiddenException(String message, Response response, Throwable cause) {
- super(message, validate(response, Response.Status.FORBIDDEN), 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 ForbiddenException extends ClientErrorException {
+
+ private static final long serialVersionUID = -2740045367479165061L;
+
+ public ForbiddenException() {
+ super(Response.Status.FORBIDDEN);
+ }
+
+ public ForbiddenException(String message) {
+ super(message, Response.Status.FORBIDDEN);
+ }
+
+ public ForbiddenException(Response response) {
+ super(validate(response, Response.Status.FORBIDDEN));
+ }
+
+ public ForbiddenException(String message, Response response) {
+ super(message, validate(response, Response.Status.FORBIDDEN));
+ }
+
+ public ForbiddenException(Throwable cause) {
+ super(Response.Status.FORBIDDEN, cause);
+ }
+
+ public ForbiddenException(String message, Throwable cause) {
+ super(message, Response.Status.FORBIDDEN, cause);
+ }
+
+ public ForbiddenException(Response response, Throwable cause) {
+ super(validate(response, Response.Status.FORBIDDEN), cause);
+ }
+
+ public ForbiddenException(String message, Response response, Throwable cause) {
+ super(message, validate(response, Response.Status.FORBIDDEN), cause);
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/FormParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/FormParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/FormParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/FormParam.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 FormParam {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/GET.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/GET.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/GET.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/GET.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.GET)
-@Documented
-public @interface GET {
-}
+
+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.GET)
+@Documented
+public @interface GET {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HEAD.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HEAD.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HEAD.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HEAD.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.HEAD)
-@Documented
-public @interface HEAD {
-}
+
+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.HEAD)
+@Documented
+public @interface HEAD {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HeaderParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HeaderParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HeaderParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HeaderParam.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 HeaderParam {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HttpMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HttpMethod.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HttpMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/HttpMethod.java Tue Dec 19 11:39:13 2017
@@ -1,50 +1,49 @@
-/*
- * #%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.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface HttpMethod {
-
-
- public static final String GET = "GET";
-
- public static final String POST = "POST";
-
- public static final String PUT = "PUT";
-
- public static final String DELETE = "DELETE";
-
- public static final String HEAD = "HEAD";
-
- public static final String OPTIONS = "OPTIONS";
-
-
- String 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 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.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface HttpMethod {
+
+ public static final String GET = "GET";
+
+ public static final String POST = "POST";
+
+ public static final String PUT = "PUT";
+
+ public static final String DELETE = "DELETE";
+
+ public static final String PATCH = "PATCH";
+
+ public static final String HEAD = "HEAD";
+
+ public static final String OPTIONS = "OPTIONS";
+
+ String value();
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/InternalServerErrorException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/InternalServerErrorException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/InternalServerErrorException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/InternalServerErrorException.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 InternalServerErrorException extends ServerErrorException {
-
- private static final long serialVersionUID = -6515710697540553309L;
-
-
- public InternalServerErrorException() {
- super(Response.Status.INTERNAL_SERVER_ERROR);
- }
-
-
- public InternalServerErrorException(String message) {
- super(message, Response.Status.INTERNAL_SERVER_ERROR);
- }
-
-
- public InternalServerErrorException(Response response) {
- super(validate(response, Response.Status.INTERNAL_SERVER_ERROR));
- }
-
-
- public InternalServerErrorException(String message, Response response) {
- super(message, validate(response, Response.Status.INTERNAL_SERVER_ERROR));
- }
-
-
- public InternalServerErrorException(Throwable cause) {
- super(Response.Status.INTERNAL_SERVER_ERROR, cause);
- }
-
-
- public InternalServerErrorException(String message, Throwable cause) {
- super(message, Response.Status.INTERNAL_SERVER_ERROR, cause);
- }
-
-
- public InternalServerErrorException(Response response, Throwable cause) {
- super(validate(response, Response.Status.INTERNAL_SERVER_ERROR), cause);
- }
-
-
- public InternalServerErrorException(String message, Response response, Throwable cause) {
- super(message, validate(response, Response.Status.INTERNAL_SERVER_ERROR), 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 InternalServerErrorException extends ServerErrorException {
+
+ private static final long serialVersionUID = -6515710697540553309L;
+
+ public InternalServerErrorException() {
+ super(Response.Status.INTERNAL_SERVER_ERROR);
+ }
+
+ public InternalServerErrorException(String message) {
+ super(message, Response.Status.INTERNAL_SERVER_ERROR);
+ }
+
+ public InternalServerErrorException(Response response) {
+ super(validate(response, Response.Status.INTERNAL_SERVER_ERROR));
+ }
+
+ public InternalServerErrorException(String message, Response response) {
+ super(message, validate(response, Response.Status.INTERNAL_SERVER_ERROR));
+ }
+
+ public InternalServerErrorException(Throwable cause) {
+ super(Response.Status.INTERNAL_SERVER_ERROR, cause);
+ }
+
+ public InternalServerErrorException(String message, Throwable cause) {
+ super(message, Response.Status.INTERNAL_SERVER_ERROR, cause);
+ }
+
+ public InternalServerErrorException(Response response, Throwable cause) {
+ super(validate(response, Response.Status.INTERNAL_SERVER_ERROR), cause);
+ }
+
+ public InternalServerErrorException(String message, Response response, Throwable cause) {
+ super(message, validate(response, Response.Status.INTERNAL_SERVER_ERROR), cause);
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/MatrixParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/MatrixParam.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/MatrixParam.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/MatrixParam.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 MatrixParam {
-
String value();
}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NameBinding.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NameBinding.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NameBinding.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NameBinding.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,18 +17,17 @@
* 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.ANNOTATION_TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface NameBinding {
-}
+
+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.ANNOTATION_TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface NameBinding {
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAcceptableException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAcceptableException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAcceptableException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAcceptableException.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 NotAcceptableException extends ClientErrorException {
-
- private static final long serialVersionUID = -1476163816796529078L;
-
-
- public NotAcceptableException() {
- super(Response.Status.NOT_ACCEPTABLE);
- }
-
-
- public NotAcceptableException(String message) {
- super(message, Response.Status.NOT_ACCEPTABLE);
- }
-
-
- public NotAcceptableException(Response response) {
- super(validate(response, Response.Status.NOT_ACCEPTABLE));
- }
-
-
- public NotAcceptableException(String message, Response response) {
- super(message, validate(response, Response.Status.NOT_ACCEPTABLE));
- }
-
-
- public NotAcceptableException(Throwable cause) {
- super(Response.Status.NOT_ACCEPTABLE, cause);
- }
-
-
- public NotAcceptableException(String message, Throwable cause) {
- super(message, Response.Status.NOT_ACCEPTABLE, cause);
- }
-
-
- public NotAcceptableException(Response response, Throwable cause) {
- super(validate(response, Response.Status.NOT_ACCEPTABLE), cause);
- }
-
-
- public NotAcceptableException(String message, Response response, Throwable cause) {
- super(message, validate(response, Response.Status.NOT_ACCEPTABLE), 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 NotAcceptableException extends ClientErrorException {
+
+ private static final long serialVersionUID = -1476163816796529078L;
+
+ public NotAcceptableException() {
+ super(Response.Status.NOT_ACCEPTABLE);
+ }
+
+ public NotAcceptableException(String message) {
+ super(message, Response.Status.NOT_ACCEPTABLE);
+ }
+
+ public NotAcceptableException(Response response) {
+ super(validate(response, Response.Status.NOT_ACCEPTABLE));
+ }
+
+ public NotAcceptableException(String message, Response response) {
+ super(message, validate(response, Response.Status.NOT_ACCEPTABLE));
+ }
+
+ public NotAcceptableException(Throwable cause) {
+ super(Response.Status.NOT_ACCEPTABLE, cause);
+ }
+
+ public NotAcceptableException(String message, Throwable cause) {
+ super(message, Response.Status.NOT_ACCEPTABLE, cause);
+ }
+
+ public NotAcceptableException(Response response, Throwable cause) {
+ super(validate(response, Response.Status.NOT_ACCEPTABLE), cause);
+ }
+
+ public NotAcceptableException(String message, Response response, Throwable cause) {
+ super(message, validate(response, Response.Status.NOT_ACCEPTABLE), cause);
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAllowedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAllowedException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAllowedException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAllowedException.java Tue Dec 19 11:39:13 2017
@@ -1,97 +1,89 @@
-/*
- * #%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.HttpHeaders;
-import javax.ws.rs.core.Response;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-
-public class NotAllowedException extends ClientErrorException {
-
- private static final long serialVersionUID = -586776054369626119L;
-
-
- public NotAllowedException(String allowed, String... moreAllowed) {
- super(validateAllow(createNotAllowedResponse(allowed, moreAllowed)));
- }
-
-
- public NotAllowedException(String message, String allowed, String... moreAllowed) {
- super(message, validateAllow(createNotAllowedResponse(allowed, moreAllowed)));
- }
-
- private static Response createNotAllowedResponse(String allowed, String... moreAllowed) {
- if (allowed == null) {
- throw new NullPointerException("No allowed method specified.");
- }
- Set<String> methods;
- if (moreAllowed != null && moreAllowed.length > 0) {
- methods = new HashSet<String>(moreAllowed.length + 1);
- methods.add(allowed);
- Collections.addAll(methods, moreAllowed);
- } else {
- methods = Collections.singleton(allowed);
- }
-
- return Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(methods).build();
- }
-
-
- public NotAllowedException(Response response) {
- super(validate(response, Response.Status.METHOD_NOT_ALLOWED));
- }
-
-
- public NotAllowedException(String message, Response response) {
- super(message, validate(response, Response.Status.METHOD_NOT_ALLOWED));
- }
-
-
- public NotAllowedException(Throwable cause, String... allowedMethods) {
- super(validateAllow(Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(allowedMethods).build()), cause);
- }
-
-
- public NotAllowedException(String message, Throwable cause, String... allowedMethods) {
- super(message, validateAllow(Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(allowedMethods).build()), cause);
- }
-
-
- public NotAllowedException(Response response, Throwable cause) {
- super(validateAllow(validate(response, Response.Status.METHOD_NOT_ALLOWED)), cause);
- }
-
-
- public NotAllowedException(String message, Response response, Throwable cause) {
- super(message, validateAllow(validate(response, Response.Status.METHOD_NOT_ALLOWED)), cause);
- }
-
- private static Response validateAllow(final Response response) {
- if (!response.getHeaders().containsKey(HttpHeaders.ALLOW)) {
- throw new IllegalArgumentException("Response does not contain required 'Allow' HTTP header.");
- }
-
- 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 java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+public class NotAllowedException extends ClientErrorException {
+
+ private static final long serialVersionUID = -586776054369626119L;
+
+ public NotAllowedException(String allowed, String... moreAllowed) {
+ super(validateAllow(createNotAllowedResponse(allowed, moreAllowed)));
+ }
+
+ public NotAllowedException(String message, String allowed, String... moreAllowed) {
+ super(message, validateAllow(createNotAllowedResponse(allowed, moreAllowed)));
+ }
+
+ private static Response createNotAllowedResponse(String allowed, String... moreAllowed) {
+ if (allowed == null) {
+ throw new NullPointerException("No allowed method specified.");
+ }
+ Set<String> methods;
+ if (moreAllowed != null && moreAllowed.length > 0) {
+ methods = new HashSet<String>(moreAllowed.length + 1);
+ methods.add(allowed);
+ Collections.addAll(methods, moreAllowed);
+ } else {
+ methods = Collections.singleton(allowed);
+ }
+
+ return Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(methods).build();
+ }
+
+ public NotAllowedException(Response response) {
+ super(validate(response, Response.Status.METHOD_NOT_ALLOWED));
+ }
+
+ public NotAllowedException(String message, Response response) {
+ super(message, validate(response, Response.Status.METHOD_NOT_ALLOWED));
+ }
+
+ public NotAllowedException(Throwable cause, String... allowedMethods) {
+ super(validateAllow(Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(allowedMethods).build()), cause);
+ }
+
+ public NotAllowedException(String message, Throwable cause, String... allowedMethods) {
+ super(message, validateAllow(Response.status(Response.Status.METHOD_NOT_ALLOWED).allow(allowedMethods).build()), cause);
+ }
+
+ public NotAllowedException(Response response, Throwable cause) {
+ super(validateAllow(validate(response, Response.Status.METHOD_NOT_ALLOWED)), cause);
+ }
+
+ public NotAllowedException(String message, Response response, Throwable cause) {
+ super(message, validateAllow(validate(response, Response.Status.METHOD_NOT_ALLOWED)), cause);
+ }
+
+ private static Response validateAllow(final Response response) {
+ if (!response.getHeaders().containsKey(HttpHeaders.ALLOW)) {
+ throw new IllegalArgumentException("Response does not contain required 'Allow' HTTP header.");
+ }
+
+ return response;
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAuthorizedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAuthorizedException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAuthorizedException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotAuthorizedException.java Tue Dec 19 11:39:13 2017
@@ -1,115 +1,106 @@
-/*
- * #%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.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
-
-
-public class NotAuthorizedException extends ClientErrorException {
-
- private static final long serialVersionUID = -3156040750581929702L;
-
- private transient List<Object> challenges;
-
-
- public NotAuthorizedException(Object challenge, Object... moreChallenges) {
- super(createUnauthorizedResponse(challenge, moreChallenges));
- this.challenges = cacheChallenges(challenge, moreChallenges);
- }
-
-
- public NotAuthorizedException(String message, Object challenge, Object... moreChallenges) {
- super(message, createUnauthorizedResponse(challenge, moreChallenges));
- this.challenges = cacheChallenges(challenge, moreChallenges);
- }
-
-
- public NotAuthorizedException(Response response) {
- super(validate(response, UNAUTHORIZED));
- }
-
-
- public NotAuthorizedException(String message, Response response) {
- super(message, validate(response, UNAUTHORIZED));
- }
-
-
- public NotAuthorizedException(Throwable cause, Object challenge, Object... moreChallenges) {
- super(createUnauthorizedResponse(challenge, moreChallenges), cause);
- this.challenges = cacheChallenges(challenge, moreChallenges);
- }
-
-
- public NotAuthorizedException(String message, Throwable cause, Object challenge, Object... moreChallenges) {
- super(message, createUnauthorizedResponse(challenge, moreChallenges), cause);
- this.challenges = cacheChallenges(challenge, moreChallenges);
- }
-
-
- public NotAuthorizedException(Response response, Throwable cause) {
- super(validate(response, UNAUTHORIZED), cause);
- }
-
-
- public NotAuthorizedException(String message, Response response, Throwable cause) {
- super(message, validate(response, UNAUTHORIZED), cause);
- }
-
-
- public List<Object> getChallenges() {
- if (challenges == null) {
- this.challenges = getResponse().getHeaders().get(WWW_AUTHENTICATE);
- }
- return challenges;
- }
-
- private static Response createUnauthorizedResponse(Object challenge, Object[] otherChallenges) {
- if (challenge == null) {
- throw new NullPointerException("Primary challenge parameter must not be null.");
- }
-
- Response.ResponseBuilder builder = Response.status(UNAUTHORIZED).header(WWW_AUTHENTICATE, challenge);
-
- if (otherChallenges != null) {
- for (Object oc : otherChallenges) {
- builder.header(WWW_AUTHENTICATE, oc);
- }
- }
-
- return builder.build();
- }
-
- private static List<Object> cacheChallenges(Object challenge, Object[] moreChallenges) {
- List<Object> temp = new ArrayList<Object>(1 + ((moreChallenges == null) ? 0 : moreChallenges.length));
- temp.add(challenge);
- if (moreChallenges != null) {
- temp.addAll(Arrays.asList(moreChallenges));
- }
- return Collections.unmodifiableList(temp);
- }
-}
+/*
+ * #%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.WWW_AUTHENTICATE;
+import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+
+public class NotAuthorizedException extends ClientErrorException {
+
+ private static final long serialVersionUID = -3156040750581929702L;
+
+ private transient List<Object> challenges;
+
+ public NotAuthorizedException(Object challenge, Object... moreChallenges) {
+ super(createUnauthorizedResponse(challenge, moreChallenges));
+ this.challenges = cacheChallenges(challenge, moreChallenges);
+ }
+
+ public NotAuthorizedException(String message, Object challenge, Object... moreChallenges) {
+ super(message, createUnauthorizedResponse(challenge, moreChallenges));
+ this.challenges = cacheChallenges(challenge, moreChallenges);
+ }
+
+ public NotAuthorizedException(Response response) {
+ super(validate(response, UNAUTHORIZED));
+ }
+
+ public NotAuthorizedException(String message, Response response) {
+ super(message, validate(response, UNAUTHORIZED));
+ }
+
+ public NotAuthorizedException(Throwable cause, Object challenge, Object... moreChallenges) {
+ super(createUnauthorizedResponse(challenge, moreChallenges), cause);
+ this.challenges = cacheChallenges(challenge, moreChallenges);
+ }
+
+ public NotAuthorizedException(String message, Throwable cause, Object challenge, Object... moreChallenges) {
+ super(message, createUnauthorizedResponse(challenge, moreChallenges), cause);
+ this.challenges = cacheChallenges(challenge, moreChallenges);
+ }
+
+ public NotAuthorizedException(Response response, Throwable cause) {
+ super(validate(response, UNAUTHORIZED), cause);
+ }
+
+ public NotAuthorizedException(String message, Response response, Throwable cause) {
+ super(message, validate(response, UNAUTHORIZED), cause);
+ }
+
+ public List<Object> getChallenges() {
+ if (challenges == null) {
+ this.challenges = getResponse().getHeaders().get(WWW_AUTHENTICATE);
+ }
+ return challenges;
+ }
+
+ private static Response createUnauthorizedResponse(Object challenge, Object[] otherChallenges) {
+ if (challenge == null) {
+ throw new NullPointerException("Primary challenge parameter must not be null.");
+ }
+
+ Response.ResponseBuilder builder = Response.status(UNAUTHORIZED).header(WWW_AUTHENTICATE, challenge);
+
+ if (otherChallenges != null) {
+ for (Object oc : otherChallenges) {
+ builder.header(WWW_AUTHENTICATE, oc);
+ }
+ }
+
+ return builder.build();
+ }
+
+ private static List<Object> cacheChallenges(Object challenge, Object[] moreChallenges) {
+ List<Object> temp = new ArrayList<Object>(1 + ((moreChallenges == null) ? 0 : moreChallenges.length));
+ temp.add(challenge);
+ if (moreChallenges != null) {
+ temp.addAll(Arrays.asList(moreChallenges));
+ }
+ return Collections.unmodifiableList(temp);
+ }
+}
Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotFoundException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotFoundException.java?rev=1818654&r1=1818653&r2=1818654&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotFoundException.java (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/src/main/java/javax/ws/rs/NotFoundException.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 NotFoundException extends ClientErrorException {
-
- private static final long serialVersionUID = -6820866117511628388L;
-
-
- public NotFoundException() {
- super(Response.Status.NOT_FOUND);
- }
-
-
- public NotFoundException(String message) {
- super(message, Response.Status.NOT_FOUND);
- }
-
-
- public NotFoundException(Response response) {
- super(validate(response, Response.Status.NOT_FOUND));
- }
-
-
- public NotFoundException(String message, Response response) {
- super(message, validate(response, Response.Status.NOT_FOUND));
- }
-
-
- public NotFoundException(Throwable cause) {
- super(Response.Status.NOT_FOUND, cause);
- }
-
-
- public NotFoundException(String message, Throwable cause) {
- super(message, Response.Status.NOT_FOUND, cause);
- }
-
-
- public NotFoundException(Response response, Throwable cause) {
- super(validate(response, Response.Status.NOT_FOUND), cause);
- }
-
-
- public NotFoundException(String message, Response response, Throwable cause) {
- super(message, validate(response, Response.Status.NOT_FOUND), 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 NotFoundException extends ClientErrorException {
+
+ private static final long serialVersionUID = -6820866117511628388L;
+
+ public NotFoundException() {
+ super(Response.Status.NOT_FOUND);
+ }
+
+ public NotFoundException(String message) {
+ super(message, Response.Status.NOT_FOUND);
+ }
+
+ public NotFoundException(Response response) {
+ super(validate(response, Response.Status.NOT_FOUND));
+ }
+
+ public NotFoundException(String message, Response response) {
+ super(message, validate(response, Response.Status.NOT_FOUND));
+ }
+
+ public NotFoundException(Throwable cause) {
+ super(Response.Status.NOT_FOUND, cause);
+ }
+
+ public NotFoundException(String message, Throwable cause) {
+ super(message, Response.Status.NOT_FOUND, cause);
+ }
+
+ public NotFoundException(Response response, Throwable cause) {
+ super(validate(response, Response.Status.NOT_FOUND), cause);
+ }
+
+ public NotFoundException(String message, Response response, Throwable cause) {
+ super(message, validate(response, Response.Status.NOT_FOUND), cause);
+ }
+}