github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove underlying Scala support

Browse Source
This commit is contained in:
rbygrave
2012-10-02 13:26:27 +13:00
parent 72ae11046e
commit 0e5157969d
18 changed files with 615 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+8 -35
View File
@@ -12,7 +12,6 @@ import java.util.logging.Logger;
import javax.persistence.PersistenceException;
import javax.persistence.Transient;
import com.avaje.ebean.config.ScalarTypeConverter;
import com.avaje.ebeaninternal.server.core.Message;
import com.avaje.ebeaninternal.server.deploy.DetermineManyType;
import com.avaje.ebeaninternal.server.deploy.ManyType;
@@ -23,7 +22,6 @@ import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyCompound;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
import com.avaje.ebeaninternal.server.type.CtCompoundType;
import com.avaje.ebeaninternal.server.type.ScalaOptionTypeConverter;
import com.avaje.ebeaninternal.server.type.ScalarType;
import com.avaje.ebeaninternal.server.type.TypeManager;
import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
@@ -38,33 +36,14 @@ import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
public class DeployCreateProperties {
private static final Logger logger = Logger.getLogger(DeployCreateProperties.class.getName());
private final Class<?> scalaOptionClass;
/**
* Use to wrap and unwrap Scala Option.
*/
@SuppressWarnings("rawtypes")
private final ScalarTypeConverter scalaOptionTypeConverter;
private final DetermineManyType determineManyType;
private final DetermineManyType determineManyType;
private final TypeManager typeManager;
@SuppressWarnings("rawtypes")
public DeployCreateProperties(TypeManager typeManager) {
this.typeManager = typeManager;
Class<?> tmpOptionClass = DetectScala.getScalaOptionClass();
if (tmpOptionClass == null){
scalaOptionClass = null;
scalaOptionTypeConverter = null;
} else {
scalaOptionClass = tmpOptionClass;
scalaOptionTypeConverter = new ScalaOptionTypeConverter();
}
this.determineManyType = new DetermineManyType(tmpOptionClass != null);
this.determineManyType = new DetermineManyType();
}
/**
@@ -293,12 +272,6 @@ public class DeployCreateProperties {
Class<?> propertyType = field.getType();
Class<?> innerType = propertyType;
ScalarTypeConverter<?, ?> typeConverter = null;
if (propertyType.equals(scalaOptionClass)){
innerType = determineTargetType(field);
typeConverter = scalaOptionTypeConverter;
}
// check for Collection type (list, set or map)
ManyType manyType = determineManyType.getManyType(propertyType);
@@ -318,17 +291,17 @@ public class DeployCreateProperties {
}
if (innerType.isEnum() || innerType.isPrimitive()){
return new DeployBeanProperty(desc, propertyType, null, typeConverter);
return new DeployBeanProperty(desc, propertyType, null, null);
}
ScalarType<?> scalarType = typeManager.getScalarType(innerType);
if (scalarType != null) {
return new DeployBeanProperty(desc, propertyType, scalarType, typeConverter);
return new DeployBeanProperty(desc, propertyType, scalarType, null);
}
CtCompoundType<?> compoundType = typeManager.getCompoundType(innerType);
if (compoundType != null) {
return new DeployBeanPropertyCompound(desc, propertyType, compoundType, typeConverter);
return new DeployBeanPropertyCompound(desc, propertyType, compoundType, null);
}
if (!isTransientField(field)){
@@ -340,13 +313,13 @@ public class DeployCreateProperties {
typeManager.recursiveCreateScalarDataReader(innerType);
compoundType = typeManager.getCompoundType(innerType);
if (compoundType != null) {
return new DeployBeanPropertyCompound(desc, propertyType, compoundType, typeConverter);
return new DeployBeanPropertyCompound(desc, propertyType, compoundType, null);
}
} else {
// use reflection to support simple immutable value objects
scalarType = typeManager.recursiveCreateScalarTypes(innerType);
return new DeployBeanProperty(desc, propertyType, scalarType, typeConverter);
return new DeployBeanProperty(desc, propertyType, scalarType, null);
}
}
} catch (Exception e){
src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DetectScala.java
-43
View File
@@ -1,43 +0,0 @@
package com.avaje.ebeaninternal.server.deploy.parse;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.api.ClassUtil;
/**
* Used to detected if Scala support is required.
*
* @author rbygrave
*/
public class DetectScala {
private static final Logger logger = Logger.getLogger(DetectScala.class.getName());
private static Class<?> scalaOptionClass = initScalaOptionClass();
private static boolean hasScalaSupport = scalaOptionClass != null;
private static Class<?> initScalaOptionClass() {
try {
return ClassUtil.forName("scala.Option");
} catch (ClassNotFoundException e) {
// scala not in the classpath...
logger.fine("Scala type 'scala.Option' not found. Scala Support disabled.");
return null;
}
}
/**
* Return true if scala is in the classpath.
*/
public static boolean hasScalaSupport() {
return hasScalaSupport;
}
/**
* Return the scala.Option class or null if scala is not in the classpath.
*/
public static Class<?> getScalaOptionClass() {
return scalaOptionClass;
}
}