Author: hadrian
Date: Tue Nov 10 18:19:49 2009
New Revision: 834579

URL: http://svn.apache.org/viewvc?rev=834579&view=rev
Log:
Long running effort to remove warnings

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
    
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
    
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=834579&r1=834578&r2=834579&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
 Tue Nov 10 18:19:49 2009
@@ -16,19 +16,13 @@
  */
 package org.apache.camel.util;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import static org.apache.camel.util.ObjectHelper.isEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+import static org.apache.camel.util.ObjectHelper.notNull;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.Expression;
 import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.spi.Language;
-
-import static org.apache.camel.util.ObjectHelper.isEmpty;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
  * A number of helper methods

Added: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java?rev=834579&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java 
(added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java 
Tue Nov 10 18:19:49 2009
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.camel.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+...@suppresswarnings("unchecked")
+public final class CastUtils {
+    
+    private CastUtils() {
+        //utility class, never constructed
+    }
+    
+    public static <T, U> Map<T, U> cast(Map<?, ?> p) {
+        return (Map<T, U>)p;
+    }
+    public static <T, U> Map<T, U> cast(Map<?, ?> p, Class<T> t, Class<U> u) {
+        return (Map<T, U>)p;
+    }
+    
+    public static <T> Collection<T> cast(Collection<?> p) {
+        return (Collection<T>)p;
+    }
+    public static <T> Collection<T> cast(Collection<?> p, Class<T> cls) {
+        return (Collection<T>)p;
+    }
+    public static <T> List<T> cast(List<?> p) {
+        return (List<T>)p;
+    }
+    
+    public static <T> List<T> cast(List<?> p, Class<T> cls) {
+        return (List<T>)p;
+    }
+
+    public static <T> Iterator<T> cast(Iterator<?> p) {
+        return (Iterator<T>)p;
+    }
+    
+    public static <T> Iterator<T> cast(Iterator<?> p, Class<T> cls) {
+        return (Iterator<T>)p;
+    }
+    
+    public static <T> Set<T> cast(Set<?> p) {
+        return (Set<T>)p;
+    }
+    public static <T> Set<T> cast(Set<?> p, Class<T> cls) {
+        return (Set<T>)p;
+    }
+
+    public static <T, U> Map.Entry<T, U> cast(Map.Entry<?, ?> p) {
+        return (Map.Entry<T, U>)p;
+    }
+    public static <T, U> Map.Entry<T, U> cast(Map.Entry<?, ?> p, Class<T> pc, 
Class<U> uc) {
+        return (Map.Entry<T, U>)p;
+    }
+}

Modified: 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java?rev=834579&r1=834578&r2=834579&view=diff
==============================================================================
--- 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
 (original)
+++ 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
 Tue Nov 10 18:19:49 2009
@@ -18,20 +18,21 @@
 
 import java.util.AbstractList;
 import java.util.Iterator;
+import java.util.Map;
 
 import net.sf.flatpack.DataSet;
 
 /**
  * @version $Revision$
  */
-public class DataSetList extends AbstractList {
+public class DataSetList extends AbstractList<Map<String, Object>> {
     private final DataSet dataSet;
 
     public DataSetList(DataSet dataSet) {
         this.dataSet = dataSet;
     }
 
-    public Object get(int index) {
+    public Map<String, Object> get(int index) {
         dataSet.absolute(index);
         return FlatpackConverter.toMap(dataSet);
     }
@@ -41,15 +42,14 @@
     }
 
     @Override
-    public Iterator iterator() {
+    public Iterator<Map<String, Object>> iterator() {
         dataSet.goTop();
-        return new Iterator() {
-
+        return new Iterator<Map<String, Object>>() {
             public boolean hasNext() {
                 return dataSet.next();
             }
 
-            public Object next() {
+            public Map<String, Object> next() {
                 // because of a limitation in split() we need to create an 
object for the current position
                 // otherwise strangeness occurs when the same object is used 
to represent each row
                 return FlatpackConverter.toMap(dataSet);
@@ -60,5 +60,4 @@
             }
         };
     }
-    
 }

Modified: 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java?rev=834579&r1=834578&r2=834579&view=diff
==============================================================================
--- 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
 (original)
+++ 
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
 Tue Nov 10 18:19:49 2009
@@ -35,14 +35,14 @@
     }
 
     @Converter
-    public static Map toMap(DataSet dataSet) {
+    public static Map<String, Object> toMap(DataSet dataSet) {
         Map<String, Object> map = new HashMap<String, Object>();
         putValues(map, dataSet);
         return map;
     }
 
     @Converter
-    public static List toList(DataSet dataSet) {
+    public static List<Map<String, Object>> toList(DataSet dataSet) {
         List<Map<String, Object>> answer = new ArrayList<Map<String, 
Object>>();
         dataSet.goTop();
 
@@ -77,5 +77,4 @@
             map.put(column, value);
         }
     }
-
 }


Reply via email to