Skip to content

Add stream support for array return types #1013

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.

Sign up for GitHub

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
masesdevelopers wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add stream support for array return types #1013

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9fd2ac
Bump MASES.JCOBridge from 2.6.9-rc6 to 2.6.9-rc7
dependabot[bot] Apr 28, 2026
43ff81c
Add stream support for array return types
masesdevelopers Apr 28, 2026
a7c1f27
Merge branch 'master' into 1012-introduce-in-jnetreflector-ability-to…
masesdevelopers Jun 11, 2026
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
2 changes: 1 addition & 1 deletion src/net/JNet/JNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
<PackageReference Include="MASES.JCOBridge" Version="2.6.9-rc6">
<PackageReference Include="MASES.JCOBridge" Version="2.6.9-rc7">
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 2 additions & 0 deletions src/net/JNetReflector/InternalConst.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public static string VersionPlaceHolder()
public const string JavaLangListener = "Listener";
public const string JavaLangAdapter = "Adapter";
public const string ArrayTypeTrailer = "[]";
public const string ArrayTypeMethodTrailer = "Array";
public const string StreamTypeMethodTrailer = "Stream";
public const string PropertySuffix = "Property";
public const string ClassSuffix = "Class";
public const string FieldSuffix = "Field";
Expand Down
81 changes: 57 additions & 24 deletions src/net/JNetReflector/InternalExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ static string GetBound(this Java.Lang.Reflect.Type bound, bool usedInGenerics, b
}
else
{
result = ToNetType(bound.TypeName, false, camel);
result = ToNetType(bound.TypeName, false, camel, JNetReflectorCore.UseDotNetNullable, JNetReflectorCore.UseDirectDotNetType);
}
return result;
}
Expand Down Expand Up @@ -841,7 +841,7 @@ static string GetGenerics(this Java.Lang.Reflect.Type entry, IList<string> genAr
}
else
{
retVal = ToNetType(entry.TypeName, false, camel);
retVal = ToNetType(entry.TypeName, false, camel, JNetReflectorCore.UseDotNetNullable, JNetReflectorCore.UseDirectDotNetType);
}
}
return retVal;
Expand Down Expand Up @@ -2021,12 +2021,45 @@ static bool IsJVMNativeType(string typeName)
}
}

public static bool IsJVMNativeRawOrBoxedType(this string typeName)
{
if (typeName == null) throw new ArgumentNullException(nameof(typeName));
switch (typeName)
{
case "boolean":
case "byte":
case "char":
case "short":
case "int":
case "long":
case "float":
case "double":
case "java.lang.Boolean":
case "java.lang.Byte":
case "java.lang.Character":
case "java.lang.Short":
case "java.lang.Integer":
case "java.lang.Long":
case "java.lang.Float":
case "java.lang.Double":
return true;
default: return false;
}
}

public static string JVMNativeRawOrBoxedToNetType(this string typeName)
{
if (typeName == null) throw new ArgumentNullException(nameof(typeName));
var cName = ToNetType(typeName, false, false, false, true);
return cName;
}

public static string ToNetType(this Java.Lang.Reflect.Type type, bool camel)
{
if (type == null) throw new ArgumentNullException(nameof(type));
var cName = type.TypeName;
cName = cName.Contains(SpecialNames.BeginGenericDeclaration) ? cName.Substring(0, cName.IndexOf(SpecialNames.BeginGenericDeclaration)) : cName;
cName = ToNetType(cName, false, camel);
cName = ToNetType(cName, false, camel, JNetReflectorCore.UseDotNetNullable, JNetReflectorCore.UseDirectDotNetType);
return cName;
}

Expand All @@ -2035,15 +2068,15 @@ public static string ToNetType(this Class type, bool camel)
if (type == null) throw new ArgumentNullException(nameof(type));
var cName = type.TypeName;
cName = cName.Contains(SpecialNames.BeginGenericDeclaration) ? cName.Substring(0, cName.IndexOf(SpecialNames.BeginGenericDeclaration)) : cName;
cName = ToNetType(cName, false, camel);
cName = ToNetType(cName, false, camel, JNetReflectorCore.UseDotNetNullable, JNetReflectorCore.UseDirectDotNetType);
return cName;
}

static string ToNetType(string typeName, bool isFromArray, bool camel)
static string ToNetType(string typeName, bool isFromArray, bool camel, bool useNullable, bool useDirectDotNetType)
{
if (typeName.EndsWith(SpecialNames.ArrayTypeTrailer)) return ToNetType(typeName.Remove(typeName.LastIndexOf(SpecialNames.ArrayTypeTrailer)), true, camel) + SpecialNames.ArrayTypeTrailer;
if (typeName.EndsWith(SpecialNames.ArrayTypeTrailer)) return ToNetType(typeName.Remove(typeName.LastIndexOf(SpecialNames.ArrayTypeTrailer)), true, camel, useNullable, useDirectDotNetType) + SpecialNames.ArrayTypeTrailer;

if (JNetReflectorCore.UseDotNetNullable)
if (useNullable)
{
switch (typeName)
{
Expand All @@ -2053,47 +2086,47 @@ static string ToNetType(string typeName, bool isFromArray, bool camel)
case "boolean":
return "bool";
case "java.lang.Boolean":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "bool" : "bool?";
case "byte":
return "byte";
case "java.lang.Byte":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "byte" : "byte?";
case "char":
return "char";
case "java.lang.Character":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "char" : "char?";
case "short":
return "short";
case "java.lang.Short":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "short" : "short?";
case "int":
return "int";
case "java.lang.Integer":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "int" : "int?";
case "long":
return "long";
case "java.lang.Long":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "long" : "long?";
case "float":
return "float";
case "java.lang.Float":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "float" : "float?";
case "double":
return "double";
case "java.lang.Double":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return isFromArray ? "double" : "double?";
case "java.lang.Object":
return "object";
case "java.lang.String":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "string";
default: break;
}
Expand All @@ -2110,42 +2143,42 @@ static string ToNetType(string typeName, bool isFromArray, bool camel)
case "boolean":
return "bool";
case "java.lang.Boolean":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "bool";
case "byte":
return "byte";
case "java.lang.Byte":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "byte";
case "char":
return "char";
case "java.lang.Character":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "char";
case "short":
return "short";
case "java.lang.Short":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "short";
case "int":
return "int";
case "java.lang.Integer":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "int";
case "long":
return "long";
case "java.lang.Long":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "long";
case "float":
return "float";
case "java.lang.Float":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "float";
case "double":
return "double";
case "java.lang.Double":
if (!JNetReflectorCore.UseDirectDotNetType) break;
if (!useDirectDotNetType) break;
return "double";
case "java.lang.Object":
return "object";
Expand Down
69 changes: 65 additions & 4 deletions src/net/JNetReflector/InternalMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,7 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas

string methodName = prop.Key;
string modifier = string.Empty;
string streamReturnType = string.Empty;
string returnType = string.Empty;
Method getMethod = null;
Method setMethod = null;
Expand Down Expand Up @@ -1469,16 +1470,26 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
bool isGetDeprecated = false;
bool isSetDeprecated = false;

StringBuilder streamExecutionStub = new StringBuilder();
StringBuilder executionStub = new StringBuilder();
if (getMethod != null)
{
string getSignature = getMethod.SignatureFromGenericString();
string streamExecStub = string.Empty;
string execStub = getMethod.IsStatic() ? AllPackageClasses.ClassStub.MethodStub.STATIC_EXECUTE : AllPackageClasses.ClassStub.MethodStub.INSTANCE_EXECUTE;
if (!string.IsNullOrWhiteSpace(getSignature))
{
execStub += AllPackageClasses.ClassStub.MethodStub.SIGNATURE_EXECUTE_TRAILER;
}
if (isArrayReturnType) execStub += "Array";
if (isArrayReturnType)
{
if (returnType.IsJVMNativeRawOrBoxedType())
{
streamReturnType = returnType.JVMNativeRawOrBoxedToNetType();
streamExecStub = execStub + SpecialNames.StreamTypeMethodTrailer;
}
execStub += SpecialNames.ArrayTypeMethodTrailer;
}
if (JNetReflectorCore.ReflectDeprecated) isGetDeprecated = getMethod.IsDeprecated();
if (getMethod.IsReturnTypeAnException())
{
Expand All @@ -1492,6 +1503,14 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
getMethod.IsVoid() || getMethod.IsObjectReturnType(isGeneric, JNetReflectorCore.UseCamel) ? string.Empty : $"<{returnType}>",
getMethod.Name,
string.IsNullOrWhiteSpace(getSignature) ? string.Empty : $", \"{getSignature}\"");

if (!string.IsNullOrWhiteSpace(streamReturnType))
{
streamExecutionStub.AppendFormat(execFormat, streamExecStub,
$"<MASES.JCOBridge.C2JBridge.JCOBridgeStream<{streamReturnType}>>",
getMethod.Name,
string.IsNullOrWhiteSpace(getSignature) ? string.Empty : $", \"{getSignature}\"");
}
}
}

Expand Down Expand Up @@ -1523,7 +1542,35 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
jPropDecoration.Append(AllPackageClasses.ClassStub.MethodStub.OBSOLETE_DECORATION);
}

string singleProperty;
string singleProperty = string.Empty;
if (!string.IsNullOrWhiteSpace(streamReturnType))
{
if (forInterface)
{
var execInterface = AllPackageClasses.ClassStub.PropertyStub.GET_INTERFACE_FORMAT;

var template = Template.GetTemplate(Template.SingleInterfacePropertyTemplate);
singleProperty = template.Replace(AllPackageClasses.ClassStub.PropertyStub.DECORATION, jPropDecoration.ToString())
.Replace(AllPackageClasses.ClassStub.PropertyStub.TYPE, $"MASES.JCOBridge.C2JBridge.JCOBridgeStream<{streamReturnType}>")
.Replace(AllPackageClasses.ClassStub.PropertyStub.NAME, methodName + SpecialNames.StreamTypeMethodTrailer)
.Replace(AllPackageClasses.ClassStub.PropertyStub.EXECUTION, execInterface)
.Replace(AllPackageClasses.ClassStub.PropertyStub.GET_HELP, getMethod != null ? getMethod.JavadocHrefUrl(JNetReflectorCore.UseCamel) : string.Empty)
.Replace(AllPackageClasses.ClassStub.PropertyStub.SET_HELP, string.Empty);
}
else
{
var template = Template.GetTemplate(Template.SinglePropertyTemplate);
singleProperty = template.Replace(AllPackageClasses.ClassStub.PropertyStub.DECORATION, jPropDecoration.ToString())
.Replace(AllPackageClasses.ClassStub.PropertyStub.MODIFIER, modifier)
.Replace(AllPackageClasses.ClassStub.PropertyStub.TYPE, $"MASES.JCOBridge.C2JBridge.JCOBridgeStream<{streamReturnType}>")
.Replace(AllPackageClasses.ClassStub.PropertyStub.NAME, methodName + SpecialNames.StreamTypeMethodTrailer)
.Replace(AllPackageClasses.ClassStub.PropertyStub.EXECUTION, streamExecutionStub.ToString())
.Replace(AllPackageClasses.ClassStub.PropertyStub.GET_HELP, getMethod != null ? getMethod.JavadocHrefUrl(JNetReflectorCore.UseCamel) : string.Empty)
.Replace(AllPackageClasses.ClassStub.PropertyStub.SET_HELP, string.Empty);
}
}
if (!string.IsNullOrWhiteSpace(singleProperty)) subClassBlock.AppendLine(singleProperty);

if (forInterface)
{
var execInterface = (getMethod != null ? AllPackageClasses.ClassStub.PropertyStub.GET_INTERFACE_FORMAT : string.Empty) + (setMethod != null ? AllPackageClasses.ClassStub.PropertyStub.SET_INTERFACE_FORMAT : string.Empty);
Expand Down Expand Up @@ -1798,6 +1845,8 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas

bool isArrayReturnType = false;

string streamReturnType = string.Empty;
string streamExecStub = string.Empty;
string execStub = method.IsStatic() ? AllPackageClasses.ClassStub.MethodStub.STATIC_EXECUTE : AllPackageClasses.ClassStub.MethodStub.INSTANCE_EXECUTE;
if (!string.IsNullOrWhiteSpace(signature))
{
Expand All @@ -1806,7 +1855,12 @@ static string AnalyzeMethods(this Class classDefinition, IEnumerable<Class> clas
if (returnType.EndsWith(SpecialNames.ArrayTypeTrailer))
{
returnType = returnType.Substring(0, returnType.IndexOf(SpecialNames.ArrayTypeTrailer));
execStub += "Array";
if (returnType.IsJVMNativeRawOrBoxedType())
{
streamReturnType = returnType.JVMNativeRawOrBoxedToNetType();
Comment thread
github-code-quality[bot] marked this conversation as resolved.
Fixed
streamExecStub = execStub + SpecialNames.StreamTypeMethodTrailer;
Comment thread
github-code-quality[bot] marked this conversation as resolved.
Fixed
}
execStub += SpecialNames.ArrayTypeMethodTrailer;
isArrayReturnType = true;
}

Expand Down Expand Up @@ -2510,6 +2564,8 @@ static string AnalyzeFields(this Class classDefinition, IEnumerable<Class> class
ReportTrace(ReflectionTraceLevel.Debug, "Preparing field {0}", field.GenericString);

bool isFinal = field.IsFinal();
string getStreamType;
string getStreamFunction;
string getFunction;
string getFormat;
string setFormat;
Expand All @@ -2530,7 +2586,12 @@ static string AnalyzeFields(this Class classDefinition, IEnumerable<Class> class
if (fieldType.EndsWith(SpecialNames.ArrayTypeTrailer))
{
fieldType = fieldType.Substring(0, fieldType.IndexOf(SpecialNames.ArrayTypeTrailer));
getFunction += "Array";
if (fieldType.IsJVMNativeRawOrBoxedType())
{
getStreamType = fieldType.JVMNativeRawOrBoxedToNetType();
Comment thread
github-code-quality[bot] marked this conversation as resolved.
Fixed
getStreamFunction = getFunction + SpecialNames.StreamTypeMethodTrailer;
Comment thread
github-code-quality[bot] marked this conversation as resolved.
Fixed
}
getFunction += SpecialNames.ArrayTypeMethodTrailer;
isArrayReturnType = true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetReflector/JNetReflector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
<PackageReference Include="MASES.JCOBridge" Version="2.6.9-rc6">
<PackageReference Include="MASES.JCOBridge" Version="2.6.9-rc7">
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</PackageReference>
Expand Down
Loading