HHH-14137 Some more string check performnance optimisations

hibernate · Aug 6, 2020 · 6392de4 · 6392de4
1 parent ea333d2
commit 6392de4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
@@ -11,6 +11,7 @@
 import org.hibernate.boot.jaxb.cfg.spi.JaxbCfgHibernateConfiguration;
 import org.hibernate.boot.jaxb.internal.stax.LocalXmlResourceResolver;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationException;
 import org.hibernate.internal.util.xml.XsdException;
 import org.jboss.logging.Logger;
@@ -136,7 +137,7 @@ private JaxbCfgHibernateConfiguration unmarshal(XMLEventReader staxEventReader,
 	}
 
 	private boolean isNamespaced(StartElement startElement) {
-		return ! "".equals( startElement.getName().getNamespaceURI() );
+		return StringHelper.isNotEmpty( startElement.getName().getNamespaceURI() );
 	}
 
 	private Schema schema;

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
@@ -26,6 +26,7 @@
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 
+import org.hibernate.internal.util.StringHelper;
 import org.jboss.logging.Logger;
 
 /**
@@ -151,7 +152,7 @@ protected StartElement seekRootElementStartEvent(XMLEventReader staxEventReader,
 	protected abstract Binding doBind(XMLEventReader staxEventReader, StartElement rootElementStartEvent, Origin origin);
 
 	protected static boolean hasNamespace(StartElement startElement) {
-		return ! "".equals( startElement.getName().getNamespaceURI() );
+		return StringHelper.isNotEmpty( startElement.getName().getNamespaceURI() );
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
@@ -21,6 +21,7 @@
 import javax.xml.stream.util.EventReaderDelegate;
 
 import org.hibernate.boot.xsd.MappingXsdSupport;
+import org.hibernate.internal.util.StringHelper;
 
 /**
  * A StAX EventReader for {@code hbm.xml} files to add namespaces in documents
@@ -67,7 +68,7 @@ private XMLEvent wrap(XMLEvent event) {
 	private StartElement applyNamespace(StartElement startElement) {
 		final List<Namespace> targetNamespaces = new ArrayList<Namespace>();
 
-		if ( "".equals( startElement.getName().getNamespaceURI() ) ) {
+		if ( StringHelper.isEmpty( startElement.getName().getNamespaceURI() ) ) {
 			// add the default namespace mapping
 			targetNamespaces.add( xmlEventFactory.createNamespace( MappingXsdSupport.INSTANCE.hbmXsd().getNamespaceUri() ) );
 		}

diff --git a/...rc/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java b/...rc/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java
@@ -7,6 +7,7 @@
 package org.hibernate.boot.model.naming;
 
 import org.hibernate.boot.model.source.spi.AttributePath;
+import org.hibernate.internal.util.StringHelper;
 
 /**
  * An ImplicitNamingStrategy implementation which uses full composite paths
@@ -31,7 +32,7 @@ protected String transformAttributePath(AttributePath attributePath) {
 	public static void process(AttributePath attributePath, StringBuilder sb) {
 		if ( attributePath.getParent() != null ) {
 			process( attributePath.getParent(), sb );
-			if ( !"".equals( attributePath.getParent().getProperty() ) ) {
+			if ( StringHelper.isNotEmpty( attributePath.getParent().getProperty() ) ) {
 				sb.append( '_' );
 			}
 		}

diff --git a/...ate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java b/...ate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
@@ -49,7 +49,7 @@ public static void processNamedQuery(
 		for ( Object content : namedQueryBinding.getContent() ) {
 			if ( String.class.isInstance( content ) ) {
 				String trimmed = ((String)content).trim();
-				if (!"".equals(trimmed)) {
+				if ( StringHelper.isNotEmpty( trimmed ) ) {
 					query = trimmed;
 				}
 			}

diff --git a/.../hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/.../hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -72,7 +72,7 @@ public InformationExtractorJdbcDatabaseMetaDataImpl(ExtractionContext extraction
 						""
 				)
 		);
-		if ( !"".equals( extraPhysycalTableTypesConfig.trim() ) ) {
+		if ( ! StringHelper.isEmptyOrWhiteSpace( extraPhysycalTableTypesConfig ) ) {
 			this.extraPhysicalTableTypes = StringHelper.splitTrimmingTokens(
 					",;",
 					extraPhysycalTableTypesConfig,

diff --git a/.../org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java b/.../org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
@@ -43,6 +43,7 @@
 import org.hibernate.envers.internal.tools.MappingTools;
 import org.hibernate.envers.internal.tools.ReflectionTools;
 import org.hibernate.envers.internal.tools.StringTools;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.PropertyPath;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.Property;
@@ -617,7 +618,7 @@ protected boolean checkUsingModifiedFlag(Audited aud) {
 
 	private void setPropertyRelationMappedBy(XProperty property, PropertyAuditingData propertyData) {
 		final OneToMany oneToMany = property.getAnnotation( OneToMany.class );
-		if ( oneToMany != null && !"".equals( oneToMany.mappedBy() ) ) {
+		if ( oneToMany != null && StringHelper.isNotEmpty( oneToMany.mappedBy() ) ) {
 			propertyData.setRelationMappedBy( oneToMany.mappedBy() );
 		}
 	}
@@ -626,7 +627,7 @@ private void setPropertyAuditMappedBy(XProperty property, PropertyAuditingData p
 		final AuditMappedBy auditMappedBy = property.getAnnotation( AuditMappedBy.class );
 		if ( auditMappedBy != null ) {
 			propertyData.setAuditMappedBy( auditMappedBy.mappedBy() );
-			if ( !"".equals( auditMappedBy.positionMappedBy() ) ) {
+			if ( StringHelper.isNotEmpty( auditMappedBy.positionMappedBy() ) ) {
 				propertyData.setPositionMappedBy( auditMappedBy.positionMappedBy() );
 			}
 		}

diff --git a/...rnate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java b/...rnate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
@@ -12,6 +12,7 @@
 import org.hibernate.envers.ModificationStore;
 import org.hibernate.envers.configuration.internal.GlobalConfiguration;
 import org.hibernate.envers.configuration.internal.metadata.MetadataTools;
+import org.hibernate.internal.util.StringHelper;
 
 /**
  * Reads the audited properties for components.
@@ -45,7 +46,7 @@ protected boolean checkAudited(
 			propertyData.setRelationTargetAuditMode( aud.targetAuditMode() );
 			propertyData.setUsingModifiedFlag( checkUsingModifiedFlag( aud ) );
 			propertyData.setModifiedFlagName( MetadataTools.getModifiedFlagPropertyName( propertyName, modifiedFlagSuffix ) );
-			if( aud.modifiedColumnName() != null && !"".equals( aud.modifiedColumnName() ) ) {
+			if ( StringHelper.isNotEmpty( aud.modifiedColumnName() ) ) {
 				propertyData.setExplicitModifiedFlagName( aud.modifiedColumnName() );
 			}
 		}