(tomee) branch xbean-4.30-SNAPSHOT updated: Additional change to restore previous implicit behaviour if arg types are NOT set

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch xbean-4.30-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/xbean-4.30-SNAPSHOT by this 
push:
     new 7236defcf9 Additional change to restore previous implicit behaviour if 
arg types are NOT set
7236defcf9 is described below

commit 7236defcf94d057aa87f18115013c1269f2eb0cb
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Sun Jan 4 20:32:44 2026 +0100

    Additional change to restore previous implicit behaviour if arg types are 
NOT set
---
 .../src/main/java/org/apache/openejb/assembler/classic/Assembler.java  | 3 ++-
 .../src/main/resources/META-INF/org.apache.openejb/service-jar.xml     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 15222b8324..7a38e87f2a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -3760,7 +3760,8 @@ public class Assembler extends AssemblerTool implements 
org.apache.openejb.spi.A
     public static ObjectRecipe prepareRecipe(final ServiceInfo info) {
         final String[] constructorArgs = info.constructorArgs.toArray(new 
String[0]);
         final Class[] constructorArgTypes = 
info.constructorArgTypes.toArray(new Class[0]);
-        final ObjectRecipe serviceRecipe = new ObjectRecipe(info.className, 
info.factoryMethod, constructorArgs, constructorArgTypes);
+        final ObjectRecipe serviceRecipe = new ObjectRecipe(info.className, 
info.factoryMethod,
+                constructorArgs, constructorArgTypes.length > 0 ? 
constructorArgTypes : null); //if empty, treat as not set
         serviceRecipe.allow(Option.CASE_INSENSITIVE_PROPERTIES);
         serviceRecipe.allow(Option.IGNORE_MISSING_PROPERTIES);
         serviceRecipe.allow(Option.PRIVATE_PROPERTIES);
diff --git 
a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
 
b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
index 5a16c882b6..2389edfc88 100644
--- 
a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
+++ 
b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
@@ -586,6 +586,7 @@
           types="javax.sql.DataSource, DataSource"
           factory-name="create"
           constructor="ServiceId, JtaManaged, JdbcDriver, Definition, 
MaxWaitTime, TimeBetweenEvictionRuns, MinEvictableIdleTime, 
OpenEJBResourceClasspath"
+          
constructor-types="java.lang.String,boolean,java.lang.Class,java.lang.String,org.apache.openejb.util.Duration,org.apache.openejb.util.Duration,org.apache.openejb.util.Duration,boolean"
           class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
     # Determines wether or not this data source should be JTA managed
     # or user managed.  If set to 'true' it will automatically be enrolled
@@ -707,6 +708,7 @@
           service="Resource"
           types="jakarta.jms.Queue, Queue, jakarta.jms.Destination"
           constructor="destination"
+          constructor-types="java.lang.String"
           class-name="org.apache.activemq.command.ActiveMQQueue">
 
     # Specifies the name of the queue