Author: julien_viet Date: 2010-01-16 07:08:06 -0500 (Sat, 16 Jan 2010) New Revision: 1331 Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/DefaultObjectFactory.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/ObjectFactory.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ClassTypeModel.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/FieldModel.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ReplicatableTypeModel.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeDomain.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeModel.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectReader.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectWriter.java portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/TestTypeModel.java portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/factory/A1.java Log: make replication framework more type safe Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/DefaultObjectFactory.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/DefaultObjectFactory.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/DefaultObjectFactory.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -30,16 +30,18 @@ public final class DefaultObjectFactory extends ObjectFactory<Object> { @Override - public <S> S create(Class<S> type, Map<FieldModel, ?> state) throws CreateException + public <S> S create(Class<S> type, Map<FieldModel<?, ?>, ?> state) throws CreateException { try { S instance = type.newInstance(); // - for (Map.Entry<FieldModel, ?> entry : state.entrySet()) + for (Map.Entry<FieldModel<?, ?>, ?> entry : state.entrySet()) { - entry.getKey().setValue(instance, entry.getValue()); + FieldModel<?, ?> fieldModel = entry.getKey(); + Object value = entry.getValue(); + fieldModel.castAndSet(instance, value); } // Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/ObjectFactory.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/ObjectFactory.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/factory/ObjectFactory.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -40,6 +40,6 @@ * @return the S instance * @throws CreateException anything wrong that could happen during instance creation */ - public abstract <S extends B> S create(Class<S> type, Map<FieldModel, ?> state) throws CreateException; + public abstract <S extends B> S create(Class<S> type, Map<FieldModel<?, ?>, ?> state) throws CreateException; } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ClassTypeModel.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ClassTypeModel.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ClassTypeModel.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -25,9 +25,9 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public final class ClassTypeModel<O> extends TypeModel +public final class ClassTypeModel<O> extends TypeModel<O> { - ClassTypeModel(Class<?> type, TypeModel superType, Map<String, FieldModel> fields) + ClassTypeModel(Class<O> type, TypeModel<? super O> superType, Map<String, FieldModel<O, ?>> fields) { super(type, superType, fields); } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/FieldModel.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/FieldModel.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/FieldModel.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -26,25 +26,34 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public final class FieldModel +public final class FieldModel<O, V> { /** . */ + private final TypeModel<O> owner; + + /** . */ private final Field field; /** . */ - private final TypeModel type; + private final TypeModel<V> type; /** . */ private boolean _transient; - FieldModel(Field field, TypeModel type) + FieldModel(TypeModel<O> owner, Field field, TypeModel<V> type) { + this.owner = owner; this.field = field; this.type = type; this._transient = Modifier.isTransient(field.getModifiers()); } + public TypeModel<O> getOwner() + { + return owner; + } + public String getName() { return field.getName(); @@ -55,16 +64,32 @@ return _transient; } - public TypeModel getType() + public TypeModel<V> getType() { return type; } - public Object getValue(Object o) + public V get(Object o) { try { - return field.get(o); + Object value = field.get(o); + if (value == null) + { + return null; + } + else + { + Class<V> valueType = type.getJavaType(); + if (valueType.isInstance(value)) + { + return valueType.cast(value); + } + else + { + throw new ClassCastException("Cannot cast value " + value + " with type " + value.getClass().getName() + " to type " + valueType.getName()); + } + } } catch (IllegalAccessException e) { @@ -72,8 +97,14 @@ } } - public void setValue(Object o, Object value) + public void castAndSet(Object o, Object value) { + V v = type.getJavaType().cast(value); + set(o, v); + } + + public void set(Object o, V value) + { try { field.set(o, value); Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ReplicatableTypeModel.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ReplicatableTypeModel.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/ReplicatableTypeModel.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -25,26 +25,14 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public final class ReplicatableTypeModel<O> extends TypeModel +public final class ReplicatableTypeModel<O> extends TypeModel<O> { - /** . */ - private final Class<O> objectType; - ReplicatableTypeModel( Class<O> javaType, - TypeModel superType, - Map<String, FieldModel> fields) + TypeModel<? super O> superType, + Map<String, FieldModel<O, ?>> fields) { super(javaType, superType, fields); - - // - this.objectType = javaType; } - - @Override - public Class<O> getJavaType() - { - return objectType; - } } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeDomain.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeDomain.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeDomain.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -24,6 +24,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -33,29 +34,48 @@ { /** . */ + private static final Map<Class<?>, Class<?>> primitiveToWrapperMap = new HashMap<Class<?>, Class<?>>(); + + static + { + primitiveToWrapperMap.put(byte.class, Byte.class); + primitiveToWrapperMap.put(short.class, Short.class); + primitiveToWrapperMap.put(int.class, Integer.class); + primitiveToWrapperMap.put(long.class, Long.class); + primitiveToWrapperMap.put(float.class, Float.class); + primitiveToWrapperMap.put(double.class, Double.class); + primitiveToWrapperMap.put(boolean.class, Boolean.class); + primitiveToWrapperMap.put(char.class, Character.class); + } + + /** . */ private final Map<String, TypeModel> typeModelMap; /** . */ private final Map<String, TypeModel> immutableTypeModelMap; /** . */ - private final Set<TypeModel> typeModelSet; + private final Collection<TypeModel> immutableTypeModelSet; /** . */ - private final Set<TypeModel> immutableTypeModelSet; + private final boolean buildIfAbsent; public TypeDomain() { - HashMap<String, TypeModel> typeModelMap = new HashMap<String, TypeModel>(); + this(false); + } + + public TypeDomain(boolean buildIfAbsent) + { + ConcurrentHashMap<String, TypeModel> typeModelMap = new ConcurrentHashMap<String, TypeModel>(); Map<String, TypeModel> immutableTypeModelMap = Collections.unmodifiableMap(typeModelMap); - HashSet<TypeModel> typeModelSet = new HashSet<TypeModel>(); - Set<TypeModel> immutableTypeModelSet = Collections.unmodifiableSet(typeModelSet); + Collection<TypeModel> immutableTypeModelSet = Collections.unmodifiableCollection(typeModelMap.values()); // this.typeModelMap = typeModelMap; this.immutableTypeModelMap = immutableTypeModelMap; - this.typeModelSet = typeModelSet; this.immutableTypeModelSet = immutableTypeModelSet; + this.buildIfAbsent = buildIfAbsent; } public Map<String, TypeModel> getTypeModelMap() @@ -63,8 +83,13 @@ return immutableTypeModelMap; } - public Set<TypeModel> getTypeModels() + public boolean getBuildIfAbsent() { + return buildIfAbsent; + } + + public Collection<TypeModel> getTypeModels() + { return immutableTypeModelSet; } @@ -83,19 +108,40 @@ { throw new NullPointerException(); } - return typeModelMap.get(javaType.getName()); + + // + TypeModel typeModel = typeModelMap.get(javaType.getName()); + + // + if (typeModel == null && buildIfAbsent) + { + typeModel = add(javaType); + } + + // + return typeModel; } - public TypeModel add(Class<?> javaType) + // For now that operation is synchronized + public synchronized TypeModel add(Class<?> javaType) { if (javaType == null) { throw new NullPointerException(); } + + // Build the missing types required to have knowledge about the + // provided java type Map<String, TypeModel> addedTypeModels = new HashMap<String, TypeModel>(); TypeModel model = build(javaType, addedTypeModels); + + // Perform merge typeModelMap.putAll(addedTypeModels); - typeModelSet.addAll(addedTypeModels.values()); + + // + System.out.println("Added types " + addedTypeModels.values() + " to replication domain"); + + // return model; } @@ -106,15 +152,21 @@ private <O> TypeModel build(Class<O> javaType, Map<String, TypeModel> addedTypeModels) { - TypeModel typeModel = get(javaType, addedTypeModels); + if (javaType.isPrimitive()) + { + throw new IllegalArgumentException("No primitive type accepted"); + } + // Cast OK + TypeModel<O> typeModel = (TypeModel<O>)get(javaType, addedTypeModels); + // if (typeModel == null) { boolean replicated = javaType.getAnnotation(ReplicatedType.class) != null; // - TypeModel superTypeModel = null; + TypeModel<?> superTypeModel = null; for (Class<?> ancestor = javaType.getSuperclass();ancestor != null;ancestor = ancestor.getSuperclass()) { superTypeModel = build(ancestor, addedTypeModels); @@ -125,16 +177,16 @@ } // - TreeMap<String, FieldModel> fieldModels = new TreeMap<String, FieldModel>(); + TreeMap<String, FieldModel<O, ?>> fieldModels = new TreeMap<String, FieldModel<O, ?>>(); // if (replicated) { - typeModel = new ReplicatableTypeModel<O>(javaType, superTypeModel, fieldModels); + typeModel = new ReplicatableTypeModel<O>(javaType, (TypeModel<? super O>)superTypeModel, fieldModels); } else { - typeModel = new ClassTypeModel(javaType, superTypeModel, fieldModels); + typeModel = new ClassTypeModel<O>(javaType, (TypeModel<? super O>)superTypeModel, fieldModels); } // @@ -147,10 +199,17 @@ { field.setAccessible(true); Class<?> fieldJavaType = field.getType(); - TypeModel fieldTypeModel = build(fieldJavaType, addedTypeModels); + + // Replace if a primitive + if (fieldJavaType.isPrimitive()) + { + fieldJavaType = primitiveToWrapperMap.get(fieldJavaType); + } + + TypeModel<?> fieldTypeModel = build(fieldJavaType, addedTypeModels); if (fieldTypeModel != null) { - fieldModels.put(field.getName(), new FieldModel(field, fieldTypeModel)); + fieldModels.put(field.getName(), createField(typeModel, field, fieldTypeModel)); } } } @@ -160,6 +219,11 @@ return typeModel; } + private <O, V> FieldModel<O, V> createField(TypeModel<O> owner, Field field, TypeModel<V> fieldTypeModel) + { + return new FieldModel<O, V>(owner, field, fieldTypeModel); + } + private TypeModel get(Class<?> javaType, Map<String, TypeModel> addedTypeModels) { TypeModel typeModel = typeModelMap.get(javaType.getName()); Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeModel.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeModel.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/model/TypeModel.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -27,22 +27,22 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public abstract class TypeModel +public abstract class TypeModel<O> { /** . */ - private final Class<?> javaType; + private final Class<O> javaType; /** . */ - private final TypeModel superType; + private final TypeModel<? super O> superType; /** . */ - private final Map<String, FieldModel> fields; + private final Map<String, FieldModel<O, ?>> fields; /** . */ - private final Map<String, FieldModel> immutableFields; + private final Map<String, FieldModel<O, ?>> immutableFields; - TypeModel(Class<?> javaType, TypeModel superType, Map<String, FieldModel> fields) + TypeModel(Class<O> javaType, TypeModel<? super O> superType, Map<String, FieldModel<O, ?>> fields) { this.javaType = javaType; this.superType = superType; @@ -50,12 +50,12 @@ this.immutableFields = Collections.unmodifiableMap(fields); } - public Collection<FieldModel> getFields() + public Collection<FieldModel<O, ?>> getFields() { return immutableFields.values(); } - public Map<String, FieldModel> getFieldMap() + public Map<String, FieldModel<O, ?>> getFieldMap() { return immutableFields; } @@ -65,12 +65,12 @@ return javaType.getName(); } - public Class<?> getJavaType() + public Class<O> getJavaType() { return javaType; } - public TypeModel getSuperType() + public TypeModel<? super O> getSuperType() { return superType; } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectReader.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectReader.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectReader.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -57,7 +57,7 @@ this.idToResolutions = new HashMap<Integer, List<Resolution>>(); } - private <O> O instantiate(ReplicatableTypeModel<O> typeModel, Map<FieldModel, ?> state) throws InvalidClassException + private <O> O instantiate(ReplicatableTypeModel<O> typeModel, Map<FieldModel<?, ?>, ?> state) throws InvalidClassException { try { @@ -95,19 +95,19 @@ return o1; case DataKind.OBJECT: id = container.readInt(); - Class clazz = (Class) container.readObject(); + Class<?> clazz = (Class) container.readObject(); ReplicatableTypeModel<?> typeModel = (ReplicatableTypeModel)context.getTypeDomain().getTypeModel(clazz); // - Map<FieldModel, Object> state = new HashMap<FieldModel, Object>(); - TypeModel currentTypeModel = typeModel; + Map<FieldModel<?, ?>, Object> state = new HashMap<FieldModel<?, ?>, Object>(); + TypeModel<?> currentTypeModel = typeModel; List<Bilto> biltos = new ArrayList<Bilto>(); while (currentTypeModel != null) { if (currentTypeModel instanceof ReplicatableTypeModel) { - for (FieldModel fieldModel : currentTypeModel.getFields()) + for (FieldModel<?, ?> fieldModel : currentTypeModel.getFields()) { if (!fieldModel.isTransient()) { @@ -164,7 +164,7 @@ { for (Resolution resolution : resolutions) { - resolution.fieldModel.setValue(resolution.target, instance); + resolution.fieldModel.set(resolution.target, instance); } } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectWriter.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectWriter.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/replication/serial/ObjectWriter.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -83,8 +83,8 @@ } else { - Class<? extends Object> objClass = obj.getClass(); - TypeModel typeModel = context.getTypeDomain().getTypeModel(objClass); + Class<?> objClass = obj.getClass(); + TypeModel<?> typeModel = context.getTypeDomain().getTypeModel(objClass); // if (typeModel == null) @@ -99,15 +99,15 @@ // SerializationStatus status = SerializationStatus.NONE; - for (TypeModel currentTypeModel = typeModel;currentTypeModel != null;currentTypeModel = currentTypeModel.getSuperType()) + for (TypeModel<?> currentTypeModel = typeModel;currentTypeModel != null;currentTypeModel = currentTypeModel.getSuperType()) { - if (currentTypeModel instanceof ReplicatableTypeModel) + if (currentTypeModel instanceof ReplicatableTypeModel<?>) { - for (FieldModel fieldModel : currentTypeModel.getFields()) + for (FieldModel<?, ?> fieldModel : currentTypeModel.getFields()) { if (!fieldModel.isTransient()) { - Object fieldValue = fieldModel.getValue(obj); + Object fieldValue = fieldModel.get(obj); if (fieldValue == null) { output.writeObject(DataKind.NULL_VALUE); Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/TestTypeModel.java =================================================================== --- portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/TestTypeModel.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/TestTypeModel.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -43,37 +43,41 @@ { TypeDomain domain = new TypeDomain(); assertType(String.class, domain.add(String.class)); - assertEquals(4, domain.getSize()); + assertEquals(5, domain.getSize()); assertType(String.class, domain.getTypeModel(String.class)); assertType(Object.class, domain.getTypeModel(Object.class)); - assertType(int.class, domain.getTypeModel(int.class)); + assertType(Integer.class, domain.getTypeModel(Integer.class)); assertType(char[].class, domain.getTypeModel(char[].class)); + assertType(Number.class, domain.getTypeModel(Number.class)); } public void testJuu() { TypeDomain domain = new TypeDomain(); - ReplicatableTypeModel aTM = (ReplicatableTypeModel) domain.add(A.class); + ReplicatableTypeModel<A> aTM = (ReplicatableTypeModel) domain.add(A.class); assertEquals(A.class.getName(), aTM.getName()); +/* assertEquals(SetBuilder. create(domain.getTypeModel(Object.class)). - with(domain.getTypeModel(int.class)). + with(domain.getTypeModel(Integer.class)). + with(domain.getTypeModel(Number.class)). with(domain.getTypeModel(char[].class)). with(aTM). - with(domain.getTypeModel(boolean.class)). + with(domain.getTypeModel(Boolean.class)). build(domain.getTypeModel(String.class)) , domain.getTypeModels()); - Map<String, FieldModel> fieldMap = aTM.getFieldMap(); +*/ + Map<String, FieldModel<A, ?>> fieldMap = aTM.getFieldMap(); assertEquals(3, fieldMap.size()); FieldModel aFM = fieldMap.get("a"); assertEquals("a", aFM.getName()); assertEquals(domain.getTypeModel(String.class), aFM.getType()); FieldModel bFM = fieldMap.get("b"); assertEquals("b", bFM.getName()); - assertEquals(domain.getTypeModel(int.class), bFM.getType()); + assertEquals(domain.getTypeModel(Integer.class), bFM.getType()); FieldModel cFM = fieldMap.get("c"); assertEquals("c", cFM.getName()); - assertEquals(domain.getTypeModel(boolean.class), cFM.getType()); + assertEquals(domain.getTypeModel(Boolean.class), cFM.getType()); } private void assertType(Class<?> javaType, TypeModel typeModel) Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/factory/A1.java =================================================================== --- portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/factory/A1.java 2010-01-16 01:44:51 UTC (rev 1330) +++ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/replication/factory/A1.java 2010-01-16 12:08:06 UTC (rev 1331) @@ -35,7 +35,7 @@ static A2 instance = new A2(); @Override - public <S extends A2> S create(Class<S> type, Map<FieldModel, ?> state) throws CreateException + public <S extends A2> S create(Class<S> type, Map<FieldModel<?, ?>, ?> state) throws CreateException { if (type == A2.class) {