Fixed generic method signature calling.

Author: asfernandes

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/ExternalEngine.java

@@ -77,8 +77,8 @@ final class ExternalEngine implements IExternalEngineIntf
 {
 	private static final IEncodingFactory encodingFactory = EncodingFactory.getPlatformDefault();
 	private static Map<String, SharedData> sharedDataMap = new ConcurrentHashMap<>();
-	private static Map<Integer, Pair<String, Integer>> fbTypeNames;
-	private static Map<Class<?>, DataType> dataTypesByClass;
+	static Map<Integer, Pair<String, Integer>> fbTypeNames;
+	static Map<Class<?>, DataType> dataTypesByClass;
 	private static Map<String, Class<?>> javaClassesByName;
 	private static Map<Integer, DataType> defaultDataTypes;
 	private IExternalEngine wrapper;
@@ -1257,7 +1257,7 @@ else if (pos[0] != entryPoint.length())
 						{
 							assert outCount == 1;
 
-							if (paramTypes.size() != inCount)
+							if (paramTypes.size() != inCount && paramTypes.size() != 0)
 							{
 								throw new FbException(String.format("Number of parameters (%d) in the Java method " +
 									"does not match the number of parameters (%d) in the function declaration",
@@ -1283,7 +1283,7 @@ else if (pos[0] != entryPoint.length())
 
 						case PROCEDURE:
 						{
-							if (paramTypes.size() != inCount + outCount)
+							if (paramTypes.size() != inCount + outCount && paramTypes.size() != 0)
 							{
 								throw new FbException(String.format("Number of parameters (%d) in the Java method " +
 									"does not match the number of parameters (%d + %d) in the procedure declaration",
@@ -1327,18 +1327,6 @@ else if (pos[0] != entryPoint.length())
 								IMessageMetadata triggerMetadata = metadata.getTriggerMetadata(status);
 								try
 								{
-									int count = triggerMetadata.getCount(status);
-
-									for (int index = 0; index < count; ++index)
-									{
-										Parameter parameter = new Parameter(
-											dataTypesByClass.get(Object.class), Object.class);
-										parameter.name = triggerMetadata.getField(status, index);
-										parameter.type = fbTypeNames.get(triggerMetadata.getType(status, index));
-
-										routine.inputParameters.add(parameter);
-									}
-
 									routine.setupParameters(status, routine.inputParameters, routine.inputMetadata,
 										triggerMetadata, inBuilder);
 								}

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/ExternalProcedure.java

@@ -72,9 +72,13 @@ public IExternalResultSet open(IStatus status, IExternalContext context, Pointer
 			Object[] inOut = new Object[inCount + outCount];
 			Object[] inOut2 = new Object[inCount + outCount];
 
-			try (InternalContext internalContext = InternalContext.create(status, context, routine,
-					new ValuesImpl(inOut, inCount),
-					new ValuesImpl(inOut, inCount, outCount)))
+			boolean closeContext = true;
+
+			InternalContext internalContext = InternalContext.create(status, context, routine,
+				new ValuesImpl(inOut, inCount),
+				new ValuesImpl(inOut, inCount, outCount));
+
+			try
 			{
 				routine.getFromMessage(status, context, routine.inputParameters, inMsg, inOut);
 
@@ -104,12 +108,19 @@ public void dispose()
 						{
 							try
 							{
-								routine.engine.runInClassLoader(status, context,
-									routine.method.getDeclaringClass().getName(), routine.method.getName(),
-									() -> {
-										rs.close();
-										return null;
-									});
+								try
+								{
+									routine.engine.runInClassLoader(status, context,
+										routine.method.getDeclaringClass().getName(), routine.method.getName(),
+										() -> {
+											rs.close();
+											return null;
+										});
+								}
+								finally
+								{
+									internalContext.close();
+								}
 							}
 							catch (Throwable t)
 							{
@@ -153,9 +164,17 @@ public boolean fetch(IStatus status) throws FbException
 
 					ExtResultSet wrapped = new ExtResultSet();
 					wrapped.wrapper = JnaUtil.pin(new IExternalResultSet(wrapped));
+
+					closeContext = false;
+
 					return wrapped.wrapper;
 				}
 			}
+			finally
+			{
+				if (closeContext)
+					internalContext.close();
+			}
 		}
 		catch (InvocationTargetException e)
 		{

src/fbjava-impl/src/main/java/org/firebirdsql/fbjava/impl/Routine.java

@@ -55,6 +55,7 @@ static enum Type
 	final List<Parameter> outputParameters = new ArrayList<>();
 	final ValuesMetadataImpl inputMetadata = new ValuesMetadataImpl();
 	final ValuesMetadataImpl outputMetadata = new ValuesMetadataImpl();
+	boolean generic;
 
 	Routine(IStatus status, IRoutineMetadata metadata, ExternalEngine engine, Type type) throws FbException
 	{
@@ -92,6 +93,23 @@ static enum Type
 	void setupParameters(IStatus status, List<Parameter> parameters, ValuesMetadataImpl valuesMetadata,
 		IMessageMetadata metadata, IMetadataBuilder builder) throws FbException
 	{
+		int count = metadata.getCount(status);
+
+		if (parameters.size() == 0 && count != 0)
+		{
+			for (int index = 0; index < count; ++index)
+			{
+				Parameter parameter = new Parameter(
+					ExternalEngine.dataTypesByClass.get(Object.class), Object.class);
+				parameter.name = metadata.getField(status, index);
+				parameter.type = ExternalEngine.fbTypeNames.get(metadata.getType(status, index));
+
+				parameters.add(parameter);
+			}
+
+			generic = true;
+		}
+
 		for (int i = 0; i < parameters.size(); ++i)
 		{
 			Parameter parameter = parameters.get(i);
@@ -154,7 +172,7 @@ Object run(IStatus status, IExternalContext context, Object[] args) throws Throw
 			() -> {
 				try
 				{
-					return method.invoke(null, args);
+					return method.invoke(null, (generic ? null : args));
 				}
 				catch (Exception | ExceptionInInitializerError t)
 				{

src/fbjava-tests/src/main/java/example/Procedures.java

@@ -18,6 +18,7 @@
  */
 package example;
 
+import java.math.BigDecimal;
 import java.sql.SQLException;
 
 import org.firebirdsql.fbjava.CallableRoutineContext;
@@ -52,11 +53,6 @@ public boolean fetch() throws Exception
 			{
 				return ++o[0] <= i + 5;
 			}
-
-			@Override
-			public void close()
-			{
-			}
 		};
 	}
 
@@ -70,11 +66,6 @@ public boolean fetch() throws Exception
 			{
 				return ++o[0] <= end;
 			}
-
-			@Override
-			public void close()
-			{
-			}
 		};
 	}
 
@@ -91,11 +82,6 @@ public boolean fetch() throws Exception
 
 				return ++o[0] <= end;
 			}
-
-			@Override
-			public void close()
-			{
-			}
 		};
 	}
 
@@ -116,11 +102,6 @@ public boolean fetch() throws Exception
 				else
 					return false;
 			}
-
-			@Override
-			public void close()
-			{
-			}
 		};
 	}
 
@@ -173,4 +154,23 @@ public static void p11(Object i1, Object i2, String[] o1) throws SQLException
 
 		output.set(1, Functions.getValues(inputMetadata, input) + " / " + Functions.getValues(outputMetadata, output));
 	}
+
+	public static ExternalResultSet p12()
+	{
+		ProcedureContext context = ProcedureContext.get();
+		Values outValues = context.getOutputValues();
+
+		BigDecimal i = (BigDecimal) context.getInputValues().get(1);
+		outValues.set(1, i);
+
+		return new ExternalResultSet() {
+			@Override
+			public boolean fetch() throws Exception
+			{
+				BigDecimal o = ((BigDecimal) outValues.get(1)).add(BigDecimal.ONE);
+				outValues.set(1, o);
+				return o.subtract(i).intValue() <= 5;
+			}
+		};
+	}
 }