Skip to content

Commit abfade5

Browse files
jpobstjonpryor
authored andcommitted
[Java.Interop] Fix C# warnings (#652)
Fixes 43 Nullable Reference Type warnings Fixes CS0168 warning: The variable 'e' is declared but never used. Fixes 6 CA1307 warnings introduced by targeting `netcoreapp3.1`: The behavior of 'string.IndexOf(char)' could vary based on the current user's locale settings.
1 parent fb6d5f9 commit abfade5

22 files changed

+92
-93
lines changed

src/Java.Interop/Java.Interop/JavaArray.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -258,31 +258,31 @@ bool ICollection<T>.Remove (T item)
258258
throw new NotSupportedException ();
259259
}
260260

261-
bool IList.Contains (object value)
261+
bool IList.Contains (object? value)
262262
{
263263
if (value is T)
264264
return Contains ((T) value);
265265
return false;
266266
}
267267

268-
int IList.IndexOf (object value)
268+
int IList.IndexOf (object? value)
269269
{
270270
if (value is T)
271271
return IndexOf ((T) value);
272272
return -1;
273273
}
274274

275-
int IList.Add (object value)
275+
int IList.Add (object? value)
276276
{
277277
throw new NotSupportedException ();
278278
}
279279

280-
void IList.Insert (int index, object value)
280+
void IList.Insert (int index, object? value)
281281
{
282282
throw new NotSupportedException ();
283283
}
284284

285-
void IList.Remove (object value)
285+
void IList.Remove (object? value)
286286
{
287287
throw new NotSupportedException ();
288288
}

src/Java.Interop/Java.Interop/JavaException.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected virtual void Dispose (bool disposing)
162162
}
163163
}
164164

165-
public override bool Equals (object obj)
165+
public override bool Equals (object? obj)
166166
{
167167
JniPeerMembers.AssertSelf (this);
168168

src/Java.Interop/Java.Interop/JavaObject.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected virtual void Dispose (bool disposing)
110110
{
111111
}
112112

113-
public override bool Equals (object obj)
113+
public override bool Equals (object? obj)
114114
{
115115
JniPeerMembers.AssertSelf (this);
116116

src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs

+17-16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
using Java.Interop.Expressions;
99
using System.Linq.Expressions;
10+
using System.Diagnostics.CodeAnalysis;
1011

1112
namespace Java.Interop {
1213

@@ -246,7 +247,7 @@ public override IList<Boolean> CreateGenericValue (ref JniObjectReference refere
246247
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaBooleanArray (ref h, o));
247248
}
248249

249-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Boolean> value, ParameterAttributes synchronize)
250+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Boolean> value, ParameterAttributes synchronize)
250251
{
251252
return JavaArray<Boolean>.CreateArgumentState (value, synchronize, (list, copy) => {
252253
var a = copy
@@ -257,7 +258,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
257258
});
258259
}
259260

260-
public override void DestroyGenericArgumentState (IList<Boolean> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
261+
public override void DestroyGenericArgumentState ([AllowNull] IList<Boolean> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
261262
{
262263
JavaArray<Boolean>.DestroyArgumentState<JavaBooleanArray> (value, ref state, synchronize);
263264
}
@@ -422,7 +423,7 @@ public override IList<SByte> CreateGenericValue (ref JniObjectReference referenc
422423
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaSByteArray (ref h, o));
423424
}
424425

425-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<SByte> value, ParameterAttributes synchronize)
426+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<SByte> value, ParameterAttributes synchronize)
426427
{
427428
return JavaArray<SByte>.CreateArgumentState (value, synchronize, (list, copy) => {
428429
var a = copy
@@ -433,7 +434,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
433434
});
434435
}
435436

436-
public override void DestroyGenericArgumentState (IList<SByte> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
437+
public override void DestroyGenericArgumentState ([AllowNull] IList<SByte> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
437438
{
438439
JavaArray<SByte>.DestroyArgumentState<JavaSByteArray> (value, ref state, synchronize);
439440
}
@@ -598,7 +599,7 @@ public override IList<Char> CreateGenericValue (ref JniObjectReference reference
598599
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaCharArray (ref h, o));
599600
}
600601

601-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Char> value, ParameterAttributes synchronize)
602+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Char> value, ParameterAttributes synchronize)
602603
{
603604
return JavaArray<Char>.CreateArgumentState (value, synchronize, (list, copy) => {
604605
var a = copy
@@ -609,7 +610,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
609610
});
610611
}
611612

612-
public override void DestroyGenericArgumentState (IList<Char> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
613+
public override void DestroyGenericArgumentState ([AllowNull] IList<Char> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
613614
{
614615
JavaArray<Char>.DestroyArgumentState<JavaCharArray> (value, ref state, synchronize);
615616
}
@@ -774,7 +775,7 @@ public override IList<Int16> CreateGenericValue (ref JniObjectReference referenc
774775
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaInt16Array (ref h, o));
775776
}
776777

777-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Int16> value, ParameterAttributes synchronize)
778+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Int16> value, ParameterAttributes synchronize)
778779
{
779780
return JavaArray<Int16>.CreateArgumentState (value, synchronize, (list, copy) => {
780781
var a = copy
@@ -785,7 +786,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
785786
});
786787
}
787788

