You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ra...@apache.org on 2016/07/12 22:25:19 UTC
apex-malhar git commit: APEXMALHAR-2140 ActiveFieldInfo moved to
AbstractJdbcPOJOOutputOperator
Repository: apex-malhar
Updated Branches:
refs/heads/master 9b62506bd -> 883153fad
APEXMALHAR-2140 ActiveFieldInfo moved to AbstractJdbcPOJOOutputOperator
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/883153fa
Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/883153fa
Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/883153fa
Branch: refs/heads/master
Commit: 883153fad0321a8ef9efc8601a6b8703c0991d29
Parents: 9b62506
Author: devtagare <de...@gmail.com>
Authored: Tue Jul 12 13:40:39 2016 -0700
Committer: devtagare <de...@gmail.com>
Committed: Tue Jul 12 13:40:39 2016 -0700
----------------------------------------------------------------------
.../db/jdbc/AbstractJdbcPOJOOutputOperator.java | 20 ++++++++++++++++----
.../db/jdbc/JdbcPOJOInsertOutputOperator.java | 2 +-
.../jdbc/JdbcPOJONonInsertOutputOperator.java | 2 +-
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/883153fa/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
index 45e0cbb..90111d8 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
@@ -38,6 +38,7 @@ import com.datatorrent.api.Context;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.api.annotation.InputPortFieldAnnotation;
+import com.datatorrent.lib.util.FieldInfo;
import com.datatorrent.lib.util.PojoUtils;
import com.datatorrent.lib.util.PojoUtils.Getter;
import com.datatorrent.lib.util.PojoUtils.GetterBoolean;
@@ -67,7 +68,7 @@ public abstract class AbstractJdbcPOJOOutputOperator extends AbstractJdbcTransac
@NotNull
private String tablename;
- protected final transient List<JdbcPOJOInputOperator.ActiveFieldInfo> columnFieldGetters;
+ protected final transient List<ActiveFieldInfo> columnFieldGetters;
protected transient Class<?> pojoClass;
@@ -93,6 +94,17 @@ public abstract class AbstractJdbcPOJOOutputOperator extends AbstractJdbcTransac
super();
columnFieldGetters = Lists.newArrayList();
}
+
+ protected static class ActiveFieldInfo
+ {
+ final FieldInfo fieldInfo;
+ Object setterOrGetter;
+
+ ActiveFieldInfo(FieldInfo fieldInfo)
+ {
+ this.fieldInfo = fieldInfo;
+ }
+ }
@Override
@SuppressWarnings("unchecked")
@@ -101,7 +113,7 @@ public abstract class AbstractJdbcPOJOOutputOperator extends AbstractJdbcTransac
final int size = columnDataTypes.size();
for (int i = 0; i < size; i++) {
final int type = columnDataTypes.get(i);
- JdbcPOJOInputOperator.ActiveFieldInfo activeFieldInfo = columnFieldGetters.get(i);
+ ActiveFieldInfo activeFieldInfo = columnFieldGetters.get(i);
switch (type) {
case (Types.CHAR):
case (Types.VARCHAR):
@@ -160,7 +172,7 @@ public abstract class AbstractJdbcPOJOOutputOperator extends AbstractJdbcTransac
}
@SuppressWarnings("UnusedParameters")
- protected void handleUnknownDataType(int type, Object tuple, JdbcPOJOInputOperator.ActiveFieldInfo activeFieldInfo)
+ protected void handleUnknownDataType(int type, Object tuple, ActiveFieldInfo activeFieldInfo)
{
throw new RuntimeException("unsupported data type " + type);
}
@@ -212,7 +224,7 @@ public abstract class AbstractJdbcPOJOOutputOperator extends AbstractJdbcTransac
final int size = columnDataTypes.size();
for (int i = 0; i < size; i++) {
final int type = columnDataTypes.get(i);
- JdbcPOJOInputOperator.ActiveFieldInfo activeFieldInfo = columnFieldGetters.get(i);
+ ActiveFieldInfo activeFieldInfo = columnFieldGetters.get(i);
switch (type) {
case (Types.CHAR):
case (Types.VARCHAR):
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/883153fa/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
index 67ec023..f5e6081 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
@@ -112,7 +112,7 @@ public class JdbcPOJOInsertOutputOperator extends AbstractJdbcPOJOOutputOperator
}
for (FieldInfo fi : getFieldInfos()) {
- columnFieldGetters.add(new JdbcPOJOInputOperator.ActiveFieldInfo(fi));
+ columnFieldGetters.add(new ActiveFieldInfo(fi));
}
StringBuilder columns = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/883153fa/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
index 82ff043..54d9dd8 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
@@ -50,7 +50,7 @@ public class JdbcPOJONonInsertOutputOperator extends AbstractJdbcPOJOOutputOpera
columnDataTypes = Lists.newArrayList();
for (JdbcFieldInfo fi : getFieldInfos()) {
- columnFieldGetters.add(new JdbcPOJOInputOperator.ActiveFieldInfo(fi));
+ columnFieldGetters.add(new ActiveFieldInfo(fi));
columnDataTypes.add(fi.getSqlType());
}
}