svn commit: r1727422 - in /webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime: ContentType.java ContentTypeBuilder.java

[ve...@apache.org]

Author: veithen
Date: Thu Jan 28 19:19:50 2016
New Revision: 1727422

URL: http://svn.apache.org/viewvc?rev=1727422&view=rev
Log:
Use generics internally in the ContentType implementation.

Modified:
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java?rev=1727422&r1=1727421&r2=1727422&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java Thu Jan 28 19:19:50 2016
@@ -20,7 +20,6 @@ package org.apache.axiom.mime;
 
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -93,7 +92,7 @@ public final class ContentType {
         tokenizer.require('/');
         String subType = tokenizer.requireToken();
         mediaType = new MediaType(primaryType, subType);
-        List parameters = new ArrayList();
+        List<String> parameters = new ArrayList<String>();
         while (tokenizer.expect(';')) {
             String name = tokenizer.expectToken();
             if (name == null) {
@@ -105,17 +104,16 @@ public final class ContentType {
             tokenizer.require('=');
             parameters.add(tokenizer.requireTokenOrQuotedString());
         }
-        this.parameters = (String[])parameters.toArray(new String[parameters.size()]);
+        this.parameters = parameters.toArray(new String[parameters.size()]);
     }
     
-    ContentType(MediaType mediaType, Map parameters) {
+    ContentType(MediaType mediaType, Map<String,String> parameters) {
         this.mediaType = mediaType;
         this.parameters = new String[parameters.size()*2];
         int i = 0;
-        for (Iterator it = parameters.entrySet().iterator(); it.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)it.next();
-            this.parameters[i++] = (String)entry.getKey();
-            this.parameters[i++] = (String)entry.getValue();
+        for (Map.Entry<String,String> entry : parameters.entrySet()) {
+            this.parameters[i++] = entry.getKey();
+            this.parameters[i++] = entry.getValue();
         }
     }
     
@@ -175,7 +173,7 @@ public final class ContentType {
         return buffer.toString();
     }
 
-    void getParameters(Map map) {
+    void getParameters(Map<String,String> map) {
         for (int i=0; i<parameters.length; i+=2) {
             map.put(parameters[i].toLowerCase(Locale.ENGLISH), parameters[i+1]);
         }

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java?rev=1727422&r1=1727421&r2=1727422&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java Thu Jan 28 19:19:50 2016
@@ -28,7 +28,7 @@ import java.util.Locale;
  */
 public final class ContentTypeBuilder {
     private MediaType mediaType;
-    private final LinkedHashMap/*<String,String>*/ parameters = new LinkedHashMap();
+    private final LinkedHashMap<String,String> parameters = new LinkedHashMap<String,String>();
     
     /**
      * Constructor that initializes the builder with a media type and no parameters.
@@ -92,7 +92,7 @@ public final class ContentTypeBuilder {
      *         found
      */
     public String getParameter(String name) {
-        return (String)parameters.get(name.toLowerCase(Locale.ENGLISH));
+        return parameters.get(name.toLowerCase(Locale.ENGLISH));
     }
 
     /**