Fix redundant specification warnings

Signed-off-by: Mark Thomas <[email protected]>

Author: markt-asf

src/main/java/javax/servlet/ServletSecurityElement.java

@@ -36,7 +36,7 @@ public class ServletSecurityElement extends HttpConstraintElement {
      * element and with no HTTP Method specific constraint elements.
      */
     public ServletSecurityElement() {
-        methodConstraints = new HashSet<HttpMethodConstraintElement>();
+        methodConstraints = new HashSet<>();
         methodNames = Collections.emptySet();
     }
 
@@ -52,7 +52,7 @@ public ServletSecurityElement(HttpConstraintElement constraint) {
         super(constraint.getEmptyRoleSemantic(),
                 constraint.getTransportGuarantee(),
                 constraint.getRolesAllowed());
-        methodConstraints = new HashSet<HttpMethodConstraintElement>();
+        methodConstraints = new HashSet<>();
         methodNames = Collections.emptySet();
     }
 
@@ -71,7 +71,7 @@ public ServletSecurityElement(HttpConstraintElement constraint) {
     public ServletSecurityElement(
             Collection<HttpMethodConstraintElement> methodConstraints) {
         this.methodConstraints = (methodConstraints == null ?
-            new HashSet<HttpMethodConstraintElement>() : methodConstraints);
+            new HashSet<>() : methodConstraints);
         methodNames = checkMethodNames(this.methodConstraints);
     }
 
@@ -94,7 +94,7 @@ public ServletSecurityElement(HttpConstraintElement constraint,
                 constraint.getTransportGuarantee(),
                 constraint.getRolesAllowed());
         this.methodConstraints = (methodConstraints == null ?
-            new HashSet<HttpMethodConstraintElement>() : methodConstraints);
+            new HashSet<>() : methodConstraints);
         methodNames = checkMethodNames(this.methodConstraints);
     }
 
@@ -110,7 +110,7 @@ public ServletSecurityElement(ServletSecurity annotation) {
         super(annotation.value().value(),
                 annotation.value().transportGuarantee(),
                 annotation.value().rolesAllowed());
-        this.methodConstraints = new HashSet<HttpMethodConstraintElement>();
+        this.methodConstraints = new HashSet<>();
         for (HttpMethodConstraint constraint :
                 annotation.httpMethodConstraints()) {
             this.methodConstraints.add(
@@ -164,7 +164,7 @@ public Collection<String> getMethodNames() {
      */
     private Collection<String> checkMethodNames(
             Collection<HttpMethodConstraintElement> methodConstraints) {
-        Collection<String> methodNames = new HashSet<String>();
+        Collection<String> methodNames = new HashSet<>();
         for (HttpMethodConstraintElement methodConstraint :
                         methodConstraints) {
             String methodName = methodConstraint.getMethodName();

src/main/java/javax/servlet/http/HttpUtils.java

@@ -81,7 +81,7 @@ public static Hashtable<String, String[]> parseQueryString(String s) {
             throw new IllegalArgumentException();
         }
 
-        Hashtable<String, String[]> ht = new Hashtable<String, String[]>();
+        Hashtable<String, String[]> ht = new Hashtable<>();
         StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(s, "&");
         while (st.hasMoreTokens()) {
@@ -154,7 +154,7 @@ public static Hashtable<String, String[]> parsePostData(int len,
 
 	if (len <=0) {
             // cheap hack to return an empty hash
-	    return new Hashtable<String, String[]>(); 
+	    return new Hashtable<>(); 
         }
 
 	if (in == null) {