チェンジセット 221

コミット日時:

2008/04/14 21:31:14 (14 年前)

コミッタ:

shinomiya

ログメッセージ:

• ImJson#toJSONString?(value, true)のJavaのクラス名表示形式を変更。
  
  
• newInstanceFilledProperty()で生成されるサンプルデータを設定可能に変更。
  
  
• テストケース作成完了
  

ファイル:

• trunk/im-jssp/src/main/java/org/intra_mart/jssp/util/JavaScriptUtility.java (更新) (11 diffs)
• trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTest.java (更新) (4 diffs)
• trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestModel4PrimitiveAndWrapperProperty.java (追加)
• trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestModelA.java (移動) (trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestBeansParent.java から 移動) (1 diff)
• trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestModelB.java (追加)
• trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestModelC.java (追加)

trunk/im-jssp/src/main/java/org/intra_mart/jssp/util/JavaScriptUtility.java

@@ -8 +8 @@
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
+import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
+import org.intra_mart.common.platform.log.Logger;
-import org.intra_mart.jssp.script.ScriptScope;
-import org.intra_mart.jssp.script.provider.ScriptScopeBuilder;
@@ -127 +130 @@
-                        return beans;
-                }
+                else if (beans instanceof Character) {
+                        return ((Character)beans).toString();
+                }
-                else if (targetType.equals(char.class)) {
-                        // TODO AutoBoxingに頼っていいの？
@@ -132 +138 @@
-                        return chars.toString();
-                }
-
+
-                // 数値
-                else if (beans instanceof Number) {
@@ -197 +203 @@
-
-                        // Javaのクラス名を格納（隠しプロパティ）
-
+"", 
-                        return nativeArray;
-                }
@@ -206 +212 @@
-                        ScriptableObject jsObject = new ValueObject();
-                        
+                        Map<String, PropertyDescriptor> map = getBeansPropertyMap(targetType);
+                        Iterator<Map.Entry<String, PropertyDescriptor>> it = map.entrySet().iterator();
+                        
+                        while(it.hasNext()){
+                                Map.Entry<String, PropertyDescriptor> entry = it.next();
+                                PropertyDescriptor propDescriptor = entry.getValue();
+                                
+                                String propName = propDescriptor.getName();
+                                Method readMethod = propDescriptor.getReadMethod();
+                                
+                                // ********* 再帰 *********
+                                Object value4Java = readMethod.invoke(beans, new Object[0]); 
+                                Object obj = convertJavaBeans2JsObject(value4Java);
+                                
+                                // JSオブジェクト に プロパティ を 設定
+                                ScriptableObject.putProperty(jsObject, propName, obj);
+                                
+                                // Javaのクラス名を格納（隠しプロパティ）
+                                setProperty4imJavaClassName(jsObject, propName, readMethod.getReturnType());
+                        }
+                        
-                        // Javaのクラス名を格納（隠しプロパティ）
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        
-                        return jsObject;
@@ -242 +245 @@
-                                                         "getSimpleName");
-
-
+String propName, 
-                Object typeName = Undefined.instance;
-                
@@ -255 +258 @@
-                }
-                
-
+" + propName + "_
-        }
-        
@@ -265 +268 @@
-        public static Object convertJsObject2JavaBeans(Object jsObject, String type, ClassLoader classLoader) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, InstantiationException, ClassNotFoundException, IntrospectionException{
-
-
-
+
+
+
+
+
-                }
-                else if(type.equals("double")) {
-((Double)jsObject).doubleValue(
+new Double(jsObject.toString()
-                }
-                else if(type.equals("float")) {
-((Float)jsObject).floatValue(
+new Float(jsObject.toString()
-                }
-                else if(type.equals("long")) {
-((Long)jsObject).longValue(
+new Long(jsObject.toString()
-                }
-                else if(type.equals("int")) {
-((Integer)jsObject).intValue(
+new Integer(jsObject.toString()
-                }
-                else if(type.equals("short")) {
-((Short)jsObject).shortValue(
+new Short(jsObject.toString()
-                }
-                else if(type.equals("byte")) {
-((Byte)jsObject).byteValue(
+new Byte(jsObject.toString()
-                }
-                else if(type.equals("boolean")) {
-((Boolean)jsObject).booleanValue(
+new Boolean(jsObject.toString()
-                }
-                else{
@@ -439 +445 @@
-                                        
-                                        for(PropertyDescriptor propDiscriptor : propDiscriptorList){
-
+
+
+
+
+
+
+
-                                        }
-                                        
@@ -500 +512 @@
-                                                        throws IntrospectionException, IllegalArgumentException, 
-                                                                        IllegalAccessException, InvocationTargetException, InstantiationException{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // TODO 配列要素数を設定可能に
-        private static int _sampleDataArrayLength = 1; // 配列要素数
-        
-
+
+
+
-                                                        throws IntrospectionException, IllegalArgumentException, 
-                                                                        IllegalAccessException, InvocationTargetException, InstantiationException{
-                
+                _logger4newInstance.trace("------------");
+                _logger4newInstance.trace("isLast: {}", isLast);
+                _logger4newInstance.trace("beanType: {}", beanType);
+                _logger4newInstance.trace("defaultValue: {}", defaultValue);
+                _logger4newInstance.trace("------------");
+
-                Object beanInstance = generatePrimitiveOrWrapperInstance(beanType, defaultValue);
-
+
-                if(beanInstance != null){
-                        Object primitiveOrWrapperInstance = beanInstance;
+                        _logger4newInstance.trace("primitiveOrWrapperInstance: {}", primitiveOrWrapperInstance);
+                        
-                        return primitiveOrWrapperInstance;
-                }
-
-
-
+
+
+
+
+
+
-                
-                Map<String, PropertyDescriptor> map = getBeansPropertyMap(beanType);
-                Iterator<Map.Entry<String, PropertyDescriptor>> it = map.entrySet().iterator();
+                
+                _logger4newInstance.trace("↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓");
-                while(it.hasNext()){
-                        Map.Entry<String, PropertyDescriptor> entry = it.next();
@@ -531 +571 @@
-                        }
-
+                        _logger4newInstance.trace("=========================");
-                        Class<?> propType = propDescriptor.getPropertyType();
-                        String propName = propDescriptor.getName();
-                        String newDefaultValue = "prop_" + propName;
-                        
+                        _logger4newInstance.trace("----");
+                        _logger4newInstance.trace("propName: {}", propName);
+                        _logger4newInstance.trace("newDefaultValue: {}", newDefaultValue);
+                        _logger4newInstance.trace("----");
+                        _logger4newInstance.trace("isLast: {}", isLast);
+                        _logger4newInstance.trace("beanType: {}", beanType);
+                        _logger4newInstance.trace("propType: {}", propType);
+                        
-                        Object data;
+                        
+                        // 通常のオブジェクトの場合
-                        if(!propType.isArray()){
-
+
+
+
+
+
+
+
+
+
+
-                                        data = generatePrimitiveOrWrapperInstance(propType, newDefaultValue);
-                                }
-
-
-
-
-
-
-
-
-
+
+
-                        // 配列の場合
-                        else{
-                                Class<?> componentType = propType.getComponentType();
-
-
-
-
+
+
+
+
+
+
+
-                                        data = Array.newInstance(componentType, _sampleDataArrayLength);
-                                        for(int idx = 0; idx < _sampleDataArrayLength; idx++){
-                                                isLast = true; // 次で終わり
-                                                
-                                                // 再帰
+                                                _logger4newInstance.trace("--ARRAY-- [RECURSIVE] newInstanceFilledProperty()");
-                                                Object dataElem = newInstanceFilledProperty(componentType, newDefaultValue, isLast);
-                                                Array.set(data, idx, dataElem);
-                                        }
-                                }
-
+
+
+
+
+
+
-                        setter.invoke(beanInstance, data);
-
-
+
+
+
+
+
-                return beanInstance;
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if(type.equals(java.lang.String.class)){
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else if(type.equals(java.lang.Number.class)
-                                ||
-d
+java.lang.D
-                                ||
-
+
+
+
+
+
-                                ||
-
+
+
+
+
-                                ||
-
+
+
+
+
+
-                                ||
-
+
+
+
+
+
+
+
+
+
+
+
-                                ||
-                                type.equals(byte.class)){
-
-
-
-
-
+
+
+
+
+
+
-                else if(type.equals(java.lang.Boolean.class)
-                                ||
-                                type.equals(boolean.class)){
-                        
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                else if(type.equals(java.util.Date.class)){
-
-
-
+
+
+
+
+
+
-                else if(type.equals(java.util.Calendar.class)){
-
-
-
+
+
+
+
+
+
+
-                // 上記以外 （≒ Primitive型、または、Wrapperクラスではない場合）
+                // ===================
-                else{
-                        return null;
-                }
-        }
+        
+        private static String SAMPLE_DATA_FOR_STRING;
+        private static Number SAMPLE_DATA_FOR_NUMBER;
+        private static Boolean SAMPLE_DATA_FOR_BOOLEAN;
+        private static Date SAMPLE_DATA_FOR_DATE;
+
+        static{
+                initializeSampleData(null, null, null, null);
+        }
+        
+        
+        /**
+         * @param str 空文字設定不可
+         * @param num
+         * @param bool
+         * @param date
+         */
+        public static void initializeSampleData(String str, Number num, Boolean bool, Date date){
+
+                // String
+                if(str != null && str.length() != 0){
+                        SAMPLE_DATA_FOR_STRING = str;
+                }
+                else {
+                        SAMPLE_DATA_FOR_STRING = "__default__";
+                }
+                
+                // Number
+                if(num != null){
+                        SAMPLE_DATA_FOR_NUMBER = num;
+                }
+                else{
+                        SAMPLE_DATA_FOR_NUMBER = new Double(123);
+                }
+                
+                // Boolean
+                if(bool != null){
+                        SAMPLE_DATA_FOR_BOOLEAN = bool;
+                }
+                else{
+                        SAMPLE_DATA_FOR_BOOLEAN = Boolean.TRUE;
+                }
+                
+                // Calendar
+                if(date != null){
+                        SAMPLE_DATA_FOR_DATE = date;
+                }
+                else{
+                        SAMPLE_DATA_FOR_DATE = new Date(1213846496000L); // "Mon June 19 2008 12:34:56 GMT+0900 (JST)"
+                }
+        }
+        
-
-}

trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTest.java

@@ -1 +1 @@
-package org.intra_mart.jssp.util;
-
+import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
-import junit.framework.TestCase;
-
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.ScriptRuntime;
-
-public class JavaScriptUtilityTest extends TestCase {
-
+        
+        @Override
+        protected void setUp() throws Exception {
+                super.setUp();
+
+                Context.enter();
+                JavaScriptUtility.initializeSampleData(null, null, null, null);
+        }
+        
+
+        @Override
+        protected void tearDown() throws Exception {
+                super.tearDown();
+                
+                Context.exit();
+        }
+
+
-        public void testExecuteVoidFunction() {
-fail("まだ実装されていません。"
+assertTrue("サーバサイドで実行する必要があるテストです", true
-        }
-
-        public void testExecuteFunction() {
-
-
+
+
+
-
-        // TODO エスケープ文字
@@ -28 +60 @@
-
-                assertTrue(char.class != actual.getClass());
-Character
-value
+String
+(new Character(value)).toString()
-        }
-
@@ -108 +140 @@
-                Object actual = JavaScriptUtility.convertJavaBeans2JsObject(value);
-
-Character
-value
+String
+(new Character(value)).toString()
-        }
-
@@ -226 +258 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        /**
-         * <pre>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         * </pre>
-         * @throws Exception
-         */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-

trunk/im-jssp/src/test/java/org/intra_mart/jssp/util/JavaScriptUtilityTestModelA.java

@@ -1 +1 @@
-package org.intra_mart.jssp.util;
-
-
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        
-        String[] valueWrapperArrayString = {"藍上尾", "書きくけ子", "さしすせそ"};
-        Character[] valueWrapperArrayCharacter = {new Character('や'), new Character('ゆ'), new Character('よ')};
-        Double[] valueWrapperArrayDouble = {
-                                new Double(141312),
-                                new Double(Double.MAX_VALUE),
-                                new Double(Double.MIN_VALUE),
-                                new Double(Double.NaN),
-                                new Double(Double.NEGATIVE_INFINITY),
-                                new Double(Double.POSITIVE_INFINITY) 
-                        };
-
-        Float[] valueWrapperArrayFloat = {
-                                new Float(11.109F),
-                                new Float(Float.MAX_VALUE),
-                                new Float(Float.MIN_VALUE), 
-                                new Float(Float.NaN), 
-                                new Float(Float.NEGATIVE_INFINITY), 
-                                new Float(Float.POSITIVE_INFINITY)
-                        };
-
-        Long[] valueWrapperArrayLong = {
-                                new Long(8765L),
-                                new Long(Long.MAX_VALUE),
-                                new Long(Long.MIN_VALUE)
-                        };
-
-        Integer[] valueWrapperArrayInteger = {
-                                new Integer(4321), 
-                                new Integer(Integer.MAX_VALUE),
-                                new Integer(Integer.MIN_VALUE)
-                        };
-        Short[] valueWrapperArrayShort = {
-                                new Short("34"),
-                                new Short(Short.MAX_VALUE),
-                                new Short(Short.MIN_VALUE)
-                        };
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
+        public void setModelA(JavaScriptUtilityTestModelA modelA) {
+                this.modelA = modelA;
+        }
+        public JavaScriptUtilityTestModelA[] getModelArrayA() {
+                return modelArrayA;
+        }
+        public void setModelArrayA(JavaScriptUtilityTestModelA[] modelArrayA) {
+                this.modelArrayA = modelArrayA;
+        }
+        public JavaScriptUtilityTestModelB getModelB() {
+                return modelB;
+        }
+        public void setModelB(JavaScriptUtilityTestModelB modelB) {
+                this.modelB = modelB;
+        }
+        public JavaScriptUtilityTestModelB[] getModelArrayB() {
+                return modelArrayB;
+        }
+        public void setModelArrayB(JavaScriptUtilityTestModelB[] modelArrayB) {
+                this.modelArrayB = modelArrayB;
+        }
+        public String getValueWrapperStringModelA() {
+                return valueWrapperStringModelA;
+        }
+        public void setValueWrapperStringModelA(String valueWrapperStringModelA) {
+                this.valueWrapperStringModelA = valueWrapperStringModelA;
+        }
+        public Number getValueWrapperNumberModelA() {
+                return valueWrapperNumberModelA;
+        }
+        public void setValueWrapperNumberModelA(Number valueWrapperNumberModelA) {
+                this.valueWrapperNumberModelA = valueWrapperNumberModelA;
+        }
+        public Boolean getValueWrapperBooleanModelA() {
+                return valueWrapperBooleanModelA;
+        }
+        public void setValueWrapperBooleanModelA(Boolean valueWrapperBooleanModelA) {
+                this.valueWrapperBooleanModelA = valueWrapperBooleanModelA;
+        }
+        public Date getValueWrapperDateModelA() {
+                return valueWrapperDateModelA;
+        }
+        public void setValueWrapperDateModelA(Date valueWrapperDateModelA) {
+                this.valueWrapperDateModelA = valueWrapperDateModelA;
+        }
+}