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 Validation and LDAP features

Browse Source
This commit is contained in:
Robin Bygrave
2013-04-09 00:05:42 +12:00
parent fb28c641d0
commit 9f624ec2bf
27 changed files with 132 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+1 -1
View File
@@ -15,11 +15,11 @@ import javax.persistence.JoinColumns;
import javax.persistence.JoinTable;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotNull;
import com.avaje.ebean.annotation.EmbeddedColumns;
import com.avaje.ebean.annotation.Where;
import com.avaje.ebean.config.NamingConvention;
import com.avaje.ebean.validation.NotNull;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager;
import com.avaje.ebeaninternal.server.deploy.BeanTable;
import com.avaje.ebeaninternal.server.deploy.TableJoin;
src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java
+6 -50
View File
@@ -1,8 +1,5 @@
package com.avaje.ebeaninternal.server.deploy.parse;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.sql.Types;
import java.util.Iterator;
import java.util.Map;
@@ -23,6 +20,8 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.Version;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import com.avaje.ebean.annotation.CreatedTimestamp;
import com.avaje.ebean.annotation.EmbeddedColumns;
@@ -36,11 +35,6 @@ import com.avaje.ebean.config.GlobalProperties;
import com.avaje.ebean.config.dbplatform.DbEncrypt;
import com.avaje.ebean.config.dbplatform.DbEncryptFunction;
import com.avaje.ebean.config.dbplatform.IdType;
import com.avaje.ebean.validation.Length;
import com.avaje.ebean.validation.NotNull;
import com.avaje.ebean.validation.Pattern;
import com.avaje.ebean.validation.Patterns;
import com.avaje.ebean.validation.ValidatorMeta;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
@@ -92,7 +86,6 @@ public class AnnotationFields extends AnnotationParser {
readField(prop);
}
readValidations(prop);
}
}
@@ -214,11 +207,11 @@ public class AnnotationFields extends AnnotationParser {
prop.setNullable(false);
}
Length length = get(prop, Length.class);
if (length != null) {
if (length.max() < Integer.MAX_VALUE) {
Size size = get(prop, Size.class);
if (size != null) {
if (size.max() < Integer.MAX_VALUE) {
// explicitly specify a version column
prop.setDbLength(length.max());
prop.setDbLength(size.max());
}
}
@@ -460,41 +453,4 @@ public class AnnotationFields extends AnnotationParser {
}
}
private void readValidations(DeployBeanProperty prop) {
Field field = prop.getField();
if (field != null) {
Annotation[] fieldAnnotations = field.getAnnotations();
for (int i = 0; i < fieldAnnotations.length; i++) {
readValidations(prop, fieldAnnotations[i]);
}
}
Method readMethod = prop.getReadMethod();
if (readMethod != null) {
Annotation[] methAnnotations = readMethod.getAnnotations();
for (int i = 0; i < methAnnotations.length; i++) {
readValidations(prop, methAnnotations[i]);
}
}
}
private void readValidations(DeployBeanProperty prop, Annotation ann) {
Class<?> type = ann.annotationType();
if (type.equals(Patterns.class)) {
// treating this as a special case for now...
Patterns patterns = (Patterns) ann;
Pattern[] patternsArray = patterns.patterns();
for (int i = 0; i < patternsArray.length; i++) {
util.createValidator(prop, patternsArray[i]);
}
} else {
ValidatorMeta meta = type.getAnnotation(ValidatorMeta.class);
if (meta != null) {
util.createValidator(prop, ann);
}
}
}
}
src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java
-19
View File
@@ -1,8 +1,6 @@
package com.avaje.ebeaninternal.server.deploy.parse;
import java.lang.annotation.Annotation;
import java.sql.Types;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.EnumType;
@@ -17,7 +15,6 @@ import com.avaje.ebean.config.NamingConvention;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebean.config.TableName;
import com.avaje.ebean.config.dbplatform.DatabasePlatform;
import com.avaje.ebean.validation.factory.Validator;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyCompound;
import com.avaje.ebeaninternal.server.type.DataEncryptSupport;
@@ -50,8 +47,6 @@ public class DeployUtil {
private final TypeManager typeManager;
private final ValidatorFactoryManager validatorFactoryManager;
private final String manyToManyAlias;
private final DatabasePlatform dbPlatform;
@@ -75,8 +70,6 @@ public class DeployUtil {
// this alias is used for ManyToMany lazy loading queries
this.manyToManyAlias = "zzzzzz";
this.validatorFactoryManager = new ValidatorFactoryManager();
}
public TypeManager getTypeManager() {
@@ -119,18 +112,6 @@ public class DeployUtil {
return manyToManyAlias;
}
public void createValidator(DeployBeanProperty prop, Annotation ann) {
try {
Validator validator = validatorFactoryManager.create(ann, prop.getPropertyType());
if (validator != null){
prop.addValidator(validator);
}
} catch (Exception e){
String msg = "Error creating a validator on "+prop.getFullBeanName();
logger.log(Level.SEVERE, msg, e);
}
}
public ScalarType<?> setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
Class<?> enumType = prop.getPropertyType();