fix lots of NPEs in ProcedureParameterMetadataImpl

these could happen when no parameter was registered
due to the optimization of lazily initializing the
list of parameters

Author: gavinking

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java

@@ -18,7 +18,6 @@
 import org.hibernate.type.BindableType;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.procedure.ProcedureParameter;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
 import org.hibernate.query.spi.QueryParameterBindings;
@@ -38,14 +37,6 @@ class ProcedureParameterMetadataImpl implements ProcedureParameterMetadataImplem
 	private ParameterStrategy parameterStrategy = ParameterStrategy.UNKNOWN;
 	private List<ProcedureParameterImplementor<?>> parameters;
 
-	ProcedureParameterMetadataImpl() {
-	}
-
-//	public ProcedureParameterMetadataImpl(NamedCallableQueryMemento memento, SharedSessionContractImplementor session) {
-//		memento.getParameterMementos()
-//				.forEach( parameterMemento -> registerParameter( parameterMemento.resolve( session ) ) );
-//	}
-
 	@Override
 	public void registerParameter(ProcedureParameterImplementor<?> parameter) {
 		if ( parameter.isNamed() ) {
@@ -98,17 +89,18 @@ public boolean hasPositionalParameters() {
 
 	@Override
 	public Set<String> getNamedParameterNames() {
-		if ( !hasNamedParameters() ) {
-			return emptySet();
-		}
-
-		final Set<String> rtn = new HashSet<>();
-		for ( ProcedureParameter<?> parameter : parameters ) {
-			if ( parameter.getName() != null ) {
-				rtn.add( parameter.getName() );
+		if ( hasNamedParameters() && parameters != null ) {
+			final Set<String> names = new HashSet<>();
+			for ( var parameter : parameters ) {
+				if ( parameter.getName() != null ) {
+					names.add( parameter.getName() );
+				}
 			}
+			return names;
+		}
+		else {
+			return emptySet();
 		}
-		return rtn;
 	}
 
 	@Override
@@ -129,7 +121,7 @@ public ParameterStrategy getParameterStrategy() {
 
 	@Override
 	public boolean hasAnyMatching(Predicate<QueryParameterImplementor<?>> filter) {
-		if ( parameters.isEmpty() ) {
+		if ( parameters == null || parameters.isEmpty() ) {
 			return false;
 		}
 		else {
@@ -144,9 +136,11 @@ public boolean hasAnyMatching(Predicate<QueryParameterImplementor<?>> filter) {
 
 	@Override
 	public ProcedureParameterImplementor<?> findQueryParameter(String name) {
-		for ( var parameter : parameters ) {
-			if ( name.equals( parameter.getName() ) ) {
-				return parameter;
+		if ( parameters != null ) {
+			for ( var parameter : parameters ) {
+				if ( name.equals( parameter.getName() ) ) {
+					return parameter;
+				}
 			}
 		}
 		return null;
@@ -163,9 +157,12 @@ public ProcedureParameterImplementor<?> getQueryParameter(String name) {
 
 	@Override
 	public ProcedureParameterImplementor<?> findQueryParameter(int positionLabel) {
-		for ( var parameter : parameters ) {
-			if ( parameter.getName() == null && positionLabel == parameter.getPosition() ) {
-				return parameter;
+		if ( parameters != null ) {
+			for ( var parameter : parameters ) {
+				if ( parameter.getName() == null
+						&& positionLabel == parameter.getPosition() ) {
+					return parameter;
+				}
 			}
 		}
 		return null;
@@ -174,18 +171,20 @@ public ProcedureParameterImplementor<?> findQueryParameter(int positionLabel) {
 	@Override
 	public ProcedureParameterImplementor<?> getQueryParameter(int positionLabel) {
 		final var queryParameter = findQueryParameter( positionLabel );
-		if ( queryParameter != null ) {
-			return queryParameter;
+		if ( queryParameter == null ) {
+			throw new IllegalArgumentException(
+					"Positional parameter " + positionLabel + " is not registered with this procedure call" );
 		}
-		throw new IllegalArgumentException( "Positional parameter [" + positionLabel + "] is not registered with this procedure call" );
+		return queryParameter;
 	}
 
 	@Override
 	public <P> ProcedureParameterImplementor<P> resolve(Parameter<P> parameter) {
-		if ( parameter instanceof ProcedureParameterImplementor<P> parameterImplementor ) {
+		if ( parameters != null
+				&& parameter instanceof ProcedureParameterImplementor<P> procedureParam ) {
 			for ( var registered : parameters ) {
 				if ( registered == parameter ) {
-					return parameterImplementor;
+					return procedureParam;
 				}
 			}
 		}