You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/11/01 15:50:46 UTC

[karaf] branch karaf-4.2.x updated: Some minor efficiency improvements relating to parsing numbers

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new a6db031  Some minor efficiency improvements relating to parsing numbers
a6db031 is described below

commit a6db0310238f5b0079e23f67ebf52d0279da8c64
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Nov 1 13:51:24 2019 +0000

    Some minor efficiency improvements relating to parsing numbers
    
    (cherry picked from commit 2f34be5a226a9e6817a3f7a3e1ab4d12f8afb994)
---
 .../karaf/examples/command/command/AddCommand.java |  2 +-
 .../karaf/examples/jdbc/command/AddCommand.java    |  2 +-
 .../jdbc/provider/BookingServiceJdbcImpl.java      |  2 +-
 .../karaf/http/core/internal/ProxyServlet.java     | 20 +++++++++---------
 .../core/internal/InstanceServiceImpl.java         | 24 +++++++++++-----------
 .../karaf/jdbc/internal/JdbcServiceImpl.java       |  2 +-
 main/src/main/java/org/apache/karaf/main/Main.java |  2 +-
 .../management/KarafMBeanServerGuardTest.java      |  8 ++++----
 .../org/apache/karaf/profile/assembly/Builder.java |  2 +-
 .../karaf/scheduler/core/WhiteboardHandler.java    |  4 ++--
 .../service/guard/impl/GuardProxyCatalogTest.java  |  2 +-
 .../service/guard/impl/GuardingEventHookTest.java  |  2 +-
 .../impl/adapter/BundleEventAdapter.java           |  2 +-
 .../org/apache/karaf/shell/util/ShellUtil.java     | 10 ++++-----
 .../org/apache/karaf/shell/support/ShellUtil.java  |  2 +-
 .../org/apache/karaf/shell/ssh/SshTerminal.java    |  8 ++++----
 16 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java b/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java
