Remove unneeded Auto boxing / unboxing

dizzzz · dizzzz · commit cb9852dac661 · 2019-12-30T23:18:14.000+01:00
diff --git a/exist-core/src/main/java/org/exist/client/ClientFrame.java b/exist-core/src/main/java/org/exist/client/ClientFrame.java
@@ -1687,7 +1687,7 @@ public static int showErrorMessageQuery(final String message, final Throwable t)
         if (result == null) {
             return 2;
         }
-        return ((Integer) optionPane.getValue()).intValue();
+        return (Integer) optionPane.getValue();
     }
 
     /*
diff --git a/exist-core/src/main/java/org/exist/client/ConnectionDialog.java b/exist-core/src/main/java/org/exist/client/ConnectionDialog.java
@@ -577,7 +577,7 @@ private void lstFavouritesMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
                 tpConnectionType.setSelectedIndex(cmbConnectionType.getSelectedIndex());
 
                 txtServerUri.setText(favourite.getUri());
-                chkSsl.setSelected(Boolean.valueOf(favourite.isSsl()));
+                chkSsl.setSelected(favourite.isSsl());
 
                 txtConfiguration.setText(favourite.getConfiguration());
 
diff --git a/exist-core/src/main/java/org/exist/client/InteractiveClient.java b/exist-core/src/main/java/org/exist/client/InteractiveClient.java
@@ -847,8 +847,8 @@ protected boolean process(final String line) {
                     String p1;
                     String p2;
                     while (true) {
-                        p1 = console.readLine("password: ", Character.valueOf('*'));
-                        p2 = console.readLine("re-enter password: ", Character.valueOf('*'));
+                        p1 = console.readLine("password: ", '*');
+                        p2 = console.readLine("re-enter password: ", '*');
                         if (p1.equals(p2)) {
                             break;
                         }
@@ -914,8 +914,8 @@ protected boolean process(final String line) {
                     String p1;
                     String p2;
                     while (true) {
-                        p1 = console.readLine("password: ", Character.valueOf('*'));
-                        p2 = console.readLine("re-enter password: ", Character.valueOf('*'));
+                        p1 = console.readLine("password: ", '*');
+                        p2 = console.readLine("re-enter password: ", '*');
                         if (p1.equals(p2)) {
                             break;
                         }
@@ -2193,7 +2193,7 @@ public boolean run(final String args[]) throws Exception {
 
             } else if (options.username.isPresent() && !options.password.isPresent()) {
                 try {
-                    properties.setProperty(PASSWORD, console.readLine("password: ", Character.valueOf('*')));
+                    properties.setProperty(PASSWORD, console.readLine("password: ", '*'));
                 } catch (final Exception e) {
                 }
             }
diff --git a/exist-core/src/main/java/org/exist/client/TriggersDialog.java b/exist-core/src/main/java/org/exist/client/TriggersDialog.java
@@ -274,7 +274,7 @@ public Component getTableCellRendererComponent(final JTable table, final Object
             }
     
             // Set the state
-            setSelected((value != null && ((Boolean) value).booleanValue()));
+            setSelected((value != null && (Boolean) value));
             return this;
         }
     }
diff --git a/exist-core/src/main/java/org/exist/config/ConfigurationImpl.java b/exist-core/src/main/java/org/exist/config/ConfigurationImpl.java
@@ -298,7 +298,7 @@ public Boolean getPropertyBoolean(final String name) {
 
     public Boolean getPropertyBoolean(String name, boolean defaultValue) {
         Boolean value = getPropertyBoolean(name);
-        if(value == null) return Boolean.valueOf(defaultValue);
+        if(value == null) return defaultValue;
 
         return value;
     }
@@ -340,7 +340,7 @@ public Long getPropertyLong(final String name, final Long defaultValue, final bo
         }
         final long result = Long.parseLong(value);
         if ((positive) && (result < 0)) {
-            return defaultValue.longValue();
+            return defaultValue;
         }
         return result;
     }
diff --git a/exist-core/src/main/java/org/exist/http/servlets/HttpResponseWrapper.java b/exist-core/src/main/java/org/exist/http/servlets/HttpResponseWrapper.java
@@ -212,7 +212,7 @@ public void sendRedirect(String url) throws IOException {
 	 * @param value the header value
 	 */
 	public void setDateHeader(String name, long value) {
-		dateHeaders.put(name, Long.valueOf(value) );
+		dateHeaders.put(name, value);
 		response.setDateHeader(name, value);
 	}
 
@@ -227,7 +227,7 @@ public long getDateHeader(String name) {
 		long ret = 0;
 		final Long val = dateHeaders.get(name);
 		if ( val != null )
-			{ret = val.longValue();}
+			{ret = val;}
 		return ret;
 	}
 	
diff --git a/exist-core/src/main/java/org/exist/launcher/ConfigurationDialog.java b/exist-core/src/main/java/org/exist/launcher/ConfigurationDialog.java
@@ -61,10 +61,10 @@ public ConfigurationDialog(Consumer<Boolean> callback) {
         try {
             Configuration existConfig = new Configuration();
             final int cacheSizeProp = existConfig.getInteger(DefaultCacheManager.PROPERTY_CACHE_SIZE);
-            cacheSize.setValue(Integer.valueOf(cacheSizeProp));
+            cacheSize.setValue(cacheSizeProp);
             
             final int collectionCacheProp = existConfig.getInteger(CollectionCache.PROPERTY_CACHE_SIZE_BYTES);
-            collectionCache.setValue(Integer.valueOf(collectionCacheProp / 1024 / 1024)); // show in MB
+            collectionCache.setValue(collectionCacheProp / 1024 / 1024); // show in MB
 
             final Path dir = (Path)existConfig.getProperty(BrokerPool.PROPERTY_DATA_DIR);
             dataDir.setText(dir.toAbsolutePath().toString());
@@ -190,7 +190,7 @@ private void initComponents() {
         gridBagConstraints.insets = new java.awt.Insets(0, 22, 0, 0);
         getContentPane().add(jLabel2, gridBagConstraints);
 
-        maxMemory.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(1024), Integer.valueOf(512), null, Integer.valueOf(64)));
+        maxMemory.setModel(new javax.swing.SpinnerNumberModel(1024, 512, null, 64));
         maxMemory.addChangeListener(this::maxMemoryChanged);
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 3;
diff --git a/exist-core/src/main/java/org/exist/protocolhandler/xmlrpc/XmlrpcUpload.java b/exist-core/src/main/java/org/exist/protocolhandler/xmlrpc/XmlrpcUpload.java
@@ -96,7 +96,7 @@ public void stream(XmldbURL xmldbURL, InputStream is) throws IOException {
                     params.add(handle);
                 }
                 params.add(buf);
-                params.add(Integer.valueOf(len));
+                params.add(len);
                 handle = (String)client.execute("upload", params);
             }
             
diff --git a/exist-core/src/main/java/org/exist/util/Configuration.java b/exist-core/src/main/java/org/exist/util/Configuration.java
@@ -1114,7 +1114,7 @@ private void configureRecovery( final Optional<Path> dbHome, Element recovery )
         if( option != null ) {
             value = "yes".equals(option);
         }
-        setProperty( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART, Boolean.valueOf( value ) );
+        setProperty( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART, value);
         LOG.debug( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART + ": " + config.get( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART ) );
 
         option = getConfigAttributeValue( recovery, BrokerPool.RECOVERY_POST_RECOVERY_CHECK );
@@ -1123,7 +1123,7 @@ private void configureRecovery( final Optional<Path> dbHome, Element recovery )
         if( option != null ) {
             value = "yes".equals(option);
         }
-        setProperty( BrokerPool.PROPERTY_RECOVERY_CHECK, Boolean.valueOf( value ) );
+        setProperty( BrokerPool.PROPERTY_RECOVERY_CHECK, value);
         LOG.debug( BrokerPool.PROPERTY_RECOVERY_CHECK + ": " + config.get( BrokerPool.PROPERTY_RECOVERY_CHECK ) );
     }
 
@@ -1375,7 +1375,7 @@ private void configureIndexer( final Optional<Path> dbHome, Document doc, Elemen
                     LOG.warn( "parameter index-depth should be >= 3 or you will experience a severe " + "performance loss for node updates (XUpdate or XQuery update extensions)" );
                     depth = 3;
                 }
-                config.put( NativeBroker.PROPERTY_INDEX_DEPTH, Integer.valueOf(depth) );
+                config.put( NativeBroker.PROPERTY_INDEX_DEPTH, depth);
                 LOG.debug( NativeBroker.PROPERTY_INDEX_DEPTH + ": " + config.get( NativeBroker.PROPERTY_INDEX_DEPTH ) );
             }
             catch( final NumberFormatException e ) {
diff --git a/exist-core/src/main/java/org/exist/xmldb/AbstractRemoteResource.java b/exist-core/src/main/java/org/exist/xmldb/AbstractRemoteResource.java
@@ -287,7 +287,7 @@ protected void getRemoteContentIntoLocalFile(final OutputStream os, final boolea
                 method = "getNextChunk";
             }
 
-            long offset = ((Integer) table.get("offset")).intValue();
+            long offset = (Integer) table.get("offset");
             byte[] data = (byte[]) table.get("data");
             final boolean isCompressed = "yes".equals(properties.getProperty(EXistOutputKeys.COMPRESS_OUTPUT, "no"));
 
@@ -361,7 +361,7 @@ protected final int getInMemorySize(Properties properties) {
         if (inMemoryBufferSize == null) {
             inMemoryBufferSize = new LazyVal<>(() -> Integer.parseInt(properties.getProperty("in-memory-buffer-size", Integer.toString(VirtualTempPath.DEFAULT_IN_MEMORY_SIZE))));
         }
-        return inMemoryBufferSize.get().intValue();
+        return inMemoryBufferSize.get();
     }
 
     protected static InputStream getAnyStream(final Object obj)
diff --git a/exist-core/src/main/java/org/exist/xmldb/RemoteIndexQueryService.java b/exist-core/src/main/java/org/exist/xmldb/RemoteIndexQueryService.java
@@ -88,7 +88,7 @@ public void reindexDocument(final String name) throws XMLDBException {
     public Occurrences[] getIndexedElements(final boolean inclusive) throws XMLDBException {
         final List<Object> params = new ArrayList<>();
         params.add(collection.getPath());
-        params.add(Boolean.valueOf(inclusive));
+        params.add(inclusive);
         final Object[] result = (Object[]) collection.execute("getIndexedElements", params);
 
         final Stream<Occurrences> occurrences = Arrays.stream(result)
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/session/GetCreationTime.java b/exist-core/src/main/java/org/exist/xquery/functions/session/GetCreationTime.java
@@ -56,7 +56,7 @@ public GetCreationTime(final XQueryContext context) {
     @Override
     public Sequence eval(final Sequence[] args, final Optional<SessionWrapper> session) throws XPathException {
         if (!session.isPresent()) {
-            return XPathUtil.javaObjectToXPath(Integer.valueOf(-1), context);
+            return XPathUtil.javaObjectToXPath(-1, context);
         }
 
         try {
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/session/GetLastAccessedTime.java b/exist-core/src/main/java/org/exist/xquery/functions/session/GetLastAccessedTime.java
@@ -60,7 +60,7 @@ public GetLastAccessedTime(final XQueryContext context) {
     public Sequence eval(final Sequence[] args, final Optional<SessionWrapper> session)
             throws XPathException {
         if (!session.isPresent()) {
-            return XPathUtil.javaObjectToXPath(Integer.valueOf(-1), context);
+            return XPathUtil.javaObjectToXPath(-1, context);
         }
 
         try {
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/session/GetMaxInactiveInterval.java b/exist-core/src/main/java/org/exist/xquery/functions/session/GetMaxInactiveInterval.java
@@ -59,14 +59,14 @@ public GetMaxInactiveInterval(final XQueryContext context) {
     public Sequence eval(final Sequence[] args, final Optional<SessionWrapper> session)
             throws XPathException {
         if (!session.isPresent()) {
-            return XPathUtil.javaObjectToXPath(Integer.valueOf(-1), context);
+            return XPathUtil.javaObjectToXPath(-1, context);
         }
 
         try {
             final int interval = session.get().getMaxInactiveInterval();
-            return XPathUtil.javaObjectToXPath(Integer.valueOf(interval), context);
+            return XPathUtil.javaObjectToXPath(interval, context);
         } catch (final IllegalStateException ise) {
-            return XPathUtil.javaObjectToXPath(Integer.valueOf(-1), context);
+            return XPathUtil.javaObjectToXPath(-1, context);
         }
     }
 }
diff --git a/exist-core/src/main/java/org/exist/xupdate/Modification.java b/exist-core/src/main/java/org/exist/xupdate/Modification.java
@@ -308,7 +308,7 @@ protected void checkFragmentation(Txn transaction, DocumentSet docs) throws EXis
         int fragmentationLimit = -1;
         final Object property = broker.getBrokerPool().getConfiguration().getProperty(DBBroker.PROPERTY_XUPDATE_FRAGMENTATION_FACTOR);
         if (property != null)
-	        {fragmentationLimit = ((Integer)property).intValue();}		
+	        {fragmentationLimit = (Integer) property;}
 	    for(final Iterator<DocumentImpl> i = docs.getDocumentIterator(); i.hasNext(); ) {
 	        final DocumentImpl next = i.next();
 	        if(next.getMetadata().getSplitCount() > fragmentationLimit)
diff --git a/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java b/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java
@@ -209,7 +209,7 @@ public XUpdateProcessor(DBBroker broker, DocumentSet docs)
 			Boolean temp;
 			if ((temp = (Boolean) config.getProperty("indexer.preserve-whitespace-mixed-content"))
 				!= null)
-				{preserveWhitespaceTemp = temp.booleanValue();}
+				{preserveWhitespaceTemp = temp;}
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -1687,7 +1687,7 @@ public static int showErrorMessageQuery(final String message, final Throwable t)`
`1687`	`1687`	`if (result == null) {`
`1688`	`1688`	`return 2;`
`1689`	`1689`	`}`
`1690`		`- return ((Integer) optionPane.getValue()).intValue();`
	`1690`	`+ return (Integer) optionPane.getValue();`
`1691`	`1691`	`}`
`1692`	`1692`
`1693`	`1693`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public Component getTableCellRendererComponent(final JTable table, final Object`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`// Set the state`
`277`		`- setSelected((value != null && ((Boolean) value).booleanValue()));`
	`277`	`+ setSelected((value != null && (Boolean) value));`
`278`	`278`	`return this;`
`279`	`279`	`}`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public Boolean getPropertyBoolean(final String name) {`
`298`	`298`
`299`	`299`	`public Boolean getPropertyBoolean(String name, boolean defaultValue) {`
`300`	`300`	`Boolean value = getPropertyBoolean(name);`
`301`		`- if(value == null) return Boolean.valueOf(defaultValue);`
	`301`	`+ if(value == null) return defaultValue;`
`302`	`302`
`303`	`303`	`return value;`
`304`	`304`	`}`
`@@ -340,7 +340,7 @@ public Long getPropertyLong(final String name, final Long defaultValue, final bo`
`340`	`340`	`}`
`341`	`341`	`final long result = Long.parseLong(value);`
`342`	`342`	`if ((positive) && (result < 0)) {`
`343`		`- return defaultValue.longValue();`
	`343`	`+ return defaultValue;`
`344`	`344`	`}`
`345`	`345`	`return result;`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void stream(XmldbURL xmldbURL, InputStream is) throws IOException {`
`96`	`96`	`params.add(handle);`
`97`	`97`	`}`
`98`	`98`	`params.add(buf);`
`99`		`- params.add(Integer.valueOf(len));`
	`99`	`+ params.add(len);`
`100`	`100`	`handle = (String)client.execute("upload", params);`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ private void configureRecovery( final Optional<Path> dbHome, Element recovery )`
`1114`	`1114`	`if( option != null ) {`
`1115`	`1115`	`value = "yes".equals(option);`
`1116`	`1116`	`}`
`1117`		`- setProperty( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART, Boolean.valueOf( value ) );`
	`1117`	`+ setProperty( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART, value);`
`1118`	`1118`	`LOG.debug( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART + ": " + config.get( BrokerPool.PROPERTY_RECOVERY_FORCE_RESTART ) );`
`1119`	`1119`
`1120`	`1120`	`option = getConfigAttributeValue( recovery, BrokerPool.RECOVERY_POST_RECOVERY_CHECK );`
`@@ -1123,7 +1123,7 @@ private void configureRecovery( final Optional<Path> dbHome, Element recovery )`
`1123`	`1123`	`if( option != null ) {`
`1124`	`1124`	`value = "yes".equals(option);`
`1125`	`1125`	`}`
`1126`		`- setProperty( BrokerPool.PROPERTY_RECOVERY_CHECK, Boolean.valueOf( value ) );`
	`1126`	`+ setProperty( BrokerPool.PROPERTY_RECOVERY_CHECK, value);`
`1127`	`1127`	`LOG.debug( BrokerPool.PROPERTY_RECOVERY_CHECK + ": " + config.get( BrokerPool.PROPERTY_RECOVERY_CHECK ) );`
`1128`	`1128`	`}`
`1129`	`1129`
`@@ -1375,7 +1375,7 @@ private void configureIndexer( final Optional<Path> dbHome, Document doc, Elemen`
`1375`	`1375`	`LOG.warn( "parameter index-depth should be >= 3 or you will experience a severe " + "performance loss for node updates (XUpdate or XQuery update extensions)" );`
`1376`	`1376`	`depth = 3;`
`1377`	`1377`	`}`
`1378`		`- config.put( NativeBroker.PROPERTY_INDEX_DEPTH, Integer.valueOf(depth) );`
	`1378`	`+ config.put( NativeBroker.PROPERTY_INDEX_DEPTH, depth);`
`1379`	`1379`	`LOG.debug( NativeBroker.PROPERTY_INDEX_DEPTH + ": " + config.get( NativeBroker.PROPERTY_INDEX_DEPTH ) );`
`1380`	`1380`	`}`
`1381`	`1381`	`catch( final NumberFormatException e ) {`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ protected void getRemoteContentIntoLocalFile(final OutputStream os, final boolea`
`287`	`287`	`method = "getNextChunk";`
`288`	`288`	`}`
`289`	`289`
`290`		`- long offset = ((Integer) table.get("offset")).intValue();`
	`290`	`+ long offset = (Integer) table.get("offset");`
`291`	`291`	`byte[] data = (byte[]) table.get("data");`
`292`	`292`	`final boolean isCompressed = "yes".equals(properties.getProperty(EXistOutputKeys.COMPRESS_OUTPUT, "no"));`
`293`	`293`
`@@ -361,7 +361,7 @@ protected final int getInMemorySize(Properties properties) {`
`361`	`361`	`if (inMemoryBufferSize == null) {`
`362`	`362`	`inMemoryBufferSize = new LazyVal<>(() -> Integer.parseInt(properties.getProperty("in-memory-buffer-size", Integer.toString(VirtualTempPath.DEFAULT_IN_MEMORY_SIZE))));`
`363`	`363`	`}`
`364`		`- return inMemoryBufferSize.get().intValue();`
	`364`	`+ return inMemoryBufferSize.get();`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`protected static InputStream getAnyStream(final Object obj)`