[Java.Interop] Remove support for NewObjectRequired (#1247)

Context: 972c5bc
Context: dotnet/android#9146

As our minimum Android API level is now API-21 (Android 5.0), and
.NET for Android only sets
`Java.Interop.JniRuntime.CreationOptions.NewObjectRequired`=true
on API-10 and lower, we can remove the support for this option.
This has the added benefit of removing the TLS lookup that
`JniEnvironment.Runtime` requires, and thus *should* improve perf.

Add `[Obsolete]` to `JniRuntime.CreationOptions.NewObjectRequired`.

Author: jonpryor

Diff for: src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler/JniPeerInstanceMethodsExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Java.Interop.GenericMarshaler {
 
@@ -14,9 +14,6 @@ T value
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -52,9 +49,6 @@ T value
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value);
 		}
 
@@ -90,9 +84,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2> (
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -132,9 +123,6 @@ public static void FinishGenericCreateInstance<T1, T2> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2);
 		}
 
@@ -174,9 +162,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3> (
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -220,9 +205,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3);
 		}
 
@@ -266,9 +248,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4> (
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -316,9 +295,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4);
 		}
 
@@ -366,9 +342,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5>
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -420,9 +393,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5);
 		}
 
@@ -474,9 +444,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -532,9 +499,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6);
 		}
 
@@ -590,9 +554,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -652,9 +613,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7);
 		}
 
@@ -714,9 +672,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -780,9 +735,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8> (
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8);
 		}
 
@@ -846,9 +798,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -916,9 +865,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9);
 		}
 
@@ -986,9 +932,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1060,9 +1003,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10);
 		}
 
@@ -1134,9 +1074,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1212,9 +1149,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11);
 		}
 
@@ -1290,9 +1224,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1372,9 +1303,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12);
 		}
 
@@ -1454,9 +1382,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1540,9 +1465,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13);
 		}
 
@@ -1626,9 +1548,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1716,9 +1635,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14);
 		}
 
@@ -1806,9 +1722,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -1900,9 +1813,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15);
 		}
 
@@ -1994,9 +1904,6 @@ public static JniObjectReference StartGenericCreateInstance<T1, T2, T3, T4, T5,
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, value16);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -2092,9 +1999,6 @@ public static void FinishGenericCreateInstance<T1, T2, T3, T4, T5, T6, T7, T8, T
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, value16);
 		}
 

Diff for: src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler/JniPeerInstanceMethodsExtensions.tt

@@ -55,9 +55,6 @@ namespace Java.Interop.GenericMarshaler {
 			if (peer == null)
 				throw new ArgumentNullException (nameof (peer));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (peer, constructorSignature, declaringType, <#= methodArgs #>);
-			}
 			return peer.AllocObject (declaringType);
 		}
 
@@ -110,9 +107,6 @@ namespace Java.Interop.GenericMarshaler {
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			_InvokeConstructor (peer, constructorSignature, self, <#= methodArgs #>);
 		}
 

Diff for: src/Java.Interop/Java.Interop/JniPeerMembers.JniInstanceMethods.cs

@@ -159,14 +159,15 @@ JniMethodInfo GetMethodInfo (string method, string signature)
 
 		public unsafe JniObjectReference StartCreateInstance (string constructorSignature, Type declaringType, JniArgumentValue* parameters)
 		{
+			#pragma warning disable CS1717
+			parameters = parameters;    // Silence CA1801
+			#pragma warning restore CS1717
+
 			if (constructorSignature == null)
 				throw new ArgumentNullException (nameof (constructorSignature));
 			if (declaringType == null)
 				throw new ArgumentNullException (nameof (declaringType));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return NewObject (constructorSignature, declaringType, parameters);
-			}
 			var r   = GetConstructorsForType (declaringType)
 				.JniPeerType
 				.AllocObject ();
@@ -197,9 +198,6 @@ public unsafe void FinishCreateInstance (string constructorSignature, IJavaPeera
 			if (self == null)
 				throw new ArgumentNullException (nameof (self));
 
-			if (JniEnvironment.Runtime.NewObjectRequired) {
-				return;
-			}
 			var methods = GetConstructorsForType (self.GetType ());
 			var ctor    = methods.GetConstructor (constructorSignature);
 			JniEnvironment.InstanceMethods.CallNonvirtualVoidMethod (self.PeerReference, methods.JniPeerType.PeerReference, ctor, parameters);

Diff for: src/Java.Interop/Java.Interop/JniRuntime.cs

@@ -50,6 +50,7 @@ public partial class CreationOptions {
 			public  bool                        DestroyRuntimeOnDispose     {get; set;}
 
 			// Prefer JNIEnv::NewObject() over JNIEnv::AllocObject() + JNIEnv::CallNonvirtualVoidMethod()
+			[Obsolete ("No longer supported")]
 			public  bool                        NewObjectRequired           {get; set;}
 
 			public  JniVersion                  JniVersion                  {get; set;}
@@ -158,7 +159,6 @@ public static void SetCurrent (JniRuntime newCurrent)
 		public      JniVersion                          JniVersion          {get; private set;}
 
 		internal    bool                                TrackIDs            {get; private set;}
-		internal    bool                                NewObjectRequired   {get; private set;}
 		internal    bool                                JniAddNativeMethodRegistrationAttributePresent { get; }
 
 		protected JniRuntime (CreationOptions options)
@@ -172,8 +172,6 @@ protected JniRuntime (CreationOptions options)
 			DestroyRuntimeOnDispose     = options.DestroyRuntimeOnDispose;
 			JniAddNativeMethodRegistrationAttributePresent = options.JniAddNativeMethodRegistrationAttributePresent;
 
-			NewObjectRequired   = options.NewObjectRequired;
-
 			JniVersion          = options.JniVersion;
 
 			if (options.InvocationPointer == IntPtr.Zero && options.EnvironmentPointer != IntPtr.Zero) {