mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Changes to support the preceeding merges
This commit is contained in:
1 parent
a6163b31d6
commit
22f67ee49a
19 files changed
+100
-37
No files matched your search
@@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType;
|
||||
|
||||
import com.avaje.ebean.Query.UseIndex;
|
||||
import com.avaje.ebean.annotation.CacheStrategy;
|
||||
import com.avaje.ebean.annotation.EntityConcurrencyMode;
|
||||
import com.avaje.ebean.annotation.LdapDomain;
|
||||
import com.avaje.ebean.annotation.NamedUpdate;
|
||||
import com.avaje.ebean.annotation.NamedUpdates;
|
||||
@@ -150,7 +151,7 @@ public class AnnotationClass extends AnnotationParser {
|
||||
|
||||
EntityConcurrencyMode entityConcurrencyMode = cls.getAnnotation(EntityConcurrencyMode.class);
|
||||
if (entityConcurrencyMode!=null) {
|
||||
descriptor.setConcurrencyMode(entityConcurrencyMode.value());
|
||||
//descriptor.setConcurrencyMode(entityConcurrencyMode.value());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ import javax.persistence.Version;
|
||||
import com.avaje.ebean.annotation.CreatedTimestamp;
|
||||
import com.avaje.ebean.annotation.EmbeddedColumns;
|
||||
import com.avaje.ebean.annotation.Encrypted;
|
||||
import com.avaje.ebean.annotation.Expose;
|
||||
import com.avaje.ebean.annotation.Formula;
|
||||
import com.avaje.ebean.annotation.LdapAttribute;
|
||||
import com.avaje.ebean.annotation.LdapId;
|
||||
@@ -136,6 +137,12 @@ public class AnnotationFields extends AnnotationParser {
|
||||
if (column != null) {
|
||||
readColumn(column, prop);
|
||||
}
|
||||
Expose expose = get(prop, Expose.class);
|
||||
if (expose != null) {
|
||||
prop.setExposeSerialize(expose.serialize());
|
||||
prop.setExposeDeserialize(expose.deserialize());
|
||||
}
|
||||
|
||||
LdapAttribute ldapAttribute = get(prop, LdapAttribute.class);
|
||||
if (ldapAttribute != null) {
|
||||
// read ldap specific property settings
|
||||
|
||||
Reference in new issue
Block a user