Skip to content

Commit

Permalink
replaced deprecated Byte, Integer, Float ... usage
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsearls
rsearls committed Jun 9, 2021
1 parent 712527f commit bd838ff
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ...dertow-spring/src/test/java/org/jboss/resteasy/springmvc/test/client/BasicSpringTest.java
View file
Expand Up @@ -63,7 +63,7 @@ public void testBasic() throws IOException {
Integer interceptorCount = br
.getSpringInterceptorCount("afterCompletion");

Assert.assertEquals(new Integer(8), interceptorCount);
Assert.assertEquals(Integer.valueOf(8), interceptorCount);
Assert.assertEquals("text/plain", br.getContentTypeHeader());
Assert.assertEquals("springSomething", br.testSpringXml().getSomething());
}
Expand Down
6 changes: 5 additions & 1 deletion .../jboss/resteasy/test/core/interceptors/resource/FilteredCookieContainerRequestFilter.java
View file
Expand Up @@ -8,6 +8,7 @@
import jakarta.ws.rs.core.Cookie;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.ext.Provider;
import jakarta.ws.rs.ext.RuntimeDelegate;

@Provider
@PreMatching
Expand All @@ -21,7 +22,10 @@ public void filter(ContainerRequestContext requestContext) throws IOException {

final Cookie cookie = requestContext.getCookies().get(OLD_COOKIE_NAME);
if (cookie != null) {
requestContext.getHeaders().add(HttpHeaders.COOKIE, new Cookie(NEW_COOKIE_NAME, cookie.getValue()).toString());
String value = RuntimeDelegate.getInstance()
.createHeaderDelegate(Cookie.class)
.toString(new Cookie(NEW_COOKIE_NAME, cookie.getValue()));
requestContext.getHeaders().add(HttpHeaders.COOKIE, value);
}
}
}
12 changes: 6 additions & 6 deletions ...st/java/org/jboss/resteasy/test/providers/plain/resource/DefaultNumberWriterResource.java
View file
Expand Up @@ -12,27 +12,27 @@ public class DefaultNumberWriterResource {
@GET
public Response get(@PathParam("type") String type) throws Exception {
if ("Byte".equals(type)) {
return Response.ok().entity(new Byte((byte) 123)).build();
return Response.ok().entity(Byte.valueOf((byte) 123)).build();
} else if ("byte".equals(type)) {
return Response.ok().entity((byte) 123).build();
} else if ("Double".equals(type)) {
return Response.ok().entity(new Double((double) 123.4)).build();
return Response.ok().entity(Double.valueOf((double) 123.4)).build();
} else if ("double".equals(type)) {
return Response.ok().entity((double) 123.4).build();
} else if ("Float".equals(type)) {
return Response.ok().entity(new Float((float) 123.4)).build();
return Response.ok().entity(Float.valueOf((float) 123.4)).build();
} else if ("float".equals(type)) {
return Response.ok().entity((float) 123.4).build();
} else if ("Integer".equals(type)) {
return Response.ok().entity(new Integer((int) 123)).build();
return Response.ok().entity(Integer.valueOf((int) 123)).build();
} else if ("integer".equals(type)) {
return Response.ok().entity((int) 123).build();
} else if ("Long".equals(type)) {
return Response.ok().entity(new Long((long) 123)).build();
return Response.ok().entity(Long.valueOf((long) 123)).build();
} else if ("long".equals(type)) {
return Response.ok().entity((long) 123).build();
} else if ("Short".equals(type)) {
return Response.ok().entity(new Short((short) 123)).build();
return Response.ok().entity(Short.valueOf((short) 123)).build();
} else if ("short".equals(type)) {
return Response.ok().entity((short) 123).build();
} else if ("bigDecimal".equals(type)) {
Expand Down
16 changes: 8 additions & 8 deletions ...ts/src/test/java/org/jboss/resteasy/test/resource/basic/MultipleEndpointsWarningTest.java
View file
Expand Up @@ -66,33 +66,33 @@ public static void tearDown() {
@Test
public void testUnique() throws Exception {
Response response = client.target(generateURL("/unique/")).request().accept(MediaType.TEXT_PLAIN).get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));

response = client.target(generateURL("/unique")).request().get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));

response = client.target(generateURL("/unique")).request().accept(MediaType.TEXT_PLAIN).get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));

response = client.target(generateURL("/1")).request().get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));
}

@Test
public void testDifferentVerbs() throws Exception {
Response response = client.target(generateURL("/verbs")).request().accept(MediaType.TEXT_PLAIN).get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));

response = client.target(generateURL("/verbs")).request().accept(MediaType.TEXT_PLAIN, MediaType.WILDCARD).get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));

response = client.target(generateURL("/verbs")).request().get();
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, new Long(0), response.readEntity(long.class));
Assert.assertEquals("Incorrectly logged " + LogHandler.MESSAGE_CODE, Long.valueOf(0), response.readEntity(long.class));
}

@Test
public void testDuplicate() throws Exception {
Response response = client.target(generateURL("/duplicate")).request().get();
Assert.assertEquals(LogHandler.MESSAGE_CODE + " should've been logged once", new Long(1), response.readEntity(long.class));
Assert.assertEquals(LogHandler.MESSAGE_CODE + " should've been logged once", Long.valueOf(1), response.readEntity(long.class));
}
}
20 changes: 10 additions & 10 deletions ...ts/src/test/java/org/jboss/resteasy/test/resource/param/HeaderParamsAsPrimitivesTest.java
View file
Expand Up @@ -398,11 +398,11 @@ public void testGetByte() {
e.printStackTrace(new PrintWriter(errors));
fail("resourceHeaderPrimitives.doGet() failed:\n" + errors.toString());
}
resourceHeaderPrimitiveWrappers.doGet(new Byte((byte) 127));
resourceHeaderPrimitiveWrappers.doGet(Byte.valueOf((byte) 127));
ArrayList<Byte> list = new ArrayList<Byte>();
list.add(new Byte((byte) 127));
list.add(new Byte((byte) 127));
list.add(new Byte((byte) 127));
list.add(Byte.valueOf((byte) 127));
list.add(Byte.valueOf((byte) 127));
list.add(Byte.valueOf((byte) 127));
try {
resourceHeaderPrimitiveList.doGetByte(list);
} catch (Exception e) {
Expand Down Expand Up @@ -433,7 +433,7 @@ public void testGetBytePrimitiveWrappersDefault() {
testWrappersDefault("byte", "127");
resourceHeaderPrimitiveWrappersDefault.doGetByte();
resourceHeaderPrimitiveWrappersDefaultNull.doGetByte();
resourceHeaderPrimitiveWrappersDefaultOverride.doGet(new Byte((byte) 127));
resourceHeaderPrimitiveWrappersDefaultOverride.doGet(Byte.valueOf((byte) 127));
}

/**
Expand All @@ -446,7 +446,7 @@ public void testGetBytePrimitiveListDefault() {
resourceHeaderPrimitiveListDefault.doGetByte();
resourceHeaderPrimitiveListDefaultNull.doGetByte();
List<Byte> list = new ArrayList<Byte>();
list.add(new Byte((byte) 127));
list.add(Byte.valueOf((byte) 127));
resourceHeaderPrimitiveListDefaultOverride.doGetByte(list);
}

Expand All @@ -458,11 +458,11 @@ public void testGetBytePrimitiveListDefault() {
public void testGetShort() {
basicTest("short", "32767");
resourceHeaderPrimitives.doGet((short) 32767);
resourceHeaderPrimitiveWrappers.doGet(new Short((short) 32767));
resourceHeaderPrimitiveWrappers.doGet(Short.valueOf((short) 32767));
ArrayList<Short> list = new ArrayList<Short>();
list.add(new Short((short) 32767));
list.add(new Short((short) 32767));
list.add(new Short((short) 32767));
list.add(Short.valueOf((short) 32767));
list.add(Short.valueOf((short) 32767));
list.add(Short.valueOf((short) 32767));
resourceHeaderPrimitiveList.doGetShort(list);
}

Expand Down
6 changes: 3 additions & 3 deletions ...tests/src/test/java/org/jboss/resteasy/test/resource/param/QueryParamAsPrimitiveTest.java
View file
Expand Up @@ -294,9 +294,9 @@ public void testGetByte() {
resourceQueryPrimitives.doGet((byte) 127);
resourceQueryPrimitiveWrappers.doGet((byte) 127);
List<Byte> list = new ArrayList<Byte>();
list.add(new Byte((byte) 127));
list.add(new Byte((byte) 127));
list.add(new Byte((byte) 127));
list.add(Byte.valueOf((byte) 127));
list.add(Byte.valueOf((byte) 127));
list.add(Byte.valueOf((byte) 127));
resourceQueryPrimitiveList.doGetByte(list);
byte[] array = {(byte) 127, (byte) 127, (byte) 127};
resourceQueryPrimitiveArray.doGetByte(array);
Expand Down
3 changes: 2 additions & 1 deletion ...ests/src/test/java/org/jboss/resteasy/test/response/resource/VariantLanguageResource.java
View file
Expand Up @@ -12,6 +12,7 @@
import jakarta.ws.rs.core.Variant;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.EntityTag;
import jakarta.ws.rs.ext.RuntimeDelegate;

import java.nio.charset.StandardCharsets;
import java.util.Calendar;
Expand Down Expand Up @@ -139,7 +140,7 @@ private boolean evaluatePreconditionsNowEntityTagNull(Request req) {
private EntityTag createTag(String tag) {
String xtag = new StringBuilder().append("\"").append(tag).append("\"")
.toString();
return EntityTag.valueOf(xtag);
return RuntimeDelegate.getInstance().createHeaderDelegate(EntityTag.class).fromString(xtag);
}

private boolean evaluatePreconditionsEntityTag(Request req, String tag) {
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/jboss/resteasy/test/stream/resource/StreamRawByteArrayMessageBodyReaderWriter.java
View file
Expand Up @@ -50,7 +50,7 @@ public Byte[] readFrom(Class<Byte[]> type, Type genericType, Annotation[] annota
ArrayList<Byte> list = new ArrayList<Byte>();
int b = entityStream.read();
while (b != -1) {
list.add(new Byte((byte)b));
list.add(Byte.valueOf((byte)b));
b = entityStream.read();
}
return list.toArray(new Byte[list.size()]);
Expand Down

0 comments on commit bd838ff

Please sign in to comment.