Skip to content

HHH-18906 Allow specifying UnsupportedEnhancementStrategy for Hibernate testing #9363

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
Dec 3, 2024
Merged

HHH-18906 Allow specifying UnsupportedEnhancementStrategy for Hibernate testing #9363

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
8 changes: 8 additions & 0 deletions ...ting/src/main/java/org/hibernate/testing/bytecode/enhancement/BytecodeEnhancerRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.hibernate.bytecode.enhance.spi.UnloadedClass;
import org.hibernate.bytecode.enhance.spi.UnloadedField;

import org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy;
import org.hibernate.testing.junit4.CustomRunner;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
Expand All @@ -29,6 +30,7 @@
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;

import static org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy.SKIP;
import static org.hibernate.bytecode.internal.BytecodeProviderInitiator.buildDefaultBytecodeProvider;

/**
Expand Down Expand Up @@ -113,6 +115,12 @@ public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
public boolean isLazyLoadable(UnloadedField field) {
return options.lazyLoading() && super.isLazyLoadable( field );
}

@Override
public UnsupportedEnhancementStrategy getUnsupportedEnhancementStrategy() {
final UnsupportedEnhancementStrategy strategy = options.unsupportedEnhancementStrategy();
return strategy != SKIP ? strategy : super.getUnsupportedEnhancementStrategy();
}
};
}

Expand Down
3 changes: 3 additions & 0 deletions ...-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/EnhancementOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
*/
package org.hibernate.testing.bytecode.enhancement;

import org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy;

import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
Expand All @@ -21,4 +23,5 @@
boolean inlineDirtyChecking() default false;
boolean lazyLoading() default false;
boolean extendedEnhancement() default false;
UnsupportedEnhancementStrategy unsupportedEnhancementStrategy() default UnsupportedEnhancementStrategy.SKIP;
}
8 changes: 8 additions & 0 deletions ...g/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedClassUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
package org.hibernate.testing.bytecode.enhancement.extension.engine;

import static org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy.SKIP;
import static org.hibernate.bytecode.internal.BytecodeProviderInitiator.buildDefaultBytecodeProvider;

import java.io.BufferedInputStream;
Expand All @@ -27,6 +28,7 @@
import org.hibernate.bytecode.enhance.spi.UnloadedClass;
import org.hibernate.bytecode.enhance.spi.UnloadedField;

import org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy;
import org.hibernate.testing.bytecode.enhancement.ClassEnhancementSelector;
import org.hibernate.testing.bytecode.enhancement.ClassEnhancementSelectors;
import org.hibernate.testing.bytecode.enhancement.ClassSelector;
Expand Down Expand Up @@ -112,6 +114,12 @@ public boolean hasLazyLoadableAttributes(UnloadedClass classDescriptor) {
public boolean isLazyLoadable(UnloadedField field) {
return options.lazyLoading() && super.isLazyLoadable( field );
}

@Override
public UnsupportedEnhancementStrategy getUnsupportedEnhancementStrategy() {
final UnsupportedEnhancementStrategy strategy = options.unsupportedEnhancementStrategy();
return strategy != SKIP ? strategy : super.getUnsupportedEnhancementStrategy();
}
};
}

Expand Down
Loading