Skip to content

Commit

Permalink
Changes after discussion with Lukas.
Browse files Browse the repository at this point in the history 
Signed-off-by: Tomáš Kraus <[email protected]>
  • Loading branch information
@Tomas-Kraus
Tomas-Kraus committed Oct 24, 2023
1 parent 7ec64f8 commit afd8703
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 78 deletions.
1 change: 0 additions & 1 deletion ...ava/org/eclipse/persistence/internal/localization/i18n/ExceptionLocalizationResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ public class ExceptionLocalizationResource extends ListResourceBundle {
{ "getpersistenceunitutil_called_on_closed_emf", "getPersistenceUnitUtil() was called on a closed EntityManagerFactory."},
{ "named_entity_graph_exists", "NamedEntityGraph with name {0} found on {1} already exists in this persistence unit."},
{ "cannot_get_from_non_correlated_query", "getCorrelationParent() called on a from-clause that was not obtained through correlation." },
{ "multiple_keys_in_entity", "Cannot add join of {0} to {1} because target class contains multiple attributes of source type"},
{ "no_key_in_entity", "Cannot add join of {0} to {1} because target class is missing attribute of source type"},
{ "RIGHT_JOIN_NOT_SUPPORTED", "Right join is not supported"},
{ "wrap_convert_exception", "An exception occurred while calling {0} on converter class {1} with value {2}"},
Expand Down
2 changes: 0 additions & 2 deletions .../java/org/eclipse/persistence/internal/localization/i18n/LoggingLocalizationResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,7 @@ public class LoggingLocalizationResource extends ListResourceBundle {
{ "dbws_no_wsdl_inline_schema", "The [{0}] WSDL inline schema could not be read."},
// JPA 3.2
{ "unknown_cacheRetrieveMode_type", "Unknown {0} type of jakarta.persistence.cache.retrieveMode property"},
{ "unknown_legacy_cacheRetrieveMode_type", "Unknown {0} type of jakarta.persistence.cacheRetrieveMode property"},
{ "unknown_cacheStoreMode_type", "Unknown {0} type of jakarta.persistence.cache.storeMode property"},
{ "unknown_legacy_cacheStoreMode_type", "Unknown {0} type of jakarta.persistence.cacheStoreMode property"},
{ "unknown_queryTimeoutUnit_type", "Unknown {0} type of eclipselink.query.timeout.unit property"},
{ "unknown_queryTimeout_type", "Unknown {0} type of jakarta.persistence.query.timeout property"},
{ "error_queryTimeoutParse", "Could not parse jakarta.persistence.query.timeout property value {0}: {1}"},
Expand Down
17 changes: 14 additions & 3 deletions ....jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.Map;

import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.config.QueryHints;
import org.eclipse.persistence.config.TargetDatabase;
import org.eclipse.persistence.internal.jpa.EntityManagerSetupImpl.TableCreationType;
import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
Expand Down Expand Up @@ -85,7 +86,9 @@ public class EntityManagerFactoryProvider {
{PersistenceUnitProperties.JDBC_PASSWORD , "eclipselink.jdbc.password"},
{PersistenceUnitProperties.WEAVING , "persistence.tools.weaving"},
{PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METAMODEL, PersistenceUnitProperties.LOGGING_LEVEL + ".jpa_" + SessionLog.METAMODEL},
{PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METADATA, PersistenceUnitProperties.LOGGING_LEVEL + ".ejb_or_" + SessionLog.METADATA}
{PersistenceUnitProperties.LOGGING_LEVEL + "." + SessionLog.METADATA, PersistenceUnitProperties.LOGGING_LEVEL + ".ejb_or_" + SessionLog.METADATA},
{QueryHints.CACHE_RETRIEVE_MODE, "jakarta.persistence.cacheRetrieveMode"},
{QueryHints.CACHE_STORE_MODE, "jakarta.persistence.cacheStoreMode"}
};

/**
Expand Down Expand Up @@ -132,8 +135,16 @@ protected static void generateDefaultTables(SchemaManager mgr, TableCreationType
* {@link System} property or {@code null} if property identified by {@code propertyKey} does not exist.
*/
public static String getConfigPropertyAsString(final String propertyKey, final Map overrides) {
final String value = overrides != null ? (String)overrides.get(propertyKey) : null;
return value != null ? value : PrivilegedAccessHelper.getSystemProperty(propertyKey);
Object value = overrides != null ? overrides.get(propertyKey) : null;
if (value != null) {
if (value instanceof String strValue) {
return strValue;
} else {
return value.toString();
}
} else {
return PrivilegedAccessHelper.getSystemProperty(propertyKey);
}
}

/**
Expand Down
9 changes: 7 additions & 2 deletions ...persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,9 @@ protected Object findInternal(ClassDescriptor descriptor, AbstractSession sessio
}
}

// Translate deprecated properties to the current names
EntityManagerFactoryProvider.translateOldProperties(properties, this.databaseSession);

// Get the read object query and apply the properties to it.
// PERF: use descriptor defined query to avoid extra query creation.
ReadObjectQuery query = descriptor.getQueryManager().getReadObjectQuery();
Expand All @@ -956,8 +959,10 @@ protected Object findInternal(ClassDescriptor descriptor, AbstractSession sessio

// Apply any EclipseLink defaults if they haven't been set through
// the properties.
if (properties == null || ( !properties.containsKey(QueryHints.CACHE_USAGE) && !properties.containsKey(QueryHints.CACHE_RETRIEVE_MODE) && !properties.containsKey(QueryHints.CACHE_STORE_MODE)
&& !properties.containsKey("jakarta.persistence.cacheRetrieveMode") && !properties.containsKey("jakarta.persistence.cacheStoreMode"))) {
if (properties == null ||
( !properties.containsKey(QueryHints.CACHE_USAGE)
&& !properties.containsKey(QueryHints.CACHE_RETRIEVE_MODE)
&& !properties.containsKey(QueryHints.CACHE_STORE_MODE))) {
query.conformResultsInUnitOfWork();
}

Expand Down
36 changes: 2 additions & 34 deletions ...e.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/FindOptionUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,9 @@ static Options parse(Map<String, Object> properties, FindOption... options) {
return OptionsBuilder.build(properties, options);
}

private static final String LEGACY_CACHE_RETRIEVE_MODE = "jakarta.persistence.cacheRetrieveMode";

// Based on EntityManagerImpl#getQueryHints(Object,OperationType)
static CacheRetrieveMode getCacheRetrieveMode(Map<?, Object> properties) {
// Try QueryHints property 1st
// QueryHints property
Object propertyValue = properties.get(QueryHints.CACHE_RETRIEVE_MODE);
if (propertyValue instanceof CacheRetrieveMode) {
return (CacheRetrieveMode) propertyValue;
Expand All @@ -164,33 +162,17 @@ static CacheRetrieveMode getCacheRetrieveMode(Map<?, Object> properties) {
"unknown_cacheRetrieveMode_type",
propertyValue.getClass().getName());
}
// Try legacy property as fallback option
propertyValue = properties.get(LEGACY_CACHE_RETRIEVE_MODE);
if (propertyValue instanceof CacheRetrieveMode) {
return (CacheRetrieveMode) propertyValue;
} else if (propertyValue != null) {
AbstractSessionLog.getLog().log(SessionLog.WARNING,
SessionLog.QUERY,
"unknown_legacy_cacheRetrieveMode_type",
propertyValue.getClass().getName());
}
// Default value according to JPA spec.
return CacheRetrieveMode.USE;
}

@SuppressWarnings("unchecked")
static void setCacheRetrieveMode(Map<?, Object> properties, CacheRetrieveMode cacheRetrieveMode) {
// Remove legacy property if exists, will be overwritten
properties.remove(LEGACY_CACHE_RETRIEVE_MODE);
// Store new cache retrieve mode as QueryHints.CACHE_RETRIEVE_MODE.
// Previous value, if exists, is overwritten
((Map<String, Object>)properties).put(QueryHints.CACHE_RETRIEVE_MODE, cacheRetrieveMode);
}

private static final String LEGACY_CACHE_STORE_MODE = "jakarta.persistence.cacheStoreMode";

static CacheStoreMode getCacheStoreMode(Map<?, Object> properties) {
// Try QueryHints property 1st
// QueryHints property
Object propertyValue = properties.get(QueryHints.CACHE_STORE_MODE);
if (propertyValue instanceof CacheStoreMode) {
return (CacheStoreMode) propertyValue;
Expand All @@ -200,26 +182,12 @@ static CacheStoreMode getCacheStoreMode(Map<?, Object> properties) {
"unknown_cacheStoreMode_type",
propertyValue.getClass().getName());
}
// Try legacy property as fallback option
propertyValue = properties.get(LEGACY_CACHE_STORE_MODE);
if (propertyValue instanceof CacheStoreMode) {
return (CacheStoreMode) propertyValue;
} else if (propertyValue != null) {
AbstractSessionLog.getLog().log(SessionLog.WARNING,
SessionLog.QUERY,
"unknown_legacy_cacheStoreMode_type",
propertyValue.getClass().getName());
}
// Default value according to JPA spec.
return CacheStoreMode.USE;
}

@SuppressWarnings("unchecked")
static void setCacheStoreMode(Map<?, Object> properties, CacheStoreMode cacheStoreMode) {
// Remove legacy property if exists, will be overwritten
properties.remove(LEGACY_CACHE_STORE_MODE);
// Store new cache retrieve mode as QueryHints.CACHE_STORE_MODE.
// Previous value, if exists, is overwritten
((Map<String, Object>)properties).put(QueryHints.CACHE_STORE_MODE, cacheStoreMode);
}

Expand Down
2 changes: 1 addition & 1 deletion ....jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaBuilderImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ public <Y extends Comparable<? super Y>> Predicate between(Expression<? extends
return new CompoundExpressionImpl(this.metamodel, currentNode(v).between(x, y), buildList(v, internalLiteral(x), internalLiteral(y)), "between");
}

protected List<Expression<?>> buildList(Expression<?>... expressions) {
protected static List<Expression<?>> buildList(Expression<?>... expressions) {
// Immutable List causes test failures.
// Those lists are usually small (size 1-2) and modifications are rare. Default list size is too much.
List<Expression<?>> list = new ArrayList<>(expressions.length + 2);
Expand Down
73 changes: 38 additions & 35 deletions ...persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -33,6 +34,7 @@
import jakarta.persistence.criteria.ListJoin;
import jakarta.persistence.criteria.MapJoin;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.SetJoin;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
Expand All @@ -47,10 +49,8 @@
import jakarta.persistence.metamodel.PluralAttribute.CollectionType;
import jakarta.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Type.PersistenceType;

import org.eclipse.persistence.internal.expressions.ObjectExpression;
import org.eclipse.persistence.internal.helper.ClassConstants;
import org.eclipse.persistence.internal.jpa.metamodel.ManagedTypeImpl;
import org.eclipse.persistence.internal.localization.ExceptionLocalization;

/**
Expand Down Expand Up @@ -526,62 +526,65 @@ public <T, Y> Join<T, Y> join(String attributeName, JoinType jt) {
}
}

// TODO-API-3.2
@Override
public <Y> Join<X, Y> join(Class<Y> entityClass) {
return join(entityClass, JoinType.INNER);
}

// TODO-API-3.2
// Adds join for specified class.
// Initializes ON condition with all mapping attributes to be equal to entity @Id if such @Id exists
@Override
@SuppressWarnings("unchecked")
public <Y> Join<X, Y> join(Class<Y> entityClass, JoinType joinType) {
SingularAttribute<? super X, ?> key = null;
// Search target class attributes for SingularAttribute matching source class
for (Attribute<? super X, ?> attribute : ((ManagedType<X>)managedType).getAttributes()) {
if (attribute instanceof SingularAttribute
&& ((SingularAttribute<? super X, ?>)attribute).getBindableJavaType().isAssignableFrom(entityClass)) {
if (key == null) {
key = (SingularAttribute<? super X, ?>)attribute;
// Multiple matching attributes found, can't select the proper one
} else {
throw new IllegalStateException(
ExceptionLocalization.buildMessage("multiple_keys_in_entity",
new String[] {
entityClass.getName(),
this.managedType.getJavaType().getName()}));
// Search target class (this) for SingularAttributes matching source class (entityClass)
JoinImpl<X, Y> join = null;
List<Predicate> equalPredicates = new LinkedList<>();
for (Attribute<? super X, ?> attribute : ((ManagedType<X>) managedType).getAttributes()) {
if ((attribute instanceof SingularAttribute)
&& ((SingularAttribute<?, ?>) attribute).getBindableJavaType().isAssignableFrom(entityClass)) {
SingularAttribute<? super X, Y> singularAttribute = (SingularAttribute<? super X, Y>) attribute;
// Create Join instance if not exists
if (join == null) {
ObjectExpression exp =
((ObjectExpression) this.currentNode).newDerivedExpressionNamed(singularAttribute.getName());
switch (joinType) {
case LEFT:
exp.doUseOuterJoin();
break;
case RIGHT:
throw new UnsupportedOperationException(ExceptionLocalization.buildMessage("RIGHT_JOIN_NOT_SUPPORTED"));
case INNER:
exp.doNotUseOuterJoin();
}
join = new JoinImpl<>(this, managedType, this.metamodel, entityClass, exp, singularAttribute, joinType);
this.joins.add(join);
join.isJoin = true;
}
// Add current target class (this) SingularAttribute into equal predicates if source class has @Id
Expression<Y> keyExpr = get(singularAttribute);
equalPredicates.add(new CompoundExpressionImpl(metamodel,
ExpressionImpl.currentNode(keyExpr)
.notEqual(ExpressionImpl.currentNode(join)),
CriteriaBuilderImpl.buildList(keyExpr, join)));
}
}
if (key == null) {
if (join == null) {
throw new IllegalStateException(
ExceptionLocalization.buildMessage("no_key_in_entity",
new String[] {
entityClass.getName(),
this.managedType.getJavaType().getName()}));
} else {
// TODO: Need to write test for predicates generated by this method
return join.on(equalPredicates.toArray(new Predicate[equalPredicates.size()]));
}
ObjectExpression exp = ((ObjectExpression)this.currentNode).newDerivedExpressionNamed(key.getName());
switch(joinType) {
case LEFT:
exp.doUseOuterJoin();
break;
case RIGHT:
throw new UnsupportedOperationException(ExceptionLocalization.buildMessage("RIGHT_JOIN_NOT_SUPPORTED"));
case INNER:
exp.doNotUseOuterJoin();
}
JoinImpl<X, Y> join = new JoinImpl<>(this, managedType, this.metamodel, entityClass, exp, key, joinType);
this.joins.add(join);
join.isJoin = true;
return join;
}

// TODO-API-3.2
@Override
public <Y> Join<X, Y> join(EntityType<Y> entity) {
return join(entity, JoinType.INNER);
}

// TODO-API-3.2
@Override
public <Y> Join<X, Y> join(EntityType<Y> entity, JoinType joinType) {
return join(entity.getJavaType(), joinType);
Expand Down

0 comments on commit afd8703

Please sign in to comment.