1 files changed, 13 insertions, 15 deletions

diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java
index a9123506a..8039abdac 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java
+++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2016 Wind River and others.
+ * Copyright (c) 2012, 2018 Wind River and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,11 +18,9 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,18 +28,16 @@ import org.eclipse.equinox.p2.testserver.HttpConstants;
 
 public class Stats extends HttpServlet {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3209768955270841029L;
 	private static final String UnkownPackage = "unkown"; //$NON-NLS-1$
 	private static final String PACKAGE = "package"; //$NON-NLS-1$
-	private Map downloadStats = new HashMap();
+	private final Map<String, Integer> downloadStats = new HashMap<>();
 
 	public Stats() {
 		downloadStats.put(UnkownPackage, Integer.valueOf(0));
 	}
 
+	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		responseHeaderAndStatus(response);
 
@@ -75,15 +71,17 @@ public class Stats extends HttpServlet {
 
 	private String getStatsResult() {
 		StringBuffer sb = new StringBuffer();
-		sb.append("It's a page to count the downloading times when heading this page with query 'package=<package name>'.\n"); //$NON-NLS-1$
-		for (Iterator iter = downloadStats.keySet().iterator(); iter.hasNext();) {
-			String packageName = (String) iter.next();
+		sb.append(
+				"It's a page to count the downloading times when heading this page with query 'package=<package name>'.\n"); //$NON-NLS-1$
+		for (String string : downloadStats.keySet()) {
+			String packageName = string;
 			sb.append(packageName).append(" download number: ").append(downloadStats.get(packageName)).append("\n"); //$NON-NLS-1$//$NON-NLS-2$
 		}
 		return sb.toString();
 	}
 
-	protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	@Override
+	protected void doHead(HttpServletRequest request, HttpServletResponse response) {
 		String queryString = request.getQueryString();
 
 		responseHeaderAndStatus(response);
@@ -91,11 +89,11 @@ public class Stats extends HttpServlet {
 		boolean found = false;
 		if (queryString != null) {
 			String[] parameters = queryString.split("&"); //$NON-NLS-1$
-			for (int i = 0; i < parameters.length; i++) {
-				String[] paraPair = parameters[i].split("=", 2); //$NON-NLS-1$
+			for (String parameter : parameters) {
+				String[] paraPair = parameter.split("=", 2); //$NON-NLS-1$
 				if (paraPair.length == 2 && PACKAGE.equals(paraPair[0])) {
 					found = true;
-					Integer count = (Integer) downloadStats.get(paraPair[1]);
+					Integer count = downloadStats.get(paraPair[1]);
 					if (count == null) {
 						count = Integer.valueOf(1);
 					} else
@@ -106,7 +104,7 @@ public class Stats extends HttpServlet {
 			}
 		}
 		if (!found) {
-			Integer count = (Integer) downloadStats.get(UnkownPackage);
+			Integer count = downloadStats.get(UnkownPackage);
 			downloadStats.put(UnkownPackage, Integer.valueOf(1 + count.intValue()));
 		}
 	}