svn commit: r803822 - in /camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy: BindyAbstractFactory.java BindyCsvFactory.java

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r803822 - in /camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy: BindyAbstractFactory.java BindyCsvFactory.java

ningjiang
Author: ningjiang
Date: Thu Aug 13 09:44:44 2009
New Revision: 803822

URL: http://svn.apache.org/viewvc?rev=803822&view=rev
Log:
Fixed the CS errors of camel-bindy component

Modified:
    camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
    camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java

Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=803822&r1=803821&r2=803822&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Thu Aug 13 09:44:44 2009
@@ -56,168 +56,164 @@
  * supported by camel bindy
  */
 public abstract class BindyAbstractFactory implements BindyFactory {
- private static final transient Log LOG = LogFactory.getLog(BindyAbstractFactory.class);
- protected Set<Class> models;
- protected Map<String, List<Field>> annotedLinkFields = new LinkedHashMap<String, List<Field>>();
- protected List<Field> linkFields = new ArrayList<Field>();
- protected String crlf;
-
- private AnnotationModelLoader modelsLoader;
- private String[] packageNames;
-
- public BindyAbstractFactory(PackageScanClassResolver resolver, String... packageNames) throws Exception {
- this.modelsLoader = new AnnotationModelLoader(resolver);
- this.packageNames = packageNames;
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Package(s) name : " + packageNames.toString());
- }
-
- initModel();
- }
-
- /**
- * method uses to initialize the model representing the classes who will
- * bind the data. This process will scan for classes according to the
- * package name provided, check the annotated classes and fields.
- *
- * @throws Exception
- */
- public void initModel() throws Exception {
- // Find classes defined as Model
- initModelClasses(this.packageNames);
- }
-
- /**
- * Find all the classes defined as model
- */
- private void initModelClasses(String... packageNames) throws Exception {
- models = modelsLoader.loadModels(packageNames);
- }
-
- /**
- * Find fields annoted in each class of the model
- */
- public abstract void initAnnotedFields() throws Exception;
-
- public abstract void bind(List<String> data, Map<String, Object> model) throws Exception;
-
- public abstract String unbind(Map<String, Object> model) throws Exception;
-
- /**
- * Link objects together
- */
- public void link(Map<String, Object> model) throws Exception {
-
- // Iterate class by class
- for (String link : annotedLinkFields.keySet()) {
- List<Field> linkFields = annotedLinkFields.get(link);
-
- // Iterate through Link fields list
- for (Field field : linkFields) {
-
- // Change protection for private field
- field.setAccessible(true);
-
- // Retrieve linked object
- String toClassName = field.getType().getName();
- Object to = model.get(toClassName);
-
- ObjectHelper.notNull(to, "No @link annotation has been defined for the oject to link");
- field.set(model.get(field.getDeclaringClass().getName()), to);
-
- }
- }
- }
-
- /**
- * Factory method generating new instances of the model and adding them to a
- * HashMap
- *
- * @return Map is a collection of the objects used to bind data from
- *         records, messages
- * @throws Exception
- *             can be thrown
- */
- public Map<String, Object> factory() throws Exception {
- Map<String, Object> mapModel = new HashMap<String, Object>();
-
- for (Class<?> cl : models) {
- Object obj = ObjectHelper.newInstance(cl);
-
- // Add instance of the class to the Map Model
- mapModel.put(obj.getClass().getName(), obj);
- }
-
- return mapModel;
- }
-
- /**
- * Generate a unique key
- *
- * @param key1
- *            The key of the section number
- * @param key2
- *            The key of the position of the field
- * @return the key generated
- */
- protected static Integer generateKey(Integer key1, Integer key2) {
- String key2Formated = getNumberFormat().format((long) key2);
- String keyGenerated = String.valueOf(key1) + key2Formated;
-
- return Integer.valueOf(keyGenerated);
- }
-
- /**
- *
- * @return NumberFormat
- */
- private static NumberFormat getNumberFormat() {
- // Get instance of NumberFormat
- NumberFormat nf = NumberFormat.getInstance();
-
- // set max number of digits to 3 (thousands)
- nf.setMaximumIntegerDigits(3);
- nf.setMinimumIntegerDigits(3);
-
- return nf;
- }
-
- /**
- * Return Default value for primitive type
- *
- * @param clazz
- * @return
- * @throws Exception
- */
- public static Object getDefaultValueforPrimitive(Class<?> clazz) throws Exception {
-
- if (clazz == byte.class) {
- return Byte.MIN_VALUE;
- } else if (clazz == short.class) {
- return Short.MIN_VALUE;
- } else if (clazz == int.class) {
- return Integer.MIN_VALUE;
- } else if (clazz == long.class) {
- return Long.MIN_VALUE;
- } else if (clazz == float.class) {
- return Float.MIN_VALUE;
- } else if (clazz == double.class) {
- return Double.MIN_VALUE;
- } else if (clazz == char.class) {
- return Character.MIN_VALUE;
- } else if (clazz == boolean.class) {
- return false;
- } else {
- return null;
- }
-
- }
-
- /**
- * Find the carriage return set
- */
- public String getCarriageReturn() {
- return crlf;
- }
+    private static final transient Log LOG = LogFactory.getLog(BindyAbstractFactory.class);
+    protected Set<Class> models;
+    protected Map<String, List<Field>> annotedLinkFields = new LinkedHashMap<String, List<Field>>();
+    protected List<Field> linkFields = new ArrayList<Field>();
+    protected String crlf;
+
+    private AnnotationModelLoader modelsLoader;
+    private String[] packageNames;
+
+    public BindyAbstractFactory(PackageScanClassResolver resolver, String... packageNames) throws Exception {
+        this.modelsLoader = new AnnotationModelLoader(resolver);
+        this.packageNames = packageNames;
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Package(s) name : " + packageNames.toString());
+        }
+
+        initModel();
+    }
+
+    /**
+     * method uses to initialize the model representing the classes who will
+     * bind the data. This process will scan for classes according to the
+     * package name provided, check the annotated classes and fields.
+     *
+     * @throws Exception
+     */
+    public void initModel() throws Exception {
+        // Find classes defined as Model
+        initModelClasses(this.packageNames);
+    }
+
+    /**
+     * Find all the classes defined as model
+     */
+    private void initModelClasses(String... packageNames) throws Exception {
+        models = modelsLoader.loadModels(packageNames);
+    }
+
+    /**
+     * Find fields annoted in each class of the model
+     */
+    public abstract void initAnnotedFields() throws Exception;
+
+    public abstract void bind(List<String> data, Map<String, Object> model) throws Exception;
+
+    public abstract String unbind(Map<String, Object> model) throws Exception;
+
+    /**
+     * Link objects together
+     */
+    public void link(Map<String, Object> model) throws Exception {
+
+        // Iterate class by class
+        for (String link : annotedLinkFields.keySet()) {
+            List<Field> linkFields = annotedLinkFields.get(link);
+
+            // Iterate through Link fields list
+            for (Field field : linkFields) {
+
+                // Change protection for private field
+                field.setAccessible(true);
+
+                // Retrieve linked object
+                String toClassName = field.getType().getName();
+                Object to = model.get(toClassName);
+
+                ObjectHelper.notNull(to, "No @link annotation has been defined for the oject to link");
+                field.set(model.get(field.getDeclaringClass().getName()), to);
+
+            }
+        }
+    }
+
+    /**
+     * Factory method generating new instances of the model and adding them to a
+     * HashMap
+     *
+     * @return Map is a collection of the objects used to bind data from
+     *         records, messages
+     * @throws Exception can be thrown
+     */
+    public Map<String, Object> factory() throws Exception {
+        Map<String, Object> mapModel = new HashMap<String, Object>();
+
+        for (Class<?> cl : models) {
+            Object obj = ObjectHelper.newInstance(cl);
+
+            // Add instance of the class to the Map Model
+            mapModel.put(obj.getClass().getName(), obj);
+        }
+
+        return mapModel;
+    }
+
+    /**
+     * Generate a unique key
+     *
+     * @param key1 The key of the section number
+     * @param key2 The key of the position of the field
+     * @return the key generated
+     */
+    protected static Integer generateKey(Integer key1, Integer key2) {
+        String key2Formated = getNumberFormat().format((long)key2);
+        String keyGenerated = String.valueOf(key1) + key2Formated;
+
+        return Integer.valueOf(keyGenerated);
+    }
+
+    /**
+     * @return NumberFormat
+     */
+    private static NumberFormat getNumberFormat() {
+        // Get instance of NumberFormat
+        NumberFormat nf = NumberFormat.getInstance();
+
+        // set max number of digits to 3 (thousands)
+        nf.setMaximumIntegerDigits(3);
+        nf.setMinimumIntegerDigits(3);
+
+        return nf;
+    }
+
+    /**
+     * Return Default value for primitive type
+     *
+     * @param clazz
+     * @return
+     * @throws Exception
+     */
+    public static Object getDefaultValueforPrimitive(Class<?> clazz) throws Exception {
+
+        if (clazz == byte.class) {
+            return Byte.MIN_VALUE;
+        } else if (clazz == short.class) {
+            return Short.MIN_VALUE;
+        } else if (clazz == int.class) {
+            return Integer.MIN_VALUE;
+        } else if (clazz == long.class) {
+            return Long.MIN_VALUE;
+        } else if (clazz == float.class) {
+            return Float.MIN_VALUE;
+        } else if (clazz == double.class) {
+            return Double.MIN_VALUE;
+        } else if (clazz == char.class) {
+            return Character.MIN_VALUE;
+        } else if (clazz == boolean.class) {
+            return false;
+        } else {
+            return null;
+        }
+
+    }
+
+    /**
+     * Find the carriage return set
+     */
+    public String getCarriageReturn() {
+        return crlf;
+    }
 }

Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=803822&r1=803821&r2=803822&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Thu Aug 13 09:44:44 2009
@@ -251,8 +251,7 @@
             Object modelField = model.get(field.getDeclaringClass().getName());
             
             if (modelField != null) {
-            
-            // Get field value
+                // Get field value
                 Object value = field.get(modelField);
                 String strValue = null;
 
@@ -281,7 +280,7 @@
                     positions.put(keyGenerated, strValue);
 
                     if (LOG.isDebugEnabled()) {
-                           LOG.debug("Positions size : " + positions.size());
+                        LOG.debug("Positions size : " + positions.size());
                     }
                         
                 } else {