Skip to content

[Java.Interop] optimize JniTypeManager.AssertSimpleReference() #1001

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

Merged
jonpryor merged 2 commits into from
Jun 30, 2022
Merged

[Java.Interop] optimize JniTypeManager.AssertSimpleReference() #1001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4813c03
[Java.Interop] optimize JniTypeManager.AssertSimpleReference()
jonathanpeppers Jun 29, 2022
d6d4609
Consistently use argumentName
jonpryor Jun 30, 2022
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
18 changes: 12 additions & 6 deletions src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,20 @@ void AssertValid ()

internal static void AssertSimpleReference (string jniSimpleReference, string argumentName = "jniSimpleReference")
{
if (jniSimpleReference == null)
if (string.IsNullOrEmpty (jniSimpleReference))
throw new ArgumentNullException (argumentName);
if (jniSimpleReference != null && jniSimpleReference.IndexOf (".", StringComparison.Ordinal) >= 0)
if (jniSimpleReference.IndexOf ('.') >= 0)
throw new ArgumentException ("JNI type names do not contain '.', they use '/'. Are you sure you're using a JNI type name?", argumentName);
if (jniSimpleReference != null && jniSimpleReference.StartsWith ("[", StringComparison.Ordinal))
throw new ArgumentException ("Arrays cannot be present in simplified type references.", argumentName);
if (jniSimpleReference != null && jniSimpleReference.StartsWith ("L", StringComparison.Ordinal) && jniSimpleReference.EndsWith (";", StringComparison.Ordinal))
throw new ArgumentException ("JNI type references are not supported.", argumentName);
switch (jniSimpleReference [0]) {
case '[':
throw new ArgumentException ("Arrays cannot be present in simplified type references.", argumentName);
case 'L':
if (jniSimpleReference [jniSimpleReference.Length - 1] == ';')
throw new ArgumentException ("JNI type references are not supported.", argumentName);
break;
default:
break;
}
}

// NOTE: This method needs to be kept in sync with GetTypeSignatures()
Expand Down