Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAYARA-4000 A REST management DELETE command returns 415 code instead of 404 #31

Merged
merged 5 commits into from
Aug 16, 2019
Merged

PAYARA-4000 A REST management DELETE command returns 415 code instead of 404 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0136a1
Merge pull request #29 from AlanRoth/PAYARA-4000
Aug 14, 2019
f9bf04a
Reverted exception type
Aug 15, 2019
86641a1
Fixed remaining checkstyle errors.
Aug 16, 2019
6c1d6d8
Released jersey 2.29.payara-p5
Aug 15, 2019
c27088d
Updated to next snapshot versions
Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion archetypes/jersey-example-java8-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-example-java8-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-heroku-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>
<packaging>maven-archetype</packaging>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-quickstart-grizzly2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>
<artifactId>jersey-quickstart-grizzly2</artifactId>
<packaging>maven-archetype</packaging>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-quickstart-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-archetype</packaging>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>jersey-bom</name>

Expand Down
2 changes: 1 addition & 1 deletion bundles/apidocs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>apidocs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jaxrs-ri</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/apache-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-apache-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/grizzly-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-grizzly-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/jdk-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-jdk-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/jetty-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-jetty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/netty-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-netty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.connectors</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/jersey-gf-ejb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-gf-ejb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers.glassfish</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jdk-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jdk-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.containers</groupId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/netty-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-netty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/simple-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-simple-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
8 changes: 5 additions & 3 deletions ...ommon/src/main/java/org/glassfish/jersey/message/internal/FormMultivaluedMapProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ public FormMultivaluedMapProvider() {

@Override
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
// Only allow types MultivaluedMap<String, String> and MultivaluedMap.
return type == MultivaluedMap.class
&& (type == genericType || mapType.equals(genericType));
return (type == MultivaluedMap.class
&& (type == genericType
|| mapType.equals(genericType)))
|| (type.isAssignableFrom(MultivaluedMap.class)
&& mediaType.isCompatible(MediaType.APPLICATION_FORM_URLENCODED_TYPE));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions core-server/src/main/java/org/glassfish/jersey/server/ServerRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ public void run() {
} else {
externalRequestScope.suspend(asyncResponderHolder.externalContext, injectionManager);
}
} catch (final Throwable throwable) {
responder.process(throwable);
} catch (final Exception ex) {
responder.process(ex);
} finally {
asyncResponderHolder.release();
// clear base URI from the thread
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>
<artifactId>jersey-documentation</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion examples/assemblies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>assemblies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark-em/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>bookmark-em</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>bookmark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookstore-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>bookstore-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cdi-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>cdi-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/clipboard-programmatic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>clipboard-programmatic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/clipboard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>clipboard</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/declarative-linking/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>declarative-linking</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/entity-filtering-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.29.payara-p5-SNAPSHOT</version>
<version>2.29.payara-p6-SNAPSHOT</version>
</parent>

<artifactId>entity-filtering-security</artifactId>
Expand Down
Loading