index 5585f19..0b4271a 100644
--- a/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java
+++ b/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java
@@ -49,7 +49,7 @@ public class AddCommand implements Action {
         Booking booking = new Booking();
         if (id == 0) {
             Random random = new Random();
-            id = new Long(random.nextInt(9000000) + 1000000);
+            id = Long.valueOf(random.nextInt(9000000) + 1000000);
         }
         booking.setId(id);
         booking.setCustomer(customer);
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java
index c328e31..788f70d 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java
@@ -49,7 +49,7 @@ public class AddCommand implements Action {
         Booking booking = new Booking();
         if (id == 0) {
             Random random = new Random();
-            id = new Long(random.nextInt(9000000) + 1000000);
+            id = Long.valueOf(random.nextInt(9000000) + 1000000);
         }
         booking.setId(id);
         booking.setCustomer(customer);
diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/src/main/java/org/apache/karaf/examples/jdbc/provider/BookingServiceJdbcImpl.java b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/src/main/java/org/apache/karaf/examples/jdbc/provider/BookingServiceJdbcImpl.java
index a8f41a9..473a11d 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/src/main/java/org/apache/karaf/examples/jdbc/provider/BookingServiceJdbcImpl.java
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/src/main/java/org/apache/karaf/examples/jdbc/provider/BookingServiceJdbcImpl.java
@@ -205,7 +205,7 @@ public class BookingServiceJdbcImpl implements BookingService {
 
                 connection.commit();
 
-                booking.setId(new Long(newId));
+                booking.setId(Long.valueOf(newId));
                 LOGGER.debug("Booking created with id = {}", newId);
 
             } catch (SQLException exception) {
diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
index 1043cef..318f3e6 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServlet.java
@@ -174,7 +174,7 @@ public class ProxyServlet extends HttpServlet {
                 throw (RuntimeException) e;
             }
             if (e instanceof ServletException) {
-                throw (IOException) e;
+                throw (ServletException) e;
             }
             throw new RuntimeException(e);
         } finally {
@@ -441,7 +441,7 @@ public class ProxyServlet extends HttpServlet {
             char c = in.charAt(i);
             boolean escape = true;
             if (c < 128) {
-                if (asciiQueryChars.get((int) c)) {
+                if (asciiQueryChars.get(c)) {
                     escape = false;
                 }
             } else if (!Character.isISOControl(c) && !Character.isSpaceChar(c)) {//not-ascii
@@ -472,14 +472,14 @@ public class ProxyServlet extends HttpServlet {
         char[] c_reserved = "?/[]@".toCharArray();//plus punct
 
         asciiQueryChars = new BitSet(128);
-        for (char c = 'a'; c <= 'z'; c++) asciiQueryChars.set((int) c);
-        for (char c = 'A'; c <= 'Z'; c++) asciiQueryChars.set((int) c);
-        for (char c = '0'; c <= '9'; c++) asciiQueryChars.set((int) c);
-        for (char c : c_unreserved) asciiQueryChars.set((int) c);
-        for (char c : c_punct) asciiQueryChars.set((int) c);
-        for (char c : c_reserved) asciiQueryChars.set((int) c);
-
-        asciiQueryChars.set((int) '%');//leave existing percent escapes in place
+        for (char c = 'a'; c <= 'z'; c++) asciiQueryChars.set(c);
+        for (char c = 'A'; c <= 'Z'; c++) asciiQueryChars.set(c);
+        for (char c = '0'; c <= '9'; c++) asciiQueryChars.set(c);
+        for (char c : c_unreserved) asciiQueryChars.set(c);
+        for (char c : c_punct) asciiQueryChars.set(c);
+        for (char c : c_reserved) asciiQueryChars.set(c);
+
+        asciiQueryChars.set('%');//leave existing percent escapes in place
     }
 
 }
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 396721d..3e2eb7a 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -122,8 +122,8 @@ public class InstanceServiceImpl implements InstanceService {
                 LOGGER.debug("Could not read port start value from the root instance configuration.", e);
             }
         }
-        
-        
+
+
     }
 
     public InstanceServiceImpl() {
@@ -276,7 +276,7 @@ public class InstanceServiceImpl implements InstanceService {
             }
         }
     }
-    
+
     private static void logDebug(String message, boolean printOutput, Object... args) {
         if (LOGGER.isDebugEnabled() || printOutput) {
             String formatted = String.format(message, args);
@@ -676,7 +676,7 @@ public class InstanceServiceImpl implements InstanceService {
             Process process;
             try {
                 process = new ProcessBuilderFactoryImpl().newBuilder().attach(pid);
-                process.destroy(); 
+                process.destroy();
             } catch (IOException e) {
                 LOGGER.debug("Unable to cleanly shutdown root instance ", e);
             }
@@ -937,7 +937,7 @@ public class InstanceServiceImpl implements InstanceService {
             }
             File f = new File(instance.loc, path);
             FileLockUtils.execute(f, properties -> {
-                properties.put(key, Integer.valueOf(port).toString());
+                properties.put(key, String.valueOf(port));
             }, true);
             return null;
         }, true);
@@ -1069,7 +1069,7 @@ public class InstanceServiceImpl implements InstanceService {
         result &= fileToDelete.delete();
         return result;
     }
-    
+
     private void copyResourcesToDir(String[] resourcesToCopy, File target, Map<String, URL> resources, boolean printOutput) throws IOException {
         for (String resource : resourcesToCopy) {
             copyResourceToDir(resource, target, resources, printOutput);
@@ -1094,8 +1094,8 @@ public class InstanceServiceImpl implements InstanceService {
     }
 
     private InputStream getResourceStream(String resource, Map<String, URL> resources) throws IOException {
-        return resources.containsKey(resource) 
-                ? resources.remove(resource).openStream() 
+        return resources.containsKey(resource)
+                ? resources.remove(resource).openStream()
                 : getClass().getClassLoader().getResourceAsStream(RESOURCE_BASE + resource);
     }
 
@@ -1117,7 +1117,7 @@ public class InstanceServiceImpl implements InstanceService {
             return null;
         }
     }
-    
+
     /**
      * Read stream one line at a time so that we can use the platform
      * line ending when we write it out.
@@ -1153,7 +1153,7 @@ public class InstanceServiceImpl implements InstanceService {
             copyFilteredResourceToDir(resource, target, resources, props, printOutput);
         }
     }
-    
+
     private void copyFilteredResourceToDir(String resource, File target, Map<String, URL> resources, Map<String, String> props, boolean printOutput) throws IOException {
         File outFile = new File(target, resource);
         if (!outFile.exists()) {
@@ -1267,7 +1267,7 @@ public class InstanceServiceImpl implements InstanceService {
     }
 
     public void changeInstanceSshHost(String name, String host) throws Exception {
-        setKarafHost(name, "etc/org.apache.karaf.shell.cfg", "sshHost", host);      
+        setKarafHost(name, "etc/org.apache.karaf.shell.cfg", "sshHost", host);
     }
 
     private void setKarafHost(final String name, final String path, final String key, final String host) throws IOException {
@@ -1285,7 +1285,7 @@ public class InstanceServiceImpl implements InstanceService {
             return null;
         }, true);
     }
-    
+
     private boolean isInstancePidNeedUpdate(final String name) {
         return execute(state -> {
             InstanceState instance = state.instances.get(name);
diff --git a/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
index 7cf52c9..54f1a99 100644
--- a/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
+++ b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
@@ -232,7 +232,7 @@ public class JdbcServiceImpl implements JdbcService {
     private int getRank(ServiceReference<?> reference) {
         Object rankObj = reference.getProperty(Constants.SERVICE_RANKING);
         // If no rank, then spec says it defaults to zero.
-        rankObj = (rankObj == null) ? new Integer(0) : rankObj;
+        rankObj = (rankObj == null) ? Integer.valueOf(0) : rankObj;
         // If rank is not Integer, then spec says it defaults to zero.
         return (rankObj instanceof Integer) ? (Integer) rankObj : 0;
     }
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java
index 69ca910..d39b479 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -540,7 +540,7 @@ public class Main {
                 BundleInfo bi = new BundleInfo();
                 bi.uri = new URI(key);
                 String startlevelSt = startupProps.getProperty(key).trim();
-                bi.startLevel = new Integer(startlevelSt);
+                bi.startLevel = Integer.valueOf(startlevelSt);
                 bundeList.add(bi);
             } catch (Exception e) {
                 throw new RuntimeException("Error loading startup bundle list from " + startupPropsFile + " at " + key, e);
diff --git a/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java b/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
index 5880d3c..fb1fe0a 100644
--- a/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
+++ b/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
@@ -164,9 +164,9 @@ public class KarafMBeanServerGuardTest extends TestCase {
 
         ObjectName on = ObjectName.getInstance("foo.bar:type=Test");
         assertEquals(Collections.singletonList("editor"),
-                guard.getRequiredRoles(on, "bar", new Object[]{new Integer(17)}, new String[]{"int"}));
+                guard.getRequiredRoles(on, "bar", new Object[]{Integer.valueOf(17)}, new String[]{"int"}));
         assertEquals(Collections.singletonList("viewer"),
-                guard.getRequiredRoles(on, "bar", new Object[]{new Integer(18)}, new String[]{"int"}));
+                guard.getRequiredRoles(on, "bar", new Object[]{Integer.valueOf(18)}, new String[]{"int"}));
     }
 
     public void testRequiredRolesExactNobody() throws Exception {
@@ -369,7 +369,7 @@ public class KarafMBeanServerGuardTest extends TestCase {
         assertEquals(Arrays.asList("tester", "editor", "manager"),
                 guard.getRequiredRoles(on, "getBar", new Object[]{}, new String[]{}));
         assertEquals(Collections.singletonList("admin"),
-                guard.getRequiredRoles(on, "test", new Object[]{new Long(17)}, new String[]{"java.lang.Long"}));
+                guard.getRequiredRoles(on, "test", new Object[]{Long.valueOf(17)}, new String[]{"java.lang.Long"}));
     }
 
     public void testRequiredRolesMethodNameWildcard2() throws Exception {
@@ -428,7 +428,7 @@ public class KarafMBeanServerGuardTest extends TestCase {
         assertEquals(Collections.emptyList(),
                 guard.getRequiredRoles(on, "getBar", new Object[]{}, new String[]{}));
         assertEquals(Collections.singletonList("admin"),
-                guard.getRequiredRoles(on, "test", new Object[]{new Long(17)}, new String[]{"java.lang.Long"}));
+                guard.getRequiredRoles(on, "test", new Object[]{Long.valueOf(17)}, new String[]{"java.lang.Long"}));
     }
 
     @SuppressWarnings("unchecked")
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 272b547..f77cda4 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -1730,7 +1730,7 @@ public class Builder {
                 if (level.startsWith("\"")) {
                     level = level.substring(1, level.length() - 1);
                 }
-                intLevel = Integer.valueOf(level);
+                intLevel = Integer.parseInt(level);
                 LOGGER.debug("bundle start-level: " + level);
                 location = location.substring(0, location.indexOf(START_LEVEL) - 1);
                 LOGGER.debug("new bundle location after strip start-level: " + location);
diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/core/WhiteboardHandler.java b/scheduler/src/main/java/org/apache/karaf/scheduler/core/WhiteboardHandler.java
index c5ff15b..218f396 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/core/WhiteboardHandler.java
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/core/WhiteboardHandler.java
@@ -125,7 +125,7 @@ public class WhiteboardHandler {
                         } else if (v instanceof Number) {
                             times = ((Number) v).intValue();
                         } else {
-                            times = new Integer(v.toString());
+                            times = Integer.valueOf(v.toString());
                         }
                     }
                 }
@@ -135,7 +135,7 @@ public class WhiteboardHandler {
                     if (ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD) instanceof Long) {
                         period = (Long) ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD);
                     } else {
-                        period = new Long((String) ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD));
+                        period = Long.valueOf((String) ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD));
                     }
                     if (period < 1) {
                         this.logger.debug("Ignoring service {} : scheduler period is less than 1.", ref);
diff --git a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
index 7538638..8dec835 100644
--- a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
+++ b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
@@ -153,7 +153,7 @@ public class GuardProxyCatalogTest {
 
         Hashtable<String, Object> props = new Hashtable<>();
         long originalServiceID = 12345678901234L;
-        props.put(Constants.SERVICE_ID, new Long(originalServiceID));
+        props.put(Constants.SERVICE_ID, Long.valueOf(originalServiceID));
         props.put("foo", "bar");
         ServiceReference<?> originalRef = mockServiceReference(props);
 
diff --git a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardingEventHookTest.java b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardingEventHookTest.java
index 2445a85..cc2b83d 100644
--- a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardingEventHookTest.java
+++ b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardingEventHookTest.java
@@ -92,7 +92,7 @@ public class GuardingEventHookTest {
         geh.event(se2, listeners3);
         assertEquals("The service should be hidden from these listeners", 0, listeners3.size());
         assertEquals("Proxy should have been created for this client", 1, gpc.proxyMap.size());
-        assertEquals(new Long(service2ID), gpc.proxyMap.keySet().iterator().next());
+        assertEquals(Long.valueOf(service2ID), gpc.proxyMap.keySet().iterator().next());
 
         // Update the service, now an additional client is interested
         props2.put("a", "c"); // Will change the properties of sref
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
index d5e0b97..745821d 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
@@ -69,7 +69,7 @@ public class BundleEventAdapter extends AbstractAdapter implements SynchronousBu
 
         properties.put(EventConstants.EVENT, event);
 
-        properties.put("bundle.id", new Long(event.getBundle()
+        properties.put("bundle.id", Long.valueOf(event.getBundle()
             .getBundleId()));
 
         final String symbolicName = event.getBundle().getSymbolicName();
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
index a8f3de5..041ef57 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
@@ -113,7 +113,7 @@ public class ShellUtil {
         final String sbslProp = bundleContext.getProperty("karaf.systemBundlesStartLevel");
         if (sbslProp != null) {
             try {
-                sbsl = Integer.valueOf(sbslProp);
+                sbsl = Integer.parseInt(sbslProp);
             } catch (Exception ignore) {
                 // ignore
             }
@@ -142,14 +142,14 @@ public class ShellUtil {
                 LOGGER.debug("Unknown command entered", t);
             } else if (t instanceof CommandException) {
                 LOGGER.debug("Command exception (Undefined option, ...)", t);
-            } else if (!(t instanceof CloseShellException)) {    
+            } else if (!(t instanceof CloseShellException)) {
                 LOGGER.error("Exception caught while executing command", t);
             }
             session.put(SessionProperties.LAST_EXCEPTION, t);
             if (t instanceof CommandException) {
                 session.getConsole().println(((CommandException) t).getNiceHelp());
             } else if (isCommandNotFound) {
-                String str = COLOR_RED + "Command not found: " 
+                String str = COLOR_RED + "Command not found: "
                          + INTENSITY_BOLD + t.getClass().getMethod("getCommand").invoke(t) + INTENSITY_NORMAL
                          + COLOR_DEFAULT;
                 session.getConsole().println(str);
@@ -158,7 +158,7 @@ public class ShellUtil {
                 session.getConsole().print(COLOR_RED);
                 t.printStackTrace(session.getConsole());
                 session.getConsole().print(COLOR_DEFAULT);
-            } else if (!(t instanceof CloseShellException) && !(t instanceof CommandException) && !isCommandNotFound) {    
+            } else if (!(t instanceof CloseShellException) && !(t instanceof CommandException) && !isCommandNotFound) {
                 session.getConsole().print(COLOR_RED);
                 session.getConsole().println("Error executing command: "
                         + (t.getMessage() != null ? t.getMessage() : t.getClass().getName()));
@@ -178,5 +178,5 @@ public class ShellUtil {
             return null;
         }
     }
-    
+
 }
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/ShellUtil.java b/shell/core/src/main/java/org/apache/karaf/shell/support/ShellUtil.java
index 2941515..f2a2be6 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/ShellUtil.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/ShellUtil.java
@@ -116,7 +116,7 @@ public class ShellUtil {
         final String sbslProp = bundleContext.getProperty("karaf.systemBundlesStartLevel");
         if (sbslProp != null) {
             try {
-                sbsl = Integer.valueOf(sbslProp);
+                sbsl = Integer.parseInt(sbslProp);
             } catch (Exception ignore) {
                 // ignore
             }
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
index a002d6e..62b8728 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java
@@ -130,8 +130,8 @@ public class SshTerminal extends ExternalTerminal implements Terminal {
                     break;
             }
         }
-        int w = Integer.valueOf(this.environment.getEnv().get(Environment.ENV_COLUMNS));
-        int h = Integer.valueOf(this.environment.getEnv().get(Environment.ENV_LINES));
+        int w = Integer.parseInt(this.environment.getEnv().get(Environment.ENV_COLUMNS));
+        int h = Integer.parseInt(this.environment.getEnv().get(Environment.ENV_LINES));
         setSize(new Size(w, h));
     }
 
@@ -145,8 +145,8 @@ public class SshTerminal extends ExternalTerminal implements Terminal {
         } else if (signal == org.apache.sshd.server.Signal.CONT) {
             raise(Signal.CONT);
         } else if (signal == org.apache.sshd.server.Signal.WINCH) {
-            int w = Integer.valueOf(this.environment.getEnv().get(Environment.ENV_COLUMNS));
-            int h = Integer.valueOf(this.environment.getEnv().get(Environment.ENV_LINES));
+            int w = Integer.parseInt(this.environment.getEnv().get(Environment.ENV_COLUMNS));
+            int h = Integer.parseInt(this.environment.getEnv().get(Environment.ENV_LINES));
             setSize(new Size(w, h));
             raise(Signal.WINCH);
         }