788-
public override void DestroyGenericArgumentState (IList<Int16> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
789+
public override void DestroyGenericArgumentState ([AllowNull] IList<Int16> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
789790
{
790791
JavaArray<Int16>.DestroyArgumentState<JavaInt16Array> (value, ref state, synchronize);
791792
}
@@ -950,7 +951,7 @@ public override IList<Int32> CreateGenericValue (ref JniObjectReference referenc
950951
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaInt32Array (ref h, o));
951952
}
952953

953-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Int32> value, ParameterAttributes synchronize)
954+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Int32> value, ParameterAttributes synchronize)
954955
{
955956
return JavaArray<Int32>.CreateArgumentState (value, synchronize, (list, copy) => {
956957
var a = copy
@@ -961,7 +962,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
961962
});
962963
}
963964

964-
public override void DestroyGenericArgumentState (IList<Int32> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
965+
public override void DestroyGenericArgumentState ([AllowNull] IList<Int32> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
965966
{
966967
JavaArray<Int32>.DestroyArgumentState<JavaInt32Array> (value, ref state, synchronize);
967968
}
@@ -1126,7 +1127,7 @@ public override IList<Int64> CreateGenericValue (ref JniObjectReference referenc
11261127
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaInt64Array (ref h, o));
11271128
}
11281129

1129-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Int64> value, ParameterAttributes synchronize)
1130+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Int64> value, ParameterAttributes synchronize)
11301131
{
11311132
return JavaArray<Int64>.CreateArgumentState (value, synchronize, (list, copy) => {
11321133
var a = copy
@@ -1137,7 +1138,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
11371138
});
11381139
}
11391140

1140-
public override void DestroyGenericArgumentState (IList<Int64> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
1141+
public override void DestroyGenericArgumentState ([AllowNull] IList<Int64> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
11411142
{
11421143
JavaArray<Int64>.DestroyArgumentState<JavaInt64Array> (value, ref state, synchronize);
11431144
}
@@ -1302,7 +1303,7 @@ public override IList<Single> CreateGenericValue (ref JniObjectReference referen
13021303
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaSingleArray (ref h, o));
13031304
}
13041305

1305-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Single> value, ParameterAttributes synchronize)
1306+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Single> value, ParameterAttributes synchronize)
13061307
{
13071308
return JavaArray<Single>.CreateArgumentState (value, synchronize, (list, copy) => {
13081309
var a = copy
@@ -1313,7 +1314,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
13131314
});
13141315
}
13151316

1316-
public override void DestroyGenericArgumentState (IList<Single> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
1317+
public override void DestroyGenericArgumentState ([AllowNull] IList<Single> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
13171318
{
13181319
JavaArray<Single>.DestroyArgumentState<JavaSingleArray> (value, ref state, synchronize);
13191320
}
@@ -1478,7 +1479,7 @@ public override IList<Double> CreateGenericValue (ref JniObjectReference referen
14781479
(ref JniObjectReference h, JniObjectReferenceOptions o) => new JavaDoubleArray (ref h, o));
14791480
}
14801481

1481-
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState (IList<Double> value, ParameterAttributes synchronize)
1482+
public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState ([MaybeNull] IList<Double> value, ParameterAttributes synchronize)
14821483
{
14831484
return JavaArray<Double>.CreateArgumentState (value, synchronize, (list, copy) => {
14841485
var a = copy
@@ -1489,7 +1490,7 @@ public override JniValueMarshalerState CreateGenericObjectReferenceArgumentState
14891490
});
14901491
}
14911492

1492-
public override void DestroyGenericArgumentState (IList<Double> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
1493+
public override void DestroyGenericArgumentState ([AllowNull] IList<Double> value, ref JniValueMarshalerState state, ParameterAttributes synchronize)
14931494
{
14941495
JavaArray<Double>.DestroyArgumentState<JavaDoubleArray> (value, ref state, synchronize);
14951496
}

src/Java.Interop/Java.Interop/JavaProxyObject.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#nullable enable
1+
#nullable enable
22

33
using System;
44
using System.Diagnostics.CodeAnalysis;
@@ -51,7 +51,7 @@ public override bool Equals (object? obj)
5151

5252
public bool Equals (JavaProxyObject? other) => object.Equals (Value, other?.Value);
5353

54-
public override string ToString ()
54+
public override string? ToString ()
5555
{
5656
return Value.ToString ();
5757
}
@@ -63,8 +63,7 @@ public override string ToString ()
6363
return null;
6464

6565
lock (CachedValues) {
66-
JavaProxyObject proxy;
67-
if (CachedValues.TryGetValue (value, out proxy))
66+
if (CachedValues.TryGetValue (value, out var proxy))
6867
return proxy;
6968
proxy = new JavaProxyObject (value);
7069
CachedValues.Add (value, proxy);

0 commit comments

Comments
 (0)