[RESTEASY-2772] Backing out changes for RESTEASY-2772. (#2627)

ronsigal · web-flow · commit 1918547d705c · 2020-12-08T13:28:26.000-05:00
diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartReader.java
@@ -15,7 +15,6 @@
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import javax.ws.rs.BadRequestException;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -36,7 +35,7 @@ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotati
    public MultipartInput readFrom(Class<MultipartInput> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException
    {
       String boundary = mediaType.getParameters().get("boundary");
-      if (boundary == null) throw new BadRequestException(Messages.MESSAGES.unableToGetBoundary());
+      if (boundary == null) throw new IOException(Messages.MESSAGES.unableToGetBoundary());
       MultipartInputImpl input = new MultipartInputImpl(mediaType, workers);
       /*
       StringWriter writer = new StringWriter();
diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java
@@ -7,7 +7,6 @@
 import javax.ws.rs.ext.RuntimeDelegate;
 
 import java.util.HashMap;
-import javax.ws.rs.BadRequestException;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -114,7 +113,7 @@ public static MediaType parse(String type)
          }
          if (!MediaType.MEDIA_TYPE_WILDCARD.equals(major))
          {
-            throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+            throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
          }
          subtype = MediaType.MEDIA_TYPE_WILDCARD;
       }
@@ -132,11 +131,11 @@ public static MediaType parse(String type)
       }
       if (major.length() < 1 || subtype.length() < 1)
       {
-         throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+         throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
       }
       if (!isValid(major) || !isValid(subtype))
       {
-         throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));
+         throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));
       }
       String params = null;
       if (paramIndex > -1) params = type.substring(paramIndex + 1);
diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/ClientBuilderTest.java
@@ -16,7 +16,6 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.RuntimeDelegate;
-import javax.ws.rs.BadRequestException;
 
 import static org.jboss.resteasy.test.TestPortProvider.generateURL;
 
@@ -33,7 +32,7 @@ public class ClientBuilderTest {
     * @tpPassCrit IllegalArgumentException is raised
     * @tpSince RESTEasy 3.0.16
     */
-   @Test(expected = BadRequestException.class)
+   @Test(expected = IllegalArgumentException.class)
    public void entityStringThrowsExceptionWhenUnparsableTest() throws Exception {
       Entity.entity("entity", "\\//\\");
       Assert.fail();
diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/mediatype/MediaTypeHeaderTest.java
@@ -2,11 +2,10 @@
 
 import org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate;
 import org.junit.Test;
-import javax.ws.rs.BadRequestException;
 
 public class MediaTypeHeaderTest {
 
-   @Test(expected = BadRequestException.class)
+   @Test(expected = IllegalArgumentException.class)
    public void testNewLineInHeaderValueIsRejected() {
       MediaTypeHeaderDelegate delegate = new MediaTypeHeaderDelegate();
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`import javax.ws.rs.ext.RuntimeDelegate;`
`8`	`8`
`9`	`9`	`import java.util.HashMap;`
`10`		`-import javax.ws.rs.BadRequestException;`
`11`	`10`
`12`	`11`	`/**`
`13`	`12`	`* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>`
`@@ -114,7 +113,7 @@ public static MediaType parse(String type)`
`114`	`113`	`}`
`115`	`114`	`if (!MediaType.MEDIA_TYPE_WILDCARD.equals(major))`
`116`	`115`	`{`
`117`		`- throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));`
	`116`	`+ throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));`
`118`	`117`	`}`
`119`	`118`	`subtype = MediaType.MEDIA_TYPE_WILDCARD;`
`120`	`119`	`}`
`@@ -132,11 +131,11 @@ public static MediaType parse(String type)`
`132`	`131`	`}`
`133`	`132`	`if (major.length() < 1 \|\| subtype.length() < 1)`
`134`	`133`	`{`
`135`		`- throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));`
	`134`	`+ throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));`
`136`	`135`	`}`
`137`	`136`	`if (!isValid(major) \|\| !isValid(subtype))`
`138`	`137`	`{`
`139`		`- throw new BadRequestException(Messages.MESSAGES.failureParsingMediaType(type));`
	`138`	`+ throw new IllegalArgumentException(Messages.MESSAGES.failureParsingMediaType(type));`
`140`	`139`	`}`
`141`	`140`	`String params = null;`
`142`	`141`	`if (paramIndex > -1) params = type.substring(paramIndex + 1);`