Skip to content

[Java.Interop] JniTypeSignature & CultureInfo, empty strings #1002

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 1 commit into from
Jun 30, 2022
Merged

[Java.Interop] JniTypeSignature & CultureInfo, empty strings #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/Java.Interop/Java.Interop/JniTypeSignature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ public string Name {
public JniTypeSignature (string? simpleReference, int arrayRank = 0, bool keyword = false)
{
if (simpleReference != null) {
Comment on lines 43 to 45
Copy link
Member

@jonathanpeppers jonathanpeppers Jun 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is simpleReference allowed to be null?

Copy link
Contributor Author

@jonpryor jonpryor Jun 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonathanpeppers: it's a struct, and thus always has a default constructor, i.e. new JniTypeSignature() is always "valid" (can't/won't throw), and couldn't be overridden at the time (that may have since changed, but default provides original semantics). Given that, and that new JniTypeSignature() is semantically identical to new JniTypeSignature(null) and new JniTypeSignature(null, 0, false), why should new JniTypeSigature(null) throw?

Perhaps it should throw, but at the time it didn't make sense to me.

if (simpleReference.IndexOf (".", StringComparison.Ordinal) >= 0)
if (simpleReference.Length < 1)
throw new ArgumentException ("The empty string is not a valid JNI simple reference.", nameof (simpleReference));
if (simpleReference.IndexOf ('.') >= 0)
throw new ArgumentException ("JNI type names do not contain '.', they use '/'. Are you sure you're using a JNI type name?", nameof (simpleReference));
if (simpleReference.StartsWith ("[", StringComparison.Ordinal))
if (simpleReference [0] == '[')
throw new ArgumentException ("To specify an array, use the ArrayRank property.", nameof (simpleReference));
if (simpleReference.StartsWith ("L", StringComparison.Ordinal) && simpleReference.EndsWith (";", StringComparison.Ordinal))
if (simpleReference [0] == 'L' && simpleReference [simpleReference.Length-1] == ';' )
throw new ArgumentException ("JNI type references are not supported.", nameof (simpleReference));
}

Expand Down Expand Up @@ -105,6 +107,8 @@ public static bool TryParse (string signature, [NotNullWhen (true)] out JniTypeS

if (signature == null)
return new ArgumentNullException (nameof (signature));
if (signature.Length < 1)
return new ArgumentException ("The empty string is not a valid JNI simple reference.", nameof (signature));

int i = 0;
int r = 0;
Expand Down
15 changes: 15 additions & 0 deletions tests/Java.Interop-Tests/Java.Interop/JniTypeSignatureTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ public void Constructor_Exceptions ()
Assert.Throws<ArgumentException> (() => new JniTypeSignature ("java.lang.Object"));
Assert.Throws<ArgumentException> (() => new JniTypeSignature ("[[I"));
Assert.Throws<ArgumentException> (() => new JniTypeSignature ("Ljava/lang/Object;"));
Assert.Throws<ArgumentException> (() => new JniTypeSignature (""));
}

[Test]
public void DefaultConstructor ()
{
var t = new JniTypeSignature ();
Assert.False (t.IsValid);
}

[Test]
Expand Down Expand Up @@ -55,6 +63,7 @@ public void QualifiedReference ()
public void Parse ()
{
Assert.Throws<ArgumentNullException> (() => JniTypeSignature.Parse ((string) null));
Assert.Throws<ArgumentException> (() => JniTypeSignature.Parse (""));
Assert.Throws<ArgumentException> (() => JniTypeSignature.Parse ("java.lang.String"));
Assert.Throws<ArgumentException> (() => JniTypeSignature.Parse ("Ljava/lang/String;I"));
Assert.Throws<ArgumentException> (() => JniTypeSignature.Parse ("ILjava/lang/String;"));
Expand All @@ -78,6 +87,12 @@ static void AssertGetJniTypeInfoForJniTypeReference (string jniTypeReference, st
Assert.AreEqual (jniTypeName, sig.SimpleReference, "JniTypeName for: " + jniTypeReference);
Assert.AreEqual (arrayRank, sig.ArrayRank, "ArrayRank for: " + jniTypeReference);
}

[Test]
public void TryParse ()
{
Assert.False (JniTypeSignature.TryParse ("", out var _));
}
}
}