Rebuild var args before send the content to the underlying subsystem

src/net/JNet/Specific/Extensions/JNetCoreExtensions.cs

@@ -29,6 +29,26 @@ namespace MASES.JNet.Specific.Extensions
     /// </summary>
     public static class JNetCoreExtensions
     {
+        /// <summary>
+        /// Builds a new var-arg result starting from fixed parameters stored in <paramref name="fixedParameters"/> and the <see langword="params"/> argument available in <paramref name="varArg"/>
+        /// </summary>
+        /// <typeparam name="T">A supporting type if <see langword="params"/> has a type different from <see langword="object"/></typeparam>
+        /// <param name="varArg">The <see langword="params"/> parameter reported as array</param>
+        /// <param name="fixedParameters">The fixed parameters listed as <see langword="params"/></param>
+        /// <returns>A new array to be passed to the <see langword="params"/> argument with <paramref name="fixedParameters"/> concatedned with <paramref name="varArg"/></returns>
+        public static object[] VarArgRebuild<T>(this T[] varArg, params object[] fixedParameters)
+        {
+            List<object> varArgs = new List<object>(fixedParameters);
+            if (varArg != null)
+            {
+                foreach (var item in varArg)
+                {
+                    varArgs.Add(item);
+                }
+            }
+            return varArgs.ToArray();
+        }
+
         /// <summary>
         /// Retrieve the <see cref="Java.Lang.Class{TClass}"/> from the <typeparamref name="TClass"/>
         /// </summary>

src/net/JNetReflector/InternalExtensions.cs

@@ -1418,8 +1418,9 @@ public static bool HasJVMBaseClassName(this Class entry, bool usedInGenerics, bo
             }
         }
 
-        public static string JVMBaseClassName(this Class entry, bool usedInGenerics, bool isListener, bool camel)
+        public static string JVMBaseClassName(this Class entry, bool usedInGenerics, bool isListener, bool camel, out bool baseClassIsJVMBridgeBase)
         {
+            baseClassIsJVMBridgeBase = false;
             if (isListener)
             {
                 if (entry.ContainsEventListener())
@@ -1430,6 +1431,7 @@ public static string JVMBaseClassName(this Class entry, bool usedInGenerics, boo
             }
             else if (entry.TypeName.IsJVMListenerClassesToRemoveAsListener())
             {
+                baseClassIsJVMBridgeBase = true;
                 string className = entry.JVMClassName(null, usedInGenerics, false);
                 return string.Format("MASES.JCOBridge.C2JBridge.JVMBridgeBase<{0}>", className);
             }
@@ -1506,6 +1508,7 @@ public static string JVMBaseClassName(this Class entry, bool usedInGenerics, boo
                     }
                     else
                     {
+                        baseClassIsJVMBridgeBase = true;
                         string innerName = entry.JVMClassName(null, usedInGenerics, false);
                         return string.Format("MASES.JCOBridge.C2JBridge.JVMBridgeBase<{0}>", innerName);
                     }
@@ -1518,6 +1521,7 @@ public static string JVMBaseClassName(this Class entry, bool usedInGenerics, boo
             }
             catch
             {
+                baseClassIsJVMBridgeBase = true;
                 string className = entry.JVMClassName(null, usedInGenerics, false);
                 return string.Format("MASES.JCOBridge.C2JBridge.JVMBridgeBase<{0}>", className);
             }
@@ -1527,7 +1531,7 @@ public static string JVMBaseInterfaceName(this Class entry, bool usedInGenerics,
         {
             if (!entry.HasJVMBaseClassName(usedInGenerics, isListener, camel)) return string.Empty;
 
-            var fName = entry.JVMBaseClassName(usedInGenerics, isListener, camel);
+            var fName = entry.JVMBaseClassName(usedInGenerics, isListener, camel, out _);
             return ToFullQualifiedInterfaceName(fName, camel);
         }
 

src/net/JNetReflector/InternalMethods.cs

@@ -743,7 +743,7 @@ static void PrepareSingleClass(this Class jClass, IEnumerable<Class> classDefini
                                                      .Replace(AllPackageClasses.ClassStub.SIMPLECLASS, jClass.JVMClassName(null, false, false))
                                                      .Replace(AllPackageClasses.ClassStub.CLASS, jClass.JVMClassName(null, isGeneric, false))
                                                      .Replace(AllPackageClasses.ClassStub.HELP, jClass.JavadocHrefUrl(JNetReflectorCore.UseCamel))
-                                                     .Replace(AllPackageClasses.ClassStub.BASECLASS, jClass.JVMBaseClassName(isGeneric, false, JNetReflectorCore.UseCamel))
+                                                     .Replace(AllPackageClasses.ClassStub.BASECLASS, jClass.JVMBaseClassName(isGeneric, false, JNetReflectorCore.UseCamel, out _))
                                                      .Replace(AllPackageClasses.ClassStub.WHERECLAUSES, string.Empty);
             }
             else
@@ -756,7 +756,7 @@ static void PrepareSingleClass(this Class jClass, IEnumerable<Class> classDefini
                                                 .Replace(AllPackageClasses.ClassStub.CLASS, jClass.JVMClassName(new List<KeyValuePair<string, string>>(), isGeneric, false))
                                                 .Replace(AllPackageClasses.ClassStub.CLASS_DIRECT, jClass.JVMClassName(new List<KeyValuePair<string, string>>(), isGeneric, true))
                                                 .Replace(AllPackageClasses.ClassStub.HELP, jClass.JavadocHrefUrl(JNetReflectorCore.UseCamel))
-                                                .Replace(AllPackageClasses.ClassStub.BASECLASS, jClass.JVMBaseClassName(isGeneric, jClassIsListener, JNetReflectorCore.UseCamel) + (isMainClass ? SpecialNames.MainClassPlaceHolder : string.Empty))
+                                                .Replace(AllPackageClasses.ClassStub.BASECLASS, jClass.JVMBaseClassName(isGeneric, jClassIsListener, JNetReflectorCore.UseCamel, out bool baseClassIsJVMBridgeBase) + (isMainClass ? SpecialNames.MainClassPlaceHolder : string.Empty))
                                                 .Replace(AllPackageClasses.ClassStub.WHERECLAUSES, jClass.WhereClauses(isGeneric, JNetReflectorCore.UseCamel))
                                                 .Replace(AllPackageClasses.ClassStub.ISABSTRACT, isClassAbstract ? "true" : "false")
                                                 .Replace(AllPackageClasses.ClassStub.ISCLOSEABLE, isClassCloseable ? "true" : "false")
@@ -765,7 +765,7 @@ static void PrepareSingleClass(this Class jClass, IEnumerable<Class> classDefini
 
                 if (!jClassIsListener)
                 {
-                    constructorClassBlock = jClass.AnalyzeConstructors(classDefinitions, isGeneric, true).AddTabLevel(1);
+                    constructorClassBlock = jClass.AnalyzeConstructors(classDefinitions, isGeneric, true, baseClassIsJVMBridgeBase).AddTabLevel(1);
                     operatorClassBlock = jClass.AnalyzeOperators(classDefinitions, isGeneric, true).AddTabLevel(1);
                     fieldClassBlock = jClass.AnalyzeFields(classDefinitions, isGeneric).AddTabLevel(1);
                     staticMethodClassBlock = jClass.AnalyzeMethods(classDefinitions, methodPrefilter, isGeneric, false, jClassIsListener, false, true).AddTabLevel(1);
@@ -908,7 +908,7 @@ static void PrepareSingleClass(this Class jClass, IEnumerable<Class> classDefini
             }
         }
 
-        static string AnalyzeConstructors(this Class classDefinition, IEnumerable<Class> classDefinitions, bool isGeneric, bool isNested)
+        static string AnalyzeConstructors(this Class classDefinition, IEnumerable<Class> classDefinitions, bool isGeneric, bool isNested, bool baseClassIsJVMBridgeBase)
         {
             ReportTrace(ReflectionTraceLevel.Info, "******************* Analyze Constructors of {0} *******************", classDefinition.GenericString);
 
@@ -1040,12 +1040,13 @@ static string AnalyzeConstructors(this Class classDefinition, IEnumerable<Class>
                     if (item.IsVarArgs)
                     {
                         constructorParamsBuilder.AppendFormat($"params {typeStr} {varArg.Name()}, ");
+                        if (!baseClassIsJVMBridgeBase) constructorExecutionParamsBuilder.AppendFormat($"{item.Name()}, ");
                     }
                     else
                     {
                         constructorParamsBuilder.AppendFormat($"{typeStr} {item.Name()}, ");
+                        constructorExecutionParamsBuilder.AppendFormat($"{item.Name()}, ");
                     }
-                    constructorExecutionParamsBuilder.AppendFormat($"{item.Name()}, ");
                 }
 
                 ReportTrace(ReflectionTraceLevel.Debug, "Preparing constructor {0}", constructor.GenericString);
@@ -1058,6 +1059,12 @@ static string AnalyzeConstructors(this Class classDefinition, IEnumerable<Class>
                     if (executionParamsString.EndsWith(", ")) executionParamsString = executionParamsString.Substring(0, executionParamsString.Length - 2); // remove last occurrence of ", "
                 }
 
+                if (hasVarArg && baseClassIsJVMBridgeBase)
+                {
+                    executionParamsString = executionParamsString.Length == 0 ? $"{varArg.Name()}"
+                                                                              : $"MASES.JNet.Specific.Extensions.JNetCoreExtensions.VarArgRebuild({varArg.Name()}, {executionParamsString})";
+                }
+
                 var exceptions = constructor.ExceptionTypes;
                 if (exceptions.Length > 0)
                 {
@@ -1844,8 +1851,8 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
                                                                 execStub,
                                                                 methodNameOrigin,
                                                                 string.IsNullOrWhiteSpace(signature) ? string.Empty : $", \"{signature}\"",
-                                                                (executionParamsString.Length == 0 ? string.Empty : ", ")
-                                                                + executionParamsString + ", " + varArg.Name(),
+                                                                executionParamsString.Length == 0 ? $", {varArg.Name()}"
+                                                                                                  : $", MASES.JNet.Specific.Extensions.JNetCoreExtensions.VarArgRebuild({varArg.Name()}, {executionParamsString})",
                                                                 returnType);
                     }
                     else
@@ -1864,8 +1871,9 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
                                                                 isVoidMethod || method.IsObjectReturnType(isGeneric, JNetReflectorCore.UseCamel) ? string.Empty : executeGenType,
                                                                 methodNameOrigin,
                                                                 string.IsNullOrWhiteSpace(signature) ? string.Empty : $", \"{signature}\"",
-                                                                (executionParamsString.Length == 0 ? string.Empty : ", ")
-                                                                + executionParamsString + ", " + varArg.Name());
+                                                                executionParamsString.Length == 0 ? $", {varArg.Name()}"
+                                                                                                  : $", MASES.JNet.Specific.Extensions.JNetCoreExtensions.VarArgRebuild({varArg.Name()}, {executionParamsString})"
+                                                                );
 
                         if (isListenerReturnType && isDirectListener == false)
                         {
@@ -1875,12 +1883,15 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
                                                                           isVoidMethod || method.IsObjectReturnType(isGeneric, JNetReflectorCore.UseCamel) ? string.Empty : executeGenTypeDirect,
                                                                           methodNameOrigin,
                                                                           string.IsNullOrWhiteSpace(signature) ? string.Empty : $", \"{signature}\"",
-                                                                          (executionParamsString.Length == 0 ? string.Empty : ", ")
-                                                                          + executionParamsString + ", " + varArg.Name());
+                                                                          executionParamsString.Length == 0 ? $", {varArg.Name()}"
+                                                                                                            : $", MASES.JNet.Specific.Extensions.JNetCoreExtensions.VarArgRebuild({varArg.Name()}, {executionParamsString})"
+
+                                                                          );
                         }
                     }
-                    executionStub = $"if ({varArg.Name()}.Length == 0) {executionStub} else {executionStubWithVarArg}";
-                    executionStubDirect = $"if ({varArg.Name()}.Length == 0) {executionStubDirect} else {executionStubWithVarArgDirect}";
+
+                    executionStub = executionStubWithVarArg;
+                    executionStubDirect = executionStubWithVarArgDirect;
                 }
 
                 ReportTrace(ReflectionTraceLevel.Debug, "Preparing method {0}", genString);

tests/jvm/jnettest/src/main/java/org/mases/jnet/TestFuture.java

@@ -33,5 +33,7 @@ public CompletableFuture<String> withException() throws InterruptedException {
         return completableFuture;
     }
 
-
-}
+    public void shutdown() throws SecurityException {
+        _service.shutdown();
+    }
+}