camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] git commit: CAMEL-7447: Fixed CS
Date Tue, 27 May 2014 06:04:04 GMT
CAMEL-7447: Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fb191c9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fb191c9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fb191c9

Branch: refs/heads/master
Commit: 1fb191c91ef1ba3dfaef663d4aac8c45bc25a258
Parents: 59735c0
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue May 27 08:03:52 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue May 27 08:03:52 2014 +0200

----------------------------------------------------------------------
 .../camel/component/jdbc/JdbcProducer.java      |  9 +++++--
 .../camel/component/jdbc/ResultSetIterator.java | 28 +++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1fb191c9/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 9b8fad0..a26ca74 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -22,8 +22,13 @@ import java.sql.ResultSet;
 import java.sql.SQLDataException;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.*;
-import javax.sql.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.sql.DataSource;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.spi.Synchronization;

http://git-wip-us.apache.org/repos/asf/camel/blob/1fb191c9/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java
index f471124..19845f7 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/ResultSetIterator.java
@@ -22,8 +22,14 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.camel.RuntimeCamelException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -150,14 +156,15 @@ public class ResultSetIterator implements Iterator<Map<String,
Object>> {
     }
 
     private static interface Column {
+
         String getName();
 
         Object getValue(ResultSet resultSet) throws SQLException;
     }
 
-    private static class DefaultColumn implements Column {
+    private static final class DefaultColumn implements Column {
+        private final int columnNumber;
         private final String name;
-        protected final int columnNumber;
 
         private DefaultColumn(String name, int columnNumber) {
             this.name = name;
@@ -175,9 +182,18 @@ public class ResultSetIterator implements Iterator<Map<String,
Object>> {
         }
     }
 
-    private static final class BlobColumn extends DefaultColumn {
+    private static final class BlobColumn implements Column {
+        private final int columnNumber;
+        private final String name;
+
         private BlobColumn(String name, int columnNumber) {
-            super(name, columnNumber);
+            this.name = name;
+            this.columnNumber = columnNumber;
+        }
+
+        @Override
+        public String getName() {
+            return name;
         }
 
         @Override


Mime
View raw message