Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17210 Add annotation to suppress ForbiddenAPI non portable failures for jdk.jfr

This commit is contained in:
Andrea Boriero 2023-09-28 11:51:19 +02:00 committed by Steve Ebersole
parent 9ce2d25041
commit e4128b1e1a
5 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gradle/java-module.gradle
View File

@ -14,7 +14,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'de.thetaphi:forbiddenapis:3.2' classpath 'de.thetaphi:forbiddenapis:3.5.1'
} }
} }
@ -516,6 +516,7 @@ task forbiddenApisUnsafe(type: CheckForbiddenApis, dependsOn: compileJava) {
task forbiddenApisNonPortable(type: CheckForbiddenApis, dependsOn: compileJava) { task forbiddenApisNonPortable(type: CheckForbiddenApis, dependsOn: compileJava) {
bundledSignatures += 'jdk-non-portable' bundledSignatures += 'jdk-non-portable'
suppressAnnotations += ['org.hibernate.internal.build.AllowNonPortable']
} }
task forbiddenApis { task forbiddenApis {

3
hibernate-core/src/main/java/org/hibernate/event/jfr/SessionClosedEvent.java
View File

@ -6,6 +6,8 @@
*/ */
package org.hibernate.event.jfr; package org.hibernate.event.jfr;
import org.hibernate.internal.build.AllowNonPortable;
import jdk.jfr.Category; import jdk.jfr.Category;
import jdk.jfr.Description; import jdk.jfr.Description;
import jdk.jfr.Event; import jdk.jfr.Event;
@ -21,6 +23,7 @@ import jdk.jfr.StackTrace;
@Category("Hibernate ORM") @Category("Hibernate ORM")
@Description("Hibernate Session closed") @Description("Hibernate Session closed")
@StackTrace(false) @StackTrace(false)
@AllowNonPortable
public class SessionClosedEvent extends Event { public class SessionClosedEvent extends Event {
public static final String NAME = "org.hibernate.orm.SessionClosed"; public static final String NAME = "org.hibernate.orm.SessionClosed";

3
hibernate-core/src/main/java/org/hibernate/event/jfr/SessionOpenEvent.java
View File

@ -6,6 +6,8 @@
*/ */
package org.hibernate.event.jfr; package org.hibernate.event.jfr;
import org.hibernate.internal.build.AllowNonPortable;
import jdk.jfr.Category; import jdk.jfr.Category;
import jdk.jfr.Description; import jdk.jfr.Description;
import jdk.jfr.Event; import jdk.jfr.Event;
@ -21,6 +23,7 @@ import jdk.jfr.StackTrace;
@Category("Hibernate ORM") @Category("Hibernate ORM")
@Description("Hibernate Session opened") @Description("Hibernate Session opened")
@StackTrace(false) @StackTrace(false)
@AllowNonPortable
public class SessionOpenEvent extends Event { public class SessionOpenEvent extends Event {
public static final String NAME = "org.hibernate.orm.SessionOpened"; public static final String NAME = "org.hibernate.orm.SessionOpened";

3
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -110,6 +110,7 @@ import org.hibernate.event.spi.SaveOrUpdateEventListener;
import org.hibernate.graph.GraphSemantic; import org.hibernate.graph.GraphSemantic;
import org.hibernate.graph.internal.RootGraphImpl; import org.hibernate.graph.internal.RootGraphImpl;
import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.graph.spi.RootGraphImplementor;
import org.hibernate.internal.build.AllowNonPortable;
import org.hibernate.internal.util.ExceptionHelper; import org.hibernate.internal.util.ExceptionHelper;
import org.hibernate.jpa.internal.LegacySpecHelper; import org.hibernate.jpa.internal.LegacySpecHelper;
import org.hibernate.jpa.internal.util.ConfigurationHelper; import org.hibernate.jpa.internal.util.ConfigurationHelper;
@ -227,6 +228,7 @@ public class SessionImpl
// TODO: this is unused and can be removed // TODO: this is unused and can be removed
private transient boolean isEnforcingFetchGraph; private transient boolean isEnforcingFetchGraph;
@AllowNonPortable
public SessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) { public SessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) {
super( factory, options ); super( factory, options );
@ -423,6 +425,7 @@ public class SessionImpl
closeWithoutOpenChecks(); closeWithoutOpenChecks();
} }
@AllowNonPortable
public void closeWithoutOpenChecks() throws HibernateException { public void closeWithoutOpenChecks() throws HibernateException {
if ( log.isTraceEnabled() ) { if ( log.isTraceEnabled() ) {
log.tracef( "Closing session [%s]", getSessionIdentifier() ); log.tracef( "Closing session [%s]", getSessionIdentifier() );

14
hibernate-core/src/main/java/org/hibernate/internal/build/AllowNonPortable.java Normal file
View File

@ -0,0 +1,14 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.internal.build;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention( RetentionPolicy.CLASS )
public @interface AllowNonPortable {
}