Skip to content

HSEARCH-4417 Force classloader precedence to EnhancingClassLoader #2857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2022
Merged

HSEARCH-4417 Force classloader precedence to EnhancingClassLoader #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...ne/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.ObjectPath;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue;
import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;

import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
import org.junit.Ignore;
import org.junit.runner.RunWith;

/**
Expand All @@ -47,7 +48,6 @@
*/
@RunWith(BytecodeEnhancerRunner.class) // So that we can have lazy *ToOne associations
@EnhancementOptions(lazyLoading = true)
@Ignore("HSEARCH-4417 likely ORM bugs")
public class AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT
extends AbstractAutomaticIndexingAssociationBaseIT<
AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT.IndexedEntity,
Expand All @@ -59,6 +59,15 @@ public AutomaticIndexingOneToOneOwnedByContainingLazyOnContainedSideIT() {
super( new ModelPrimitivesImpl() );
}

@Override
public void setup(OrmSetupHelper.SetupContext setupContext,
ReusableOrmSetupHolder.DataClearConfig dataClearConfig) {
super.setup( setupContext, dataClearConfig );

// Necessary for BytecodeEnhancerRunner, see BytecodeEnhancementIT.setup
setupContext.withTcclLookupPrecedenceBefore();
}

private static class ModelPrimitivesImpl
implements ModelPrimitives<IndexedEntity, ContainingEntity, ContainedEntity> {

Expand Down
13 changes: 11 additions & 2 deletions ...e/ownedbycontaining/AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.ObjectPath;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue;
import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;

import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
import org.junit.Ignore;
import org.junit.runner.RunWith;

/**
Expand All @@ -47,7 +48,6 @@
*/
@RunWith(BytecodeEnhancerRunner.class) // So that we can have lazy *ToOne associations
@EnhancementOptions(lazyLoading = true)
@Ignore("HSEARCH-4417 likely ORM bugs")
public class AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT
extends AbstractAutomaticIndexingAssociationBaseIT<
AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT.IndexedEntity,
Expand All @@ -59,6 +59,15 @@ public AutomaticIndexingOneToOneOwnedByContainingLazyOnContainingSideIT() {
super( new ModelPrimitivesImpl() );
}

@Override
public void setup(OrmSetupHelper.SetupContext setupContext,
ReusableOrmSetupHolder.DataClearConfig dataClearConfig) {
super.setup( setupContext, dataClearConfig );

// Necessary for BytecodeEnhancerRunner, see BytecodeEnhancementIT.setup
setupContext.withTcclLookupPrecedenceBefore();
}

private static class ModelPrimitivesImpl
implements ModelPrimitives<IndexedEntity, ContainingEntity, ContainedEntity> {

Expand Down