Skip to content

two cleanups #10249

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.

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: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ public SessionFactoryImpl(
final JdbcMapping jdbcMapping = tenantFilter.getParameterJdbcMapping( TenantIdBinder.PARAMETER_NAME );
assert jdbcMapping != null;
//noinspection unchecked
tenantIdentifierJavaType = jdbcMapping.getJavaTypeDescriptor();
tenantIdentifierJavaType = (JavaType<Object>) jdbcMapping.getJavaTypeDescriptor();
}
for ( Map.Entry<String, FilterDefinition> filterEntry : filters.entrySet() ) {
for ( var filterEntry : filters.entrySet() ) {
if ( filterEntry.getValue().isAutoEnabled() ) {
autoEnabledFilters.add( filterEntry.getValue() );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public interface JdbcMapping extends MappingType, JdbcMappingContainer {
* The descriptor for the Java type represented by this
* expressible type
*/
JavaType getJavaTypeDescriptor();
JavaType<?> getJavaTypeDescriptor();

/**
* The descriptor for the SQL type represented by this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ public CompleteResultBuilderBasicValuedConverted(
BasicValuedMapping underlyingMapping) {
this.explicitColumnName = explicitColumnName;
this.underlyingMapping = underlyingMapping;
@SuppressWarnings("unchecked")
final JavaType<R> relationalType =
underlyingMapping.getJdbcMapping().getJavaTypeDescriptor();
this.valueConverter = new AttributeConverterBean<>(
final JavaType<?> relationalType =
underlyingMapping.getJdbcMapping()
.getJavaTypeDescriptor();
this.valueConverter = new JpaAttributeConverterImpl<>(
converterBean,
converterJtd,
domainJavaType,
relationalType
(JavaType<R>) relationalType
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void bindParameterValue(
// MappingModelExpressible

@Override
public MappingModelExpressible<?> getExpressionType() {
public MappingModelExpressible<T> getExpressionType() {
return this;
}

Expand Down Expand Up @@ -184,6 +184,7 @@ public void applySqlSelections(DomainResultCreationState creationState) {

@Override
public JavaType<T> getExpressibleJavaType() {
return jdbcMapping.getJavaTypeDescriptor();
return (JavaType<T>)
jdbcMapping.getJavaTypeDescriptor();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import org.hibernate.query.spi.QueryOptions;
import org.hibernate.sql.ast.tree.expression.JdbcParameter;
import org.hibernate.type.descriptor.java.JavaType;

import static java.util.Collections.emptyMap;

Expand Down Expand Up @@ -76,14 +77,18 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
for ( var entry : appliedParameters.entrySet() ) {
final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( entry.getKey() );
final JdbcParameterBinding appliedBinding = entry.getValue();
//noinspection unchecked
if ( binding == null || !appliedBinding.getBindType()
.getJavaTypeDescriptor()
.areEqual( binding.getBindValue(), appliedBinding.getBindValue() ) ) {
if ( binding == null
|| !equal( appliedBinding, binding, appliedBinding.getBindType().getJavaTypeDescriptor() ) ) {
return false;
}
}
}
return true;
}

@SuppressWarnings("unchecked")
static <T> boolean equal(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding, JavaType<T> type) {
return type.isInstance( appliedBinding.getBindValue() )
&& type.areEqual( (T) binding.getBindValue(), (T) appliedBinding.getBindValue() );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.sql.ast.tree.expression.JdbcParameter;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
import org.hibernate.type.descriptor.java.JavaType;

/**
* Executable JDBC command
Expand Down Expand Up @@ -128,7 +127,8 @@ else if ( jdbcParameterBindings.getBinding( parameter ) == null ) {
if ( parameter != offsetParameter && parameter != limitParameter ) {
final JdbcParameterBinding binding = jdbcParameterBindings.getBinding( parameter );
// TODO: appliedBinding can be null here, resulting in NPE
if ( binding == null || !areEqualBindings( appliedBinding, binding ) ) {
if ( binding == null
|| !equal( appliedBinding, binding, appliedBinding.getBindType().getJavaTypeDescriptor() ) ) {

Check warning

Code scanning / CodeQL

Dereferenced variable may be null

Variable [appliedBinding](1) may be null at this access as suggested by [this](2) null guard.
return false;
}
}
Expand All @@ -140,11 +140,6 @@ && isCompatible( offsetParameter, limit == null ? null : limit.getFirstRow(), 0
&& isCompatible( limitParameter, limit == null ? null : limit.getMaxRows(), Integer.MAX_VALUE );
}

private static boolean areEqualBindings(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding) {
final JavaType<Object> javaTypeDescriptor = appliedBinding.getBindType().getJavaTypeDescriptor();
return javaTypeDescriptor.areEqual( binding.getBindValue(), appliedBinding.getBindValue() );
}

private boolean isCompatible(JdbcParameter parameter, Integer requestedValue, int defaultValue) {
if ( parameter == null ) {
return requestedValue == null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public BasicResult(
this(
jdbcValuesArrayPosition,
resultVariable,
jdbcMapping.getJavaTypeDescriptor(),
(JavaType<T>)
jdbcMapping.getJavaTypeDescriptor(),
(BasicValueConverter<T,?>)
jdbcMapping.getValueConverter(),
navigablePath,
Expand Down
Loading