Merge remote-tracking branch 'Juiceman/boxing-and-unboxing' into next

src/freenet/client/DefaultMIMETypes.java

@@ -65,25 +65,24 @@ protected static synchronized void addMIMEType(short number, String type) {
 	 */
 	protected static synchronized void addMIMEType(short number, String type, String[] extensions, String outExtension) {
 		addMIMEType(number, type);
-		Short t = Short.valueOf(number);
 		if(extensions != null) {
 			for(String ext : extensions) {
 				ext = ext.toLowerCase();
 				Short s = mimeTypesByExtension.get(ext);
 				if(s != null) {
 					// No big deal
-					Logger.normal(DefaultMIMETypes.class, "Extension "+ext+" assigned to "+byNumber(s.shortValue())+" in preference to "+number+ ':' +type);
+					Logger.normal(DefaultMIMETypes.class, "Extension "+ext+" assigned to "+byNumber(s)+" in preference to "+number+ ':' +type);
 				} else {
 					// If only one, make it primary
 					if((outExtension == null) && (extensions.length == 1))
-						primaryExtensionByMimeNumber.put(t, ext);
-					mimeTypesByExtension.put(ext, t);
+						primaryExtensionByMimeNumber.put(number, ext);
+					mimeTypesByExtension.put(ext, number);
 				}
 			}
-			allExtensionsByMimeNumber.put(t, extensions);
+			allExtensionsByMimeNumber.put(number, extensions);
 		}
 		if(outExtension != null)
-			primaryExtensionByMimeNumber.put(t, outExtension);
+			primaryExtensionByMimeNumber.put(number, outExtension);
 
 	}
 
@@ -118,9 +117,7 @@ public synchronized static String byNumber(short x) {
 	 * types, in which case it will have to be sent uncompressed.
 	 */
 	public synchronized static short byName(String s) {
-		Short x = mimeTypesByName.get(s);
-		if(x != null) return x.shortValue();
-		else return -1;
+		return mimeTypesByName.getOrDefault(s, (short) -1);
 	}
 
 	/* From toad's /etc/mime.types

src/freenet/client/FailureCodeTracker.java

@@ -50,7 +50,7 @@ public FailureCodeTracker(boolean isInsert, SimpleFieldSet fs) {
 			int num = Integer.parseInt(name);
 			int count = Integer.parseInt(f.get("Count"));
 			if(count < 0) throw new IllegalArgumentException("Count < 0");
-			map.put(Integer.valueOf(num), count);
+			map.put(num, count);
 			total += count;
 		}
 	}
@@ -192,7 +192,7 @@ public synchronized SimpleFieldSet toFieldSet(boolean verbose) {
 		for (Map.Entry<Integer, Integer> e : map.entrySet()) {
 			Integer k = e.getKey();
 			Integer item = e.getValue();
-			int code = k.intValue();
+			int code = k;
 			// prefix.num.Description=<code description>
 			// prefix.num.Count=<count>
 			if(verbose)
@@ -219,7 +219,7 @@ public InsertExceptionMode getFirstCodeInsert() {
     }
 
 	public synchronized int getFirstCode() {
-		return ((Integer) map.keySet().toArray()[0]).intValue();
+		return (Integer) map.keySet().toArray()[0];
 	}
 
 	public synchronized boolean isFatal(boolean insert) {

src/freenet/client/async/USKManager.java

@@ -126,7 +126,7 @@ public void init(ClientContext context) {
 	public synchronized long lookupKnownGood(USK usk) {
 		Long l = latestKnownGoodByClearUSK.get(usk.clearCopy());
 		if(l != null)
-			return l.longValue();
+			return l;
 		else return -1;
 	}
 
@@ -138,7 +138,7 @@ public synchronized long lookupKnownGood(USK usk) {
 	public synchronized long lookupLatestSlot(USK usk) {
 		Long l = latestSlotByClearUSK.get(usk.clearCopy());
 		if(l != null)
-			return l.longValue();
+			return l;
 		else return -1;
 	}
 
@@ -431,17 +431,17 @@ void updateKnownGood(final USK origUSK, final long number, final ClientContext c
 		synchronized(this) {
 			Long l = latestKnownGoodByClearUSK.get(clear);
 			if(logMINOR) Logger.minor(this, "Old known good: "+l);
-			if((l == null) || (number > l.longValue())) {
-				l = Long.valueOf(number);
+			if((l == null) || (number > l)) {
+				l = number;
 				latestKnownGoodByClearUSK.put(clear, l);
 				if(logMINOR) Logger.minor(this, "Put "+number);
 			} else
 				return; // If it's in KnownGood, it will also be in Slot
 
 			l = latestSlotByClearUSK.get(clear);
 			if(logMINOR) Logger.minor(this, "Old slot: "+l);
-			if((l == null) || (number > l.longValue())) {
-				l = Long.valueOf(number);
+			if((l == null) || (number > l)) {
+				l = number;
 				latestSlotByClearUSK.put(clear, l);
 				if(logMINOR) Logger.minor(this, "Put "+number);
 				newSlot = true;
@@ -471,8 +471,8 @@ void updateSlot(final USK origUSK, final long number, final ClientContext contex
 		synchronized(this) {
 			Long l = latestSlotByClearUSK.get(clear);
 			if(logMINOR) Logger.minor(this, "Old slot: "+l);
-			if((l == null) || (number > l.longValue())) {
-				l = Long.valueOf(number);
+			if((l == null) || (number > l)) {
+				l = number;
 				latestSlotByClearUSK.put(clear, l);
 				if(logMINOR) Logger.minor(this, "Put "+number);
 			} else

src/freenet/client/filter/FlacFilter.java

@@ -56,8 +56,8 @@ public void readFilter(
 					boolean firstHalfOfSyncHeaderFound = false;
 					ArrayList<Byte> buffer = new ArrayList<Byte>();
 					int data = 0;
-					buffer.add(Byte.valueOf((byte) ((frameHeader & 0xFF00) >>> 8)));
-					buffer.add(Byte.valueOf((byte) (frameHeader & 0x00FF)));
+					buffer.add((byte) ((frameHeader & 0xFF00) >>> 8));
+					buffer.add((byte) (frameHeader & 0x00FF));
 					boolean running = true;
 					while(running) {
 						try {
@@ -90,10 +90,10 @@ public void readFilter(
 								packet = new FlacFrame(payload);
 							} else {
 								firstHalfOfSyncHeaderFound = false;
-								buffer.add(Byte.valueOf((byte) 0xFF));
+								buffer.add((byte) 0xFF);
 							}
 						}
-						buffer.add(Byte.valueOf((byte) (data & 0xFF)));
+						buffer.add((byte) (data & 0xFF));
 					}
 				}
 				if(currentState == State.UNINITIALIZED && packet instanceof FlacMetadataBlock && ((FlacMetadataBlock) packet).isLastMetadataBlock()) {

src/freenet/client/filter/OggPage.java

@@ -145,10 +145,10 @@ public OggPage(OggPage oldPage, Collection<CodecPacket> packets) throws IOExcept
 			int concludingPartialSegment = packet.payload.length % 255;
 			Logger.minor(this, "Whole segments: "+wholeSegments+" Partial: "+concludingPartialSegment);
 			for(int i = 0; i < wholeSegments; i++) {
-				segmentSizes.add(Byte.valueOf(intToUnsignedByte(255)));
+				segmentSizes.add(intToUnsignedByte(255));
 			}
 			if(concludingPartialSegment != 0) {
-				segmentSizes.add(Byte.valueOf(intToUnsignedByte(concludingPartialSegment)));
+				segmentSizes.add(intToUnsignedByte(concludingPartialSegment));
 			}
 			Logger.minor(this, "Writing packet sized: "+packet.payload.length);
 			payloadStream.write(packet.payload);

src/freenet/clients/http/ConfigToadlet.java

@@ -597,7 +597,7 @@ public void handleMethodGET(URI uri, HTTPRequest req, ToadletContext ctx)
 					break;
 				case BOOLEAN:
 					configItemValueNode.addChild(addBooleanComboBox(
-							Boolean.valueOf(value), fullName,
+							Boolean.parseBoolean(value), fullName,
 							callback.isReadOnly()));
 					break;
 				case DIRECTORY:

src/freenet/clients/http/ConnectionsToadlet.java

@@ -503,7 +503,7 @@ public void handleMethodGET(URI uri, final HTTPRequest request, ToadletContext c
 								//i now points to the proper location (equal, insertion point, or end-of-list)
 								//maybe better called "reverseGroup"?
 								List<PeerNodeStatus> peerGroup;
-								if (i<max && locations.get(i).doubleValue()==location) {
+								if (i<max && locations.get(i) ==location) {
 									peerGroup=peerGroups.get(i);
 								} else {
 									peerGroup=new ArrayList<PeerNodeStatus>();
@@ -737,7 +737,7 @@ public void handleMethodPOST(URI uri, final HTTPRequest request, ToadletContext
 				PeerAdditionReturnCodes result=addNewNode(nodesToAdd[i].trim().concat("\nEnd"), privateComment, trust, visibility);
 				//Store the result
 				Integer prev = results.get(result);
-				if(prev == null) prev = Integer.valueOf(0);
+				if(prev == null) prev = 0;
 				results.put(result, prev+1);
 			}
 
@@ -1154,7 +1154,7 @@ private void drawMessageTypes(HTMLNode peerTable, PeerNodeStatus peerNodeStatus)
 			String messageName = entry.getKey();
 			Long messageCount = entry.getValue();
 			messageNames.add(messageName);
-			messageCounts.put(messageName, new Long[] { messageCount, Long.valueOf(0) });
+			messageCounts.put(messageName, new Long[] { messageCount, 0L});
 		}
 		for (Map.Entry<String,Long> entry : peerNodeStatus.getLocalMessagesSent().entrySet() ) {
 			String messageName =  entry.getKey();
@@ -1164,7 +1164,7 @@ private void drawMessageTypes(HTMLNode peerTable, PeerNodeStatus peerNodeStatus)
 			}
 			Long[] existingCounts = messageCounts.get(messageName);
 			if (existingCounts == null) {
-				messageCounts.put(messageName, new Long[] { Long.valueOf(0), messageCount });
+				messageCounts.put(messageName, new Long[] {0L, messageCount });
 			} else {
 				existingCounts[1] = messageCount;
 			}

src/freenet/clients/http/HTTPRequestImpl.java

@@ -876,7 +876,7 @@ public String[] getParts() {
 	@Override
 	public boolean isIncognito() {
 		if(isParameterSet("incognito"))
-			return Boolean.valueOf(getParam("incognito"));
+			return Boolean.parseBoolean(getParam("incognito"));
 		return false;
 	}
 

src/freenet/clients/http/LocalFileInsertToadlet.java

@@ -54,7 +54,7 @@ protected Hashtable<String, String> persistenceFields (Hashtable<String, String>
 		}
 
 		String element = set.get("compress");
-		if (element != null && Boolean.valueOf(element)) {
+		if (element != null && Boolean.parseBoolean(element)) {
 			fieldPairs.put("compress", element);
 		}
 

src/freenet/clients/http/StatisticsToadlet.java

@@ -1397,15 +1397,15 @@ private void addNodeCircle (HTMLNode circleTable, double myLocation) {
 		for(int i=0; i<locations.length; i++){
 			location = locations[i];
 			locationTime = timestamps[i];
-			age = now - locationTime.longValue();
+			age = now - locationTime;
 			if( age > MAX_CIRCLE_AGE_THRESHOLD ) {
 				age = MAX_CIRCLE_AGE_THRESHOLD;
 			}
 			strength = 1 - ((double) age / MAX_CIRCLE_AGE_THRESHOLD );
-			histogramIndex = (int) (Math.floor(location.doubleValue() * HISTOGRAM_LENGTH));
+			histogramIndex = (int) (Math.floor(location * HISTOGRAM_LENGTH));
 			histogram[histogramIndex]++;
 
-			nodeCircleInfoboxContent.addChild("span", new String[] { "style", "class" }, new String[] { generatePeerCircleStyleString(location.doubleValue(), false, strength), "connected" }, "x");
+			nodeCircleInfoboxContent.addChild("span", new String[] { "style", "class" }, new String[] { generatePeerCircleStyleString(location, false, strength), "connected" }, "x");
 		}
 		nodeCircleInfoboxContent.addChild("span", new String[] { "style", "class" }, new String[] { generatePeerCircleStyleString(myLocation, true, 1.0), "me" }, "x");
 		//

src/freenet/clients/http/wizardsteps/BANDWIDTH_MONTHLY.java

@@ -100,7 +100,7 @@ public String postStep(HTTPRequest request)  {
 		// Target for an error page.
 		StringBuilder target = new StringBuilder(FirstTimeWizardToadlet.WIZARD_STEP.BANDWIDTH_MONTHLY.name()).append("&parseTarget=");
 		try {
-			GBPerMonth = Double.valueOf(capTo);
+			GBPerMonth = Double.parseDouble(capTo);
 			bytesPerMonth = Math.round(GBPerMonth * DatastoreUtil.oneGiB);
 		} catch (NumberFormatException e) {
 			target.append(URLEncoder.encode(capTo, true));

src/freenet/crypt/Util.java

@@ -324,7 +324,7 @@ public static BlockCipher getCipherByName(String name, int keySize) {
 			return (BlockCipher) Loader.getInstance(
 				"freenet.crypt.ciphers." + name,
 				new Class<?>[] { Integer.class },
-				new Object[] { Integer.valueOf(keySize)});
+				new Object[] {keySize});
 		} catch (Exception e) {
 			//throw new UnsupportedCipherException(""+e);
 			e.printStackTrace();

src/freenet/io/comm/DMT.java

@@ -1609,7 +1609,7 @@ public static Message createFNPBestRoutesNotTaken(double[] locs) {
 
 	public static Message createFNPBestRoutesNotTaken(Double[] doubles) {
 		double[] locs = new double[doubles.length];
-		for(int i=0;i<locs.length;i++) locs[i] = doubles[i].doubleValue();
+		for(int i=0;i<locs.length;i++) locs[i] = doubles[i];
 		return createFNPBestRoutesNotTaken(locs);
 	}
 

src/freenet/io/comm/MessageCore.java

@@ -616,9 +616,9 @@ public Map<String, Integer> getUnclaimedFIFOMessageCounts() {
 				String messageName = m.getSpec().getName();
 				Integer messageCount = messageCounts.get(messageName);
 				if (messageCount == null) {
-					messageCounts.put(messageName, Integer.valueOf(1) );
+					messageCounts.put(messageName, 1);
 				} else {
-					messageCount = Integer.valueOf(messageCount.intValue() + 1);
+					messageCount = messageCount + 1;
 					messageCounts.put(messageName, messageCount );
 				}
 			}

src/freenet/io/comm/MessageType.java

@@ -51,15 +51,15 @@ public MessageType(String name, short priority, boolean internal, boolean isLoss
 		this.isLossyPacketMessage = isLossyPacketMessage;
 		internalOnly = internal;
 		// XXX hashCode() is NOT required to be unique!
-		Integer id = Integer.valueOf(name.hashCode());
+		Integer id = name.hashCode();
 		if (_specs.containsKey(id)) {
 			throw new RuntimeException("A message type by the name of " + name + " already exists!");
 		}
 		_specs.put(id, this);
 	}
 
 	public void unregister() {
-		_specs.remove(Integer.valueOf(_name.hashCode()));
+		_specs.remove(_name.hashCode());
 	}
 
 	public void addLinkedListField(String name, Class<?> parameter) {

src/freenet/node/DarknetPeerNode.java

@@ -472,7 +472,7 @@ public boolean readExtraPeerData() {
 			synchronized(extraPeerDataFileNumbers) {
 				extraPeerDataFileNumbers.add(fileNumber);
 			}
-			readResult = readExtraPeerDataFile(extraPeerDataFile, fileNumber.intValue());
+			readResult = readExtraPeerDataFile(extraPeerDataFile, fileNumber);
 			if(!readResult) {
 				gotError = true;
 			}
@@ -733,7 +733,7 @@ public void removeExtraPeerDataDir() {
 			localFileNumbers = extraPeerDataFileNumbers.toArray(new Integer[extraPeerDataFileNumbers.size()]);
 		}
 		for (Integer localFileNumber : localFileNumbers) {
-			deleteExtraPeerDataFile(localFileNumber.intValue());
+			deleteExtraPeerDataFile(localFileNumber);
 		}
 		extraPeerDataPeerDir.delete();
 	}
@@ -826,7 +826,7 @@ public void sendQueuedN2NMs() {
 		}
 		Arrays.sort(localFileNumbers);
 		for (Integer localFileNumber : localFileNumbers) {
-			rereadExtraPeerDataFile(localFileNumber.intValue());
+			rereadExtraPeerDataFile(localFileNumber);
 		}
 	}
 

src/freenet/node/Node.java

@@ -4287,7 +4287,7 @@ public synchronized void registerNodeToNodeMessageListener(int type, NodeToNodeM
 	 * Handle a received node to node message
 	 */
 	public void receivedNodeToNodeMessage(Message m, PeerNode src) {
-		int type = ((Integer) m.getObject(DMT.NODE_TO_NODE_MESSAGE_TYPE)).intValue();
+		int type = (Integer) m.getObject(DMT.NODE_TO_NODE_MESSAGE_TYPE);
 		ShortBuffer messageData = (ShortBuffer) m.getObject(DMT.NODE_TO_NODE_MESSAGE_DATA);
 		receivedNodeToNodeMessage(src, type, messageData, false);
 	}

src/freenet/node/NodeDispatcher.java

@@ -846,8 +846,7 @@ public void run() {
 	private boolean handleRoutedRejected(Message m) {
 		if(!node.enableRoutedPing()) return true;
 		long id = m.getLong(DMT.UID);
-		Long lid = Long.valueOf(id);
-		RoutedContext rc = routedContexts.get(lid);
+		RoutedContext rc = routedContexts.get(id);
 		if(rc == null) {
 			// Gah
 			Logger.error(this, "Unrecognized FNPRoutedRejected");
@@ -886,12 +885,11 @@ boolean handleRouted(Message m, PeerNode source) {
 		if(logMINOR) Logger.minor(this, "handleRouted("+m+ ')');
 
 		long id = m.getLong(DMT.UID);
-		Long lid = Long.valueOf(id);
 		short htl = m.getShort(DMT.HTL);
 		byte[] identity = ((ShortBuffer) m.getObject(DMT.NODE_IDENTITY)).getData();
 		if(source != null) htl = source.decrementHTL(htl);
 		RoutedContext ctx;
-		ctx = routedContexts.get(lid);
+		ctx = routedContexts.get(id);
 		if(ctx != null) {
 			try {
 				source.sendAsync(DMT.createFNPRoutedRejected(id, htl), null, nodeStats.routedMessageCtr);
@@ -902,7 +900,7 @@ boolean handleRouted(Message m, PeerNode source) {
 		}
 		ctx = new RoutedContext(m, source, identity);
 		synchronized (routedContexts) {
-			routedContexts.put(lid, ctx);
+			routedContexts.put(id, ctx);
 		}
 		// source == null => originated locally, keep full htl
 		double target = m.getDouble(DMT.TARGET_LOCATION);
@@ -930,8 +928,7 @@ boolean handleRoutedReply(Message m) {
 		if(!node.enableRoutedPing()) return true;
 		long id = m.getLong(DMT.UID);
 		if(logMINOR) Logger.minor(this, "Got reply: "+m);
-		Long lid = Long.valueOf(id);
-		RoutedContext ctx = routedContexts.get(lid);
+		RoutedContext ctx = routedContexts.get(id);
 		if(ctx == null) {
 			Logger.error(this, "Unrecognized routed reply: "+m);
 			return false;