From f901efc413c702328e3cd918f0b562441dd9d761 Mon Sep 17 00:00:00 2001 From: Matthias Perktold Date: Wed, 13 Jun 2018 16:20:12 +0200 Subject: [PATCH] Issue #2662 - Unnecessary boxing conversions Signed-off-by: Matthias Perktold --- .../jetty/annotations/AnnotationConfiguration.java | 4 ++-- .../hazelcast/session/HazelcastSessionDataStore.java | 2 +- .../main/java/org/eclipse/jetty/http/HttpField.java | 8 ++++---- .../java/org/eclipse/jetty/http2/client/ProxyTest.java | 2 +- .../session/infinispan/InfinispanSessionDataStore.java | 9 +++++---- .../jetty/security/jaspi/modules/BaseAuthModule.java | 2 +- .../eclipse/jetty/proxy/AsyncMiddleManServletTest.java | 2 +- .../java/org/eclipse/jetty/proxy/ProxyServletTest.java | 2 +- .../security/authentication/DigestAuthenticator.java | 4 ++-- .../security/authentication/FormAuthenticator.java | 2 +- .../main/java/org/eclipse/jetty/server/Request.java | 4 ++-- .../eclipse/jetty/server/handler/AbstractHandler.java | 2 +- .../org/eclipse/jetty/server/AsyncRequestReadTest.java | 2 +- .../java/org/eclipse/jetty/server/DumpHandler.java | 6 +++--- .../org/eclipse/jetty/server/ExtendedServerTest.java | 2 +- .../org/eclipse/jetty/server/HttpServerTestBase.java | 4 ++-- .../org/eclipse/jetty/server/ssl/SSLEngineTest.java | 2 +- .../org/eclipse/jetty/servlet/StatisticsServlet.java | 4 ++-- .../org/eclipse/jetty/servlet/AsyncContextTest.java | 6 +++--- .../org/eclipse/jetty/servlet/AsyncServletIOTest.java | 2 +- .../java/org/eclipse/jetty/servlets/DoSFilter.java | 2 +- .../eclipse/jetty/servlets/PushSessionCacheFilter.java | 2 +- .../main/java/org/eclipse/jetty/start/BaseBuilder.java | 2 +- .../jetty/start/fileinits/TestFileInitializer.java | 2 +- .../main/java/org/eclipse/jetty/util/IPAddressMap.java | 2 +- .../org/eclipse/jetty/util/MultiReleaseJarFile.java | 2 +- .../src/main/java/org/eclipse/jetty/util/log/Log.java | 2 +- .../jetty/util/thread/strategy/jmh/TestConnection.java | 2 +- .../jetty/webapp/StandardDescriptorProcessor.java | 10 +++++----- .../websocket/api/extensions/ExtensionConfig.java | 2 +- 30 files changed, 50 insertions(+), 49 deletions(-) diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java index 03bc217df77..bc2da221fe6 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java @@ -426,7 +426,7 @@ public class AnnotationConfiguration extends AbstractConfiguration int javaPlatform = 0; Object target = context.getAttribute(JavaVersion.JAVA_TARGET_PLATFORM); if (target!=null) - javaPlatform = Integer.valueOf(target.toString()); + javaPlatform = Integer.parseInt(target.toString()); AnnotationParser parser = createAnnotationParser(javaPlatform); _parserTasks = new ArrayList(); @@ -539,7 +539,7 @@ public class AnnotationConfiguration extends AbstractConfiguration return ((Boolean)o).booleanValue(); } //try system property to see if we should use multithreading - return Boolean.valueOf(System.getProperty(MULTI_THREADED, Boolean.toString(DEFAULT_MULTI_THREADED))); + return Boolean.parseBoolean(System.getProperty(MULTI_THREADED, Boolean.toString(DEFAULT_MULTI_THREADED))); } diff --git a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java index edea4840233..26ff7c7f30c 100644 --- a/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java +++ b/jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStore.java @@ -204,7 +204,7 @@ public class HazelcastSessionDataStore if (sd.getExpiry() <= 0) return true; //never expires else - return (Boolean.valueOf(sd.getExpiry() > System.currentTimeMillis())); //not expired yet + return sd.getExpiry() > System.currentTimeMillis(); //not expired yet } public String getCacheKey( String id ) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java index adffa595b44..58bd7f7e547 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java @@ -72,12 +72,12 @@ public class HttpField public int getIntValue() { - return Integer.valueOf(_value); + return Integer.parseInt(_value); } public long getLongValue() { - return Long.valueOf(_value); + return Long.parseLong(_value); } public String[] getValues() @@ -348,7 +348,7 @@ public class HttpField public IntValueHttpField(HttpHeader header, String name, String value) { - this(header,name,value,Integer.valueOf(value)); + this(header,name,value,Integer.parseInt(value)); } public IntValueHttpField(HttpHeader header, String name, int intValue) @@ -386,7 +386,7 @@ public class HttpField public LongValueHttpField(HttpHeader header, String name, String value) { - this(header,name,value,Long.valueOf(value)); + this(header,name,value,Long.parseLong(value)); } public LongValueHttpField(HttpHeader header, String name, long value) diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/ProxyTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/ProxyTest.java index 399842d3fbf..75bb8676c7a 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/ProxyTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/ProxyTest.java @@ -93,7 +93,7 @@ public class ProxyTest configuration.setSendServerVersion(false); String value = initParams.get("outputBufferSize"); if (value != null) - configuration.setOutputBufferSize(Integer.valueOf(value)); + configuration.setOutputBufferSize(Integer.parseInt(value)); proxyConnector = new ServerConnector(proxy, new HTTP2ServerConnectionFactory(configuration)); proxy.addConnector(proxyConnector); diff --git a/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java b/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java index a06aad04cea..5d649b76bfd 100644 --- a/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java +++ b/jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionDataStore.java @@ -22,6 +22,7 @@ package org.eclipse.jetty.session.infinispan; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jetty.server.session.AbstractSessionDataStore; @@ -258,7 +259,7 @@ public class InfinispanSessionDataStore extends AbstractSessionDataStore { // TODO find a better way to do this that does not pull into memory the // whole session object - final AtomicReference reference = new AtomicReference<>(); + final AtomicBoolean reference = new AtomicBoolean(); final AtomicReference exception = new AtomicReference<>(); Runnable load = new Runnable() @@ -271,14 +272,14 @@ public class InfinispanSessionDataStore extends AbstractSessionDataStore SessionData sd = load(id); if (sd == null) { - reference.set(Boolean.FALSE); + reference.set(false); return; } if (sd.getExpiry() <= 0) - reference.set(Boolean.TRUE); //never expires + reference.set(true); //never expires else - reference.set(Boolean.valueOf(sd.getExpiry() > System.currentTimeMillis())); //not expired yet + reference.set(sd.getExpiry() > System.currentTimeMillis()); //not expired yet } catch (Exception e) { diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java index 40bb60bb440..4f6c7e0d05c 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/BaseAuthModule.java @@ -112,7 +112,7 @@ public class BaseAuthModule implements ServerAuthModule, ServerAuthContext { String mandatory = (String) messageInfo.getMap().get(JaspiMessageInfo.MANDATORY_KEY); if (mandatory == null) return false; - return Boolean.valueOf(mandatory); + return Boolean.parseBoolean(mandatory); } protected boolean login(Subject clientSubject, String credentials, diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java index 68cf6906354..4acb425ec8c 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java @@ -131,7 +131,7 @@ public class AsyncMiddleManServletTest configuration.setSendServerVersion(false); String value = initParams.get("outputBufferSize"); if (value != null) - configuration.setOutputBufferSize(Integer.valueOf(value)); + configuration.setOutputBufferSize(Integer.parseInt(value)); proxyConnector = new ServerConnector(proxy, new HttpConnectionFactory(configuration)); proxy.addConnector(proxyConnector); diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index fa38db732e8..20a3870034f 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java @@ -160,7 +160,7 @@ public class ProxyServletTest configuration.setSendServerVersion(false); String value = initParams.get("outputBufferSize"); if (value != null) - configuration.setOutputBufferSize(Integer.valueOf(value)); + configuration.setOutputBufferSize(Integer.parseInt(value)); proxyConnector = new ServerConnector(proxy, new HttpConnectionFactory(configuration)); proxy.addConnector(proxyConnector); diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java index db33e5eac13..7f66c2e5dab 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java @@ -72,10 +72,10 @@ public class DigestAuthenticator extends LoginAuthenticator String mna = configuration.getInitParameter("maxNonceAge"); if (mna != null) - setMaxNonceAge(Long.valueOf(mna)); + setMaxNonceAge(Long.parseLong(mna)); String mnc = configuration.getInitParameter("maxNonceCount"); if (mnc != null) - setMaxNonceCount(Integer.valueOf(mnc)); + setMaxNonceCount(Integer.parseInt(mnc)); } public int getMaxNonceCount() diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index 93a5b018ff1..4b0e3a769fb 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -136,7 +136,7 @@ public class FormAuthenticator extends LoginAuthenticator if (error!=null) setErrorPage(error); String dispatch=configuration.getInitParameter(FormAuthenticator.__FORM_DISPATCH); - _dispatch = dispatch==null?_dispatch:Boolean.valueOf(dispatch); + _dispatch = dispatch==null?_dispatch:Boolean.parseBoolean(dispatch); } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index ae7d629e7a4..e39939e8cc6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -515,7 +515,7 @@ public class Request implements HttpServletRequest } else if (obj instanceof String) { - maxFormContentSize = Integer.valueOf((String)obj); + maxFormContentSize = Integer.parseInt((String)obj); } } @@ -531,7 +531,7 @@ public class Request implements HttpServletRequest } else if (obj instanceof String) { - maxFormKeys = Integer.valueOf((String)obj); + maxFormKeys = Integer.parseInt((String)obj); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java index 0aa2d8c295e..9ca0cafc22d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java @@ -93,7 +93,7 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand protected void doError(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { Object o = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE); - int code = (o instanceof Integer)?((Integer)o).intValue():(o!=null?Integer.valueOf(o.toString()):500); + int code = (o instanceof Integer)?((Integer)o).intValue():(o!=null?Integer.parseInt(o.toString()):500); o = request.getAttribute(RequestDispatcher.ERROR_MESSAGE); String reason = o!=null?o.toString():null; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java index 3bed86cfc45..8b526bf4081 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java @@ -354,7 +354,7 @@ public class AsyncRequestReadTest BufferedReader in = request.getReader(); PrintWriter out =httpResponse.getWriter(); - int read=Integer.valueOf(request.getParameter("read")); + int read=Integer.parseInt(request.getParameter("read")); // System.err.println("read="+read); for (int i=read;i-->0;) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java index 43080eb9be3..e845b8b627a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java @@ -63,10 +63,10 @@ public class DumpHandler extends AbstractHandler.ErrorDispatchHandler if (!isStarted()) return; - if (Boolean.valueOf(request.getParameter("flush"))) + if (Boolean.parseBoolean(request.getParameter("flush"))) response.flushBuffer(); - if (Boolean.valueOf(request.getParameter("empty"))) + if (Boolean.parseBoolean(request.getParameter("empty"))) { baseRequest.setHandled(true); response.setStatus(200); @@ -230,7 +230,7 @@ public class DumpHandler extends AbstractHandler.ErrorDispatchHandler writer.flush(); // commit now - if (!Boolean.valueOf(request.getParameter("no-content-length"))) + if (!Boolean.parseBoolean(request.getParameter("no-content-length"))) response.setContentLength(buf.size()+1000); response.addHeader("Before-Flush",response.isCommitted()?"Committed???":"Not Committed"); buf.writeTo(out); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java index b7b6cbdf7e7..7006ad29cd6 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java @@ -147,7 +147,7 @@ public class ExtendedServerTest extends HttpServerTestBase String s=response.substring(response.indexOf("DispatchedAt=")+13); s=s.substring(0,s.indexOf('\n')); - long dispatched=Long.valueOf(s); + long dispatched=Long.parseLong(s); Assert.assertThat(dispatched, Matchers.greaterThanOrEqualTo(start)); Assert.assertThat(dispatched, Matchers.lessThan(end)); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java index e74815e7808..d769e116c4b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java @@ -910,7 +910,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture // read and check the times are < 999ms String[] times = in.readLine().split(","); for (String t : times) - Assert.assertTrue(Integer.valueOf(t) < 999); + Assert.assertTrue(Integer.parseInt(t) < 999); // read the EOF chunk @@ -940,7 +940,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture // read and check the times are < 999ms times = in.readLine().split(","); for (String t : times) - Assert.assertTrue(t, Integer.valueOf(t) < 999); + Assert.assertTrue(t, Integer.parseInt(t) < 999); // check close Assert.assertTrue(in.readLine() == null); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java index 5c982e205fd..7c45e44526b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java @@ -369,7 +369,7 @@ public class SSLEngineTest if (request.getParameter("dump")!=null) { ServletOutputStream out=response.getOutputStream(); - byte[] buf = new byte[Integer.valueOf(request.getParameter("dump"))]; + byte[] buf = new byte[Integer.parseInt(request.getParameter("dump"))]; // System.err.println("DUMP "+buf.length); for (int i=0;i>> 8); result[i + 1] = (byte)(word & 0xFF); } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java index f901fbf0d25..b223491de50 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushSessionCacheFilter.java @@ -54,7 +54,7 @@ public class PushSessionCacheFilter implements Filter public void init(FilterConfig config) throws ServletException { if (config.getInitParameter("associateDelay") != null) - _associateDelay = Long.valueOf(config.getInitParameter("associateDelay")); + _associateDelay = Long.parseLong(config.getInitParameter("associateDelay")); // Add a listener that is used to collect information about associated resource, // etags and modified dates diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java index bc088d4f1e5..b23aa2b7e65 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java @@ -246,7 +246,7 @@ public class BaseBuilder files.addAll(startArgs.getFiles()); if (!files.isEmpty() && processFileResources(files)) - modified.set(Boolean.TRUE); + modified.set(true); return modified.get(); } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/TestFileInitializer.java b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/TestFileInitializer.java index d33e3f773a5..96277e497c6 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/TestFileInitializer.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/TestFileInitializer.java @@ -59,6 +59,6 @@ public class TestFileInitializer extends FileInitializer } StartLog.log("TESTING MODE","Skipping download of " + uri); - return Boolean.TRUE; + return true; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IPAddressMap.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IPAddressMap.java index 92642d4a868..dd2cd5cf036 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IPAddressMap.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IPAddressMap.java @@ -281,7 +281,7 @@ public class IPAddressMap extends HashMap { if (part.indexOf('-') < 0) { - Integer value = Integer.valueOf(part); + int value = Integer.parseInt(part); _mask.set(value); } else diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java index 3dd99bcafbc..d9e37a4b3dd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java @@ -75,7 +75,7 @@ public class MultiReleaseJarFile implements Closeable if (manifest==null) multiRelease = false; else - multiRelease = Boolean.valueOf(String.valueOf(manifest.getMainAttributes().getValue("Multi-Release"))); + multiRelease = Boolean.parseBoolean(String.valueOf(manifest.getMainAttributes().getValue("Multi-Release"))); Map map = new TreeMap<>(); jarFile.stream() diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java index 5b8c636be6b..e50fa646959 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java @@ -208,7 +208,7 @@ public class Log log_class = StdErrLog.class; LOG = new StdErrLog(); - Boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true")); + boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true")); if(announce) { LOG.debug("Logging to {} via {}", LOG, log_class.getName()); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java index 3b3a0030a66..3a5d1853596 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/thread/strategy/jmh/TestConnection.java @@ -76,7 +76,7 @@ public class TestConnection implements Producer { _request = request; _futureResult = futureResult; - _blocking = Boolean.valueOf(request.get("blocking")); + _blocking = Boolean.parseBoolean(request.get("blocking")); } @Override diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java index fe4b6d5c2ef..cae3782b160 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java @@ -476,7 +476,7 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor String async=node.getString("async-supported",false,true); if (async!=null) { - boolean val = async.length()==0||Boolean.valueOf(async); + boolean val = async.length()==0||Boolean.parseBoolean(async); switch (context.getMetaData().getOrigin(name+".servlet.async-supported")) { case NotSet: @@ -513,7 +513,7 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor String enabled = node.getString("enabled", false, true); if (enabled!=null) { - boolean is_enabled = enabled.length()==0||Boolean.valueOf(enabled); + boolean is_enabled = enabled.length()==0||Boolean.parseBoolean(enabled); switch (context.getMetaData().getOrigin(name+".servlet.enabled")) { case NotSet: @@ -1119,7 +1119,7 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor error = ErrorPageErrorHandler.GLOBAL_ERROR_PAGE; } else - code=Integer.valueOf(error); + code=Integer.parseInt(error); String location = node.getString("location", false, true); if (!location.startsWith("/")) @@ -1814,10 +1814,10 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor String async=node.getString("async-supported",false,true); if (async!=null) - holder.setAsyncSupported(async.length()==0||Boolean.valueOf(async)); + holder.setAsyncSupported(async.length()==0||Boolean.parseBoolean(async)); if (async!=null) { - boolean val = async.length()==0||Boolean.valueOf(async); + boolean val = async.length()==0||Boolean.parseBoolean(async); switch (context.getMetaData().getOrigin(name+".filter.async-supported")) { case NotSet: diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java index 86e45b42310..41f924bca29 100644 --- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java +++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java @@ -170,7 +170,7 @@ public class ExtensionConfig { return defValue; } - return Integer.valueOf(val); + return Integer.parseInt(val); } public final String getParameter(String key, String defValue)