Fix for javax.persistence and javax.validation

[publicocean0]

I fixed 2 problems targetEntity is not considered in the actual release and javax.validation stack dont work with orientdb.

Bottom you can find the fixes

diff --git a/object/src/main/java/com/orientechnologies/orient/object/enhancement/OObjectEntitySerializer.java b/object/src/main/java/com/orientechnologies/orient/object/enhancement/OObjectEntitySerializer.java index 6cb8b05..3df990e 100755 --- a/object/src/main/java/com/orientechnologies/orient/object/enhancement/OObjectEntitySerializer.java +++ b/object/src/main/java/com/orientechnologies/orient/object/enhancement/OObjectEntitySerializer.java @@ -38,6 +38,7 @@

import javax.persistence.CascadeType; import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OneToOne;

@@ -944,6 +945,21 @@ return null; return getField(fieldName, iClass.getSuperclass()); }

• public static Class<?> getSpecifiedMultiLinkedType(final Field f) {
• final OneToMany m1=f.getAnnotation(OneToMany.class);
• if (m1!=null && !m1.targetEntity().equals(void.class)) return m1.targetEntity();
• final ManyToMany m3=f.getAnnotation(ManyToMany.class);
• if (m3!=null && !m3.targetEntity().equals(void.class)) return m3.targetEntity();
• return null;
• }
• public static Class<?> getSpecifiedLinkedType(final Field f) {
• final ManyToOne m=f.getAnnotation(ManyToOne.class);
• if (m!=null && !m.targetEntity().equals(void.class)) return m.targetEntity();
• final OneToOne m2=f.getAnnotation(OneToOne.class);
• if (m2!=null && !m2.targetEntity().equals(void.class)) return m2.targetEntity();
• return null;

• }

  @SuppressWarnings("unchecked") public static T getNonProxiedInstance(T iObject) { diff --git a/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAPersistenceProvider.java b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAPersistenceProvider.java old mode 100644 new mode 100755 index 522239b..1dfd11f --- a/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAPersistenceProvider.java +++ b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAPersistenceProvider.java @@ -29,13 +29,14 @@ import javax.persistence.spi.ProviderUtil;

  import com.orientechnologies.orient.core.entity.OEntityManager; +import com.orientechnologies.orient.object.jpa.OJPAProviderUtil; import com.orientechnologies.orient.object.jpa.parsing.PersistenceXmlUtil;

  @SuppressWarnings("rawtypes") public class OJPAPersistenceProvider implements PersistenceProvider { /* the log used by this class. /

  - private static Logger logger = Logger.getLogger(OJPAPersistenceProvider.class.getName());

• private static Logger logger = Logger.getLogger(OJPAPersistenceProvider.class.getName());

• private static OJPAProviderUtil providerUtil=new OJPAProviderUtil(); private Collection<? extends PersistenceUnitInfo> persistenceUnits = null;

  public OJPAPersistenceProvider() { @@ -77,6 +78,6 @@

  @Override public ProviderUtil getProviderUtil() {

• throw new UnsupportedOperationException("getProviderUtil");
• return providerUtil; } } diff --git a/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProviderUtil.java b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProviderUtil.java new file mode 100644 index 0000000..042e302 --- /dev/null +++ b/object/src/main/java/com/orientechnologies/orient/object/jpa/OJPAProviderUtil.java @@ -0,0 +1,21 @@ +package com.orientechnologies.orient.object.jpa; + +import javax.persistence.spi.LoadState; +import javax.persistence.spi.ProviderUtil; + +public class OJPAProviderUtil implements ProviderUtil { +
• public LoadState isLoadedWithoutReference(Object entity,
• String attributeName) {
• return LoadState.UNKNOWN;
• } +
• public LoadState isLoadedWithReference(Object entity, String attributeName) {
• return LoadState.UNKNOWN;
• } +
• public LoadState isLoaded(Object entity) {
• return LoadState.UNKNOWN;

• } + +} diff --git a/object/src/main/java/com/orientechnologies/orient/object/metadata/schema/OSchemaProxyObject.java b/object/src/main/java/com/orientechnologies/orient/object/metadata/schema/OSchemaProxyObject.java old mode 100644 new mode 100755 index d3ef4d2..1f3092f --- a/object/src/main/java/com/orientechnologies/orient/object/metadata/schema/OSchemaProxyObject.java +++ b/object/src/main/java/com/orientechnologies/orient/object/metadata/schema/OSchemaProxyObject.java @@ -262,13 +262,16 @@ switch (t) {

  case LINK:

• Class<?> linkedClazz = f.getType();
• Class<?> linkedClazz = OObjectEntitySerializer.getSpecifiedLinkedType(f);
• if (linkedClazz==null) linkedClazz = f.getType(); generateLinkProperty(database, schema, field, t, linkedClazz); break; case LINKLIST: case LINKMAP: case LINKSET:
• linkedClazz = OReflectionHelper.getGenericMultivalueType(f);
• linkedClazz= OObjectEntitySerializer.getSpecifiedMultiLinkedType(f);
• if (linkedClazz==null) linkedClazz = OReflectionHelper.getGenericMultivalueType(f); if (linkedClazz != null) generateLinkProperty(database, schema, field, t, linkedClazz); break;

[enisher]

@publicocean0 it is hard to manage patches in this way. Could you provide a pull request into develop branch?

[publicocean0]

yes :) sorry for the delay.