Skip to content

HHH-19918 Avoid reflection when instantiating known FormatMapper #11210

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

Open
wants to merge 1 commit into
base: 7.1
Choose a base branch
from
+8 −37
Open

HHH-19918 Avoid reflection when instantiating known FormatMapper #11210

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
45 changes: 8 additions & 37 deletions hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,67 +41,38 @@ private static boolean ableToLoadJacksonOSONFactory() {

public static @Nullable FormatMapper getXMLJacksonFormatMapperOrNull(FormatMapperCreationContext creationContext) {
return JACKSON_XML_AVAILABLE
? createFormatMapper( "org.hibernate.type.format.jackson.JacksonXmlFormatMapper", creationContext )
? new JacksonXmlFormatMapper( creationContext )
: null;
}

public static @Nullable FormatMapper getJsonJacksonFormatMapperOrNull(FormatMapperCreationContext creationContext) {
return JACKSON_JSON_AVAILABLE
? createFormatMapper( "org.hibernate.type.format.jackson.JacksonJsonFormatMapper", creationContext )
? new JacksonJsonFormatMapper( creationContext )
: null;
}
public static @Nullable FormatMapper getOsonJacksonFormatMapperOrNull(FormatMapperCreationContext creationContext) {
return JACKSON_OSON_AVAILABLE
? createFormatMapper( "org.hibernate.type.format.jackson.JacksonOsonFormatMapper", creationContext )
? new JacksonOsonFormatMapper( creationContext )
: null;
}

public static @Nullable FormatMapper getXMLJacksonFormatMapperOrNull(boolean legacyFormat) {
if ( JACKSON_XML_AVAILABLE ) {
try {
final Class<?> formatMapperClass = JacksonIntegration.class.getClassLoader()
.loadClass( "org.hibernate.type.format.jackson.JacksonXmlFormatMapper" );
return (FormatMapper) formatMapperClass.getDeclaredConstructor( boolean.class )
.newInstance( legacyFormat );
}
catch (Exception e) {
throw new RuntimeException( "Couldn't instantiate Jackson XML FormatMapper", e );
}
}
return null;
return JACKSON_XML_AVAILABLE
? new JacksonXmlFormatMapper( legacyFormat )
: null;
}

public static @Nullable FormatMapper getJsonJacksonFormatMapperOrNull() {
return JACKSON_JSON_AVAILABLE
? createFormatMapper( "org.hibernate.type.format.jackson.JacksonJsonFormatMapper", null )
? new JacksonJsonFormatMapper()
: null;
}
public static @Nullable FormatMapper getOsonJacksonFormatMapperOrNull() {
return JACKSON_OSON_AVAILABLE
? createFormatMapper( "org.hibernate.type.format.jackson.JacksonOsonFormatMapper", null )
? new JacksonOsonFormatMapper()
: null;
}

private static FormatMapper createFormatMapper(String className, @Nullable FormatMapperCreationContext creationContext) {
try {
if ( creationContext == null ) {
final Class<?> formatMapperClass = JacksonIntegration.class.getClassLoader()
.loadClass( className );
return (FormatMapper) formatMapperClass.getDeclaredConstructor().newInstance();
}
else {
return (FormatMapper) creationContext.getBootstrapContext()
.getClassLoaderAccess()
.classForName( className )
.getDeclaredConstructor( FormatMapperCreationContext.class )
.newInstance( creationContext );
}
}
catch (Exception e) {
throw new RuntimeException( "Couldn't instantiate Jackson FormatMapper", e );
}
}

/**
* Checks that Oracle OSON extension available
*
Expand Down
Loading