[Java.Interop] Gendarme-related cleaning (#205)

radekdoulik · jonpryor · commit 61c70ece24e5 · 2017-10-27T13:18:33.000-04:00
* `Gendarme.Rules.Performance.AvoidRepetitiveCastsRule`:
    `M:Java.Interop.JniValueMarshaler`1&lt;T&gt; Java.Interop.JniRuntime/JniValueManager::GetValueMarshaler()`
    Refactored to cast only once and made shorter.

* `Gendarme.Rules.Performance.AvoidUnsealedUninheritedInternalTypeRule`:
    Sealed the classes

* `Gendarme.Rules.Design.AvoidVisibleFieldsRule`:
    Mentioned ``T:Java.Interop.JavaArray`1``. This field is only used
    from `internal` methods, thus changed the field itself to
    `internal`.

* `Gendarme.Rules.Correctness.CheckParametersNullityInVisibleMethodsRule`
    `M:System.Linq.Expressions.Expression Java.Interop.JniValueMarshaler::ReturnObjectReferenceToJni(Java.Interop.Expressions.JniValueMarshalerContext,System.String,System.Linq.Expressions.Expression)`
    Check for `context` being `null`.

After these we are down to 122 remaining Gendarme defects.
diff --git a/gendarme-ignore.txt b/gendarme-ignore.txt
@@ -198,6 +198,8 @@ M: System.Linq.Expressions.Expression`1<System.Func`4<System.Reflection.Construc
 
 R: Gendarme.Rules.Exceptions.DoNotSwallowErrorsCatchingNonSpecificExceptionsRule
 M: System.Reflection.Assembly Java.Interop.JniRuntime/JniTypeManager::TryLoadAssembly(System.Reflection.AssemblyName)
+# The exception is transitioned to Jni
+M:System.Void Java.Interop.ManagedPeer::Construct(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)
 
 R: Gendarme.Rules.Exceptions.ExceptionShouldBeVisibleRule
 T: Java.Interop.JniLocationException
@@ -525,7 +527,6 @@ R: Gendarme.Rules.Performance.AvoidRepetitiveCastsRule
 # The "repetitive" cast is in a Debug.Assert() call, which should be "stand-alone"
 M: Java.Interop.JniObjectReference Java.Interop.JniEnvironment/Strings::NewString(System.Object)
 
-
 R: Gendarme.Rules.Performance.AvoidUncalledPrivateCodeRule
 # These are `public` for "completeness" reasons.
 M: Java.Interop.JniObjectReferenceType Java.Interop.JniEnvironment/References::GetObjectRefType(Java.Interop.JniObjectReference)
@@ -554,7 +555,6 @@ R: Gendarme.Rules.Performance.AvoidUnusedParametersRule
 # This method is virtual; *overrides* need the parameter, not the default implementation.
 M: System.Collections.Generic.IEnumerable`1<System.Type> Java.Interop.JniRuntime/JniTypeManager::CreateGetTypesForSimpleReferenceEnumerator(System.String)
 
-
 R: Gendarme.Rules.Performance.UseTypeEmptyTypesRule
 # The PCL profile we're using doen't *have* Type.EmptyTypes!
 M: System.Void Java.Interop.JniRuntime/JniTypeManager::.cctor()
@@ -568,3 +568,12 @@ M: System.Void Java.Interop.JniEnvironment/Exceptions::Throw(System.Exception)
 R: Gendarme.Rules.Correctness.DisposableFieldsShouldBeDisposedRule
 # We call Dispose on marshalMemberBuilder field in the JniRuntime::Dispose method. Looks like gendarme bug, it doesn't handle well the `?.` operator.
 T: Java.Interop.JniRuntime
+
+R: Gendarme.Rules.Performance.AvoidUnusedPrivateFieldsRule
+# The weak_handle and refs_added fields are used from C code, in java-interop-gc-bridge-mono.c, and thus invisible to Gendarme
+T: Java.Interop.JavaException
+T: Java.Interop.JavaObject
+
+R: Gendarme.Rules.Design.Generic.DoNotExposeGenericListsRule
+# We don't care here as we don't hold the list and create it on request. So to avoid performace penalty, we keep the list as return type
+M: System.Collections.Generic.List`1<Java.Interop.JniSurfacedPeerInfo> Java.Interop.JniRuntime/JniValueManager::GetSurfacedPeers()
diff --git a/src/Java.Interop/Java.Interop/JavaArray.cs b/src/Java.Interop/Java.Interop/JavaArray.cs
@@ -14,7 +14,7 @@ internal delegate TArray ArrayCreator<TArray> (ref JniObjectReference reference,
 
 		// Value was created via CreateMarshalCollection, and thus can
 		// be disposed of with impunity when no longer needed.
-		protected bool forMarshalCollection;
+		internal bool forMarshalCollection;
 
 		internal JavaArray (ref JniObjectReference handle, JniObjectReferenceOptions transfer)
 			: base (ref handle, transfer)
diff --git a/src/Java.Interop/Java.Interop/JavaObjectArray.cs b/src/Java.Interop/Java.Interop/JavaObjectArray.cs
@@ -134,7 +134,7 @@ internal override bool TargetTypeIsCurrentType (Type targetType)
 				targetType == typeof (JavaObjectArray<T>);
 		}
 
-		internal class ValueMarshaler : JniValueMarshaler<IList<T>> {
+		internal sealed class ValueMarshaler : JniValueMarshaler<IList<T>> {
 
 			public override IList<T> CreateGenericValue (ref JniObjectReference reference, JniObjectReferenceOptions options, Type targetType)
 			{
diff --git a/src/Java.Interop/Java.Interop/JavaProxyThrowable.cs b/src/Java.Interop/Java.Interop/JavaProxyThrowable.cs
@@ -3,7 +3,7 @@
 namespace Java.Interop {
 
 	[JniTypeSignature (JniTypeName)]
-	class JavaProxyThrowable : JavaException
+	sealed class JavaProxyThrowable : JavaException
 	{
 		new internal    const   string  JniTypeName = "com/xamarin/java_interop/internal/JavaProxyThrowable";
 
diff --git a/src/Java.Interop/Java.Interop/JniBuiltinMarshalers.cs b/src/Java.Interop/Java.Interop/JniBuiltinMarshalers.cs
@@ -86,7 +86,7 @@ internal static Boolean GetValueFromJni (ref JniObjectReference self, JniObjectR
 		}
 	}
 
-	class JniBooleanValueMarshaler : JniValueMarshaler<Boolean> {
+	sealed class JniBooleanValueMarshaler : JniValueMarshaler<Boolean> {
 
 		internal    static  readonly    JniBooleanValueMarshaler   Instance    = new JniBooleanValueMarshaler ();
 
@@ -154,7 +154,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableBooleanValueMarshaler : JniValueMarshaler<Boolean?> {
+	sealed class JniNullableBooleanValueMarshaler : JniValueMarshaler<Boolean?> {
 
 		internal    static  readonly    JniNullableBooleanValueMarshaler   Instance    = new JniNullableBooleanValueMarshaler ();
 
@@ -213,7 +213,7 @@ internal static SByte GetValueFromJni (ref JniObjectReference self, JniObjectRef
 		}
 	}
 
-	class JniSByteValueMarshaler : JniValueMarshaler<SByte> {
+	sealed class JniSByteValueMarshaler : JniValueMarshaler<SByte> {
 
 		internal    static  readonly    JniSByteValueMarshaler   Instance    = new JniSByteValueMarshaler ();
 
@@ -281,7 +281,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableSByteValueMarshaler : JniValueMarshaler<SByte?> {
+	sealed class JniNullableSByteValueMarshaler : JniValueMarshaler<SByte?> {
 
 		internal    static  readonly    JniNullableSByteValueMarshaler   Instance    = new JniNullableSByteValueMarshaler ();
 
@@ -340,7 +340,7 @@ internal static Char GetValueFromJni (ref JniObjectReference self, JniObjectRefe
 		}
 	}
 
-	class JniCharValueMarshaler : JniValueMarshaler<Char> {
+	sealed class JniCharValueMarshaler : JniValueMarshaler<Char> {
 
 		internal    static  readonly    JniCharValueMarshaler   Instance    = new JniCharValueMarshaler ();
 
@@ -408,7 +408,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableCharValueMarshaler : JniValueMarshaler<Char?> {
+	sealed class JniNullableCharValueMarshaler : JniValueMarshaler<Char?> {
 
 		internal    static  readonly    JniNullableCharValueMarshaler   Instance    = new JniNullableCharValueMarshaler ();
 
@@ -467,7 +467,7 @@ internal static Int16 GetValueFromJni (ref JniObjectReference self, JniObjectRef
 		}
 	}
 
-	class JniInt16ValueMarshaler : JniValueMarshaler<Int16> {
+	sealed class JniInt16ValueMarshaler : JniValueMarshaler<Int16> {
 
 		internal    static  readonly    JniInt16ValueMarshaler   Instance    = new JniInt16ValueMarshaler ();
 
@@ -535,7 +535,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableInt16ValueMarshaler : JniValueMarshaler<Int16?> {
+	sealed class JniNullableInt16ValueMarshaler : JniValueMarshaler<Int16?> {
 
 		internal    static  readonly    JniNullableInt16ValueMarshaler   Instance    = new JniNullableInt16ValueMarshaler ();
 
@@ -594,7 +594,7 @@ internal static Int32 GetValueFromJni (ref JniObjectReference self, JniObjectRef
 		}
 	}
 
-	class JniInt32ValueMarshaler : JniValueMarshaler<Int32> {
+	sealed class JniInt32ValueMarshaler : JniValueMarshaler<Int32> {
 
 		internal    static  readonly    JniInt32ValueMarshaler   Instance    = new JniInt32ValueMarshaler ();
 
@@ -662,7 +662,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableInt32ValueMarshaler : JniValueMarshaler<Int32?> {
+	sealed class JniNullableInt32ValueMarshaler : JniValueMarshaler<Int32?> {
 
 		internal    static  readonly    JniNullableInt32ValueMarshaler   Instance    = new JniNullableInt32ValueMarshaler ();
 
@@ -721,7 +721,7 @@ internal static Int64 GetValueFromJni (ref JniObjectReference self, JniObjectRef
 		}
 	}
 
-	class JniInt64ValueMarshaler : JniValueMarshaler<Int64> {
+	sealed class JniInt64ValueMarshaler : JniValueMarshaler<Int64> {
 
 		internal    static  readonly    JniInt64ValueMarshaler   Instance    = new JniInt64ValueMarshaler ();
 
@@ -789,7 +789,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableInt64ValueMarshaler : JniValueMarshaler<Int64?> {
+	sealed class JniNullableInt64ValueMarshaler : JniValueMarshaler<Int64?> {
 
 		internal    static  readonly    JniNullableInt64ValueMarshaler   Instance    = new JniNullableInt64ValueMarshaler ();
 
@@ -848,7 +848,7 @@ internal static Single GetValueFromJni (ref JniObjectReference self, JniObjectRe
 		}
 	}
 
-	class JniSingleValueMarshaler : JniValueMarshaler<Single> {
+	sealed class JniSingleValueMarshaler : JniValueMarshaler<Single> {
 
 		internal    static  readonly    JniSingleValueMarshaler   Instance    = new JniSingleValueMarshaler ();
 
@@ -916,7 +916,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableSingleValueMarshaler : JniValueMarshaler<Single?> {
+	sealed class JniNullableSingleValueMarshaler : JniValueMarshaler<Single?> {
 
 		internal    static  readonly    JniNullableSingleValueMarshaler   Instance    = new JniNullableSingleValueMarshaler ();
 
@@ -975,7 +975,7 @@ internal static Double GetValueFromJni (ref JniObjectReference self, JniObjectRe
 		}
 	}
 
-	class JniDoubleValueMarshaler : JniValueMarshaler<Double> {
+	sealed class JniDoubleValueMarshaler : JniValueMarshaler<Double> {
 
 		internal    static  readonly    JniDoubleValueMarshaler   Instance    = new JniDoubleValueMarshaler ();
 
@@ -1043,7 +1043,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class JniNullableDoubleValueMarshaler : JniValueMarshaler<Double?> {
+	sealed class JniNullableDoubleValueMarshaler : JniValueMarshaler<Double?> {
 
 		internal    static  readonly    JniNullableDoubleValueMarshaler   Instance    = new JniNullableDoubleValueMarshaler ();
 
diff --git a/src/Java.Interop/Java.Interop/JniBuiltinMarshalers.tt b/src/Java.Interop/Java.Interop/JniBuiltinMarshalers.tt
@@ -90,7 +90,7 @@ namespace Java.Interop {
 		}
 	}
 
-	class Jni<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>> {
+	sealed class Jni<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>> {
 
 		internal    static  readonly    Jni<#= type.Type #>ValueMarshaler   Instance    = new Jni<#= type.Type #>ValueMarshaler ();
 
@@ -158,7 +158,7 @@ namespace Java.Interop {
 		}
 	}
 
-	class JniNullable<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>?> {
+	sealed class JniNullable<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>?> {
 
 		internal    static  readonly    JniNullable<#= type.Type #>ValueMarshaler   Instance    = new JniNullable<#= type.Type #>ValueMarshaler ();
 
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
@@ -143,7 +143,7 @@ public bool IsDirectMethod (ParameterInfo[] methodParameters)
 		}
 	}
 
-	class IntPtrValueMarshaler : JniValueMarshaler<IntPtr> {
+	sealed class IntPtrValueMarshaler : JniValueMarshaler<IntPtr> {
 		internal    static  IntPtrValueMarshaler Instance = new IntPtrValueMarshaler ();
 
 		public override Expression CreateParameterFromManagedExpression (Java.Interop.Expressions.JniValueMarshalerContext context, ParameterExpression sourceValue, ParameterAttributes synchronize)
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
@@ -441,9 +441,8 @@ public JniValueMarshaler<T> GetValueMarshaler<T>()
 					return r;
 				lock (Marshalers) {
 					JniValueMarshaler d;
-					if (Marshalers.TryGetValue (typeof (T), out d))
-						return (JniValueMarshaler<T>) d;
-					Marshalers.Add (typeof (T), d = new DelegatingValueMarshaler<T> (m));
+					if (!Marshalers.TryGetValue (typeof (T), out d))
+						Marshalers.Add (typeof (T), d = new DelegatingValueMarshaler<T> (m));
 					return (JniValueMarshaler<T>) d;
 				}
 			}
@@ -503,7 +502,7 @@ protected virtual JniValueMarshaler GetValueMarshalerCore (Type type)
 		}
 	}
 
-	class VoidValueMarshaler : JniValueMarshaler {
+	sealed class VoidValueMarshaler : JniValueMarshaler {
 
 		internal    static  VoidValueMarshaler              Instance    = new VoidValueMarshaler ();
 
@@ -527,7 +526,7 @@ public override void DestroyArgumentState (object value, ref JniValueMarshalerSt
 		}
 	}
 
-	class JavaPeerableValueMarshaler : JniValueMarshaler<IJavaPeerable> {
+	sealed class JavaPeerableValueMarshaler : JniValueMarshaler<IJavaPeerable> {
 
 		internal    static  JavaPeerableValueMarshaler      Instance    = new JavaPeerableValueMarshaler ();
 
@@ -594,7 +593,7 @@ public override Expression CreateParameterToManagedExpression (JniValueMarshaler
 		}
 	}
 
-	class DelegatingValueMarshaler<T> : JniValueMarshaler<T> {
+	sealed class DelegatingValueMarshaler<T> : JniValueMarshaler<T> {
 
 		JniValueMarshaler   ValueMarshaler;
 
@@ -634,7 +633,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh
 		}
 	}
 
-	class ProxyValueMarshaler : JniValueMarshaler<object> {
+	sealed class ProxyValueMarshaler : JniValueMarshaler<object> {
 
 		internal    static  ProxyValueMarshaler     Instance    = new ProxyValueMarshaler ();
 
diff --git a/src/Java.Interop/Java.Interop/JniStringValueMarshaler.cs b/src/Java.Interop/Java.Interop/JniStringValueMarshaler.cs
@@ -7,7 +7,7 @@
 
 namespace Java.Interop {
 
-	class JniStringValueMarshaler : JniValueMarshaler<string> {
+	sealed class JniStringValueMarshaler : JniValueMarshaler<string> {
 
 		internal    static  readonly    JniStringValueMarshaler     Instance    = new JniStringValueMarshaler ();
 
diff --git a/src/Java.Interop/Java.Interop/JniValueMarshaler.cs b/src/Java.Interop/Java.Interop/JniValueMarshaler.cs
@@ -8,7 +8,7 @@
 
 namespace Java.Interop.Expressions {
 
-	class VariableCollection : KeyedCollection<string, ParameterExpression> {
+	sealed class VariableCollection : KeyedCollection<string, ParameterExpression> {
 
 		protected override string GetKeyForItem (ParameterExpression item)
 		{
@@ -162,6 +162,8 @@ protected Expression ReturnObjectReferenceToJni (JniValueMarshalerContext contex
 		{
 			Func<JniObjectReference, IntPtr>    m = JniEnvironment.References.NewReturnToJniRef;
 			var r   = Expression.Variable (MarshalType, namePrefix + "_rtn");
+			if (context == null)
+				throw new ArgumentNullException (nameof (context));
 			context.LocalVariables.Add (r);
 			context.CreationStatements.Add (
 				Expression.Assign (r,
diff --git a/src/Java.Interop/Java.Interop/ManagedPeer.cs b/src/Java.Interop/Java.Interop/ManagedPeer.cs
@@ -10,7 +10,7 @@
 namespace Java.Interop {
 
 	[JniTypeSignature (JniTypeName)]
-	/* static */ class ManagedPeer : JavaObject {
+	/* static */ sealed class ManagedPeer : JavaObject {
 
 		internal const string JniTypeName = "com/xamarin/java_interop/ManagedPeer";
 
@@ -209,7 +209,7 @@ static void RegisterNativeMembers (
 		}
 	}
 
-	class JniLocationException : Exception {
+	sealed class JniLocationException : Exception {
 
 		string stackTrace;
 
diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs b/src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Threading;
 
 using Java.Interop;
diff --git a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ internal override bool TargetTypeIsCurrentType (Type targetType)`
`134`	`134`	`targetType == typeof (JavaObjectArray<T>);`
`135`	`135`	`}`
`136`	`136`
`137`		`- internal class ValueMarshaler : JniValueMarshaler<IList<T>> {`
	`137`	`+ internal sealed class ValueMarshaler : JniValueMarshaler<IList<T>> {`
`138`	`138`
`139`	`139`	`public override IList<T> CreateGenericValue (ref JniObjectReference reference, JniObjectReferenceOptions options, Type targetType)`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Java.Interop {`
`4`	`4`
`5`	`5`	`[JniTypeSignature (JniTypeName)]`
`6`		`- class JavaProxyThrowable : JavaException`
	`6`	`+ sealed class JavaProxyThrowable : JavaException`
`7`	`7`	`{`
`8`	`8`	`new internal const string JniTypeName = "com/xamarin/java_interop/internal/JavaProxyThrowable";`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ internal static Boolean GetValueFromJni (ref JniObjectReference self, JniObjectR`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- class JniBooleanValueMarshaler : JniValueMarshaler<Boolean> {`
	`89`	`+ sealed class JniBooleanValueMarshaler : JniValueMarshaler<Boolean> {`
`90`	`90`
`91`	`91`	`internal static readonly JniBooleanValueMarshaler Instance = new JniBooleanValueMarshaler ();`
`92`	`92`
`@@ -154,7 +154,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- class JniNullableBooleanValueMarshaler : JniValueMarshaler<Boolean?> {`
	`157`	`+ sealed class JniNullableBooleanValueMarshaler : JniValueMarshaler<Boolean?> {`
`158`	`158`
`159`	`159`	`internal static readonly JniNullableBooleanValueMarshaler Instance = new JniNullableBooleanValueMarshaler ();`
`160`	`160`
`@@ -213,7 +213,7 @@ internal static SByte GetValueFromJni (ref JniObjectReference self, JniObjectRef`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`- class JniSByteValueMarshaler : JniValueMarshaler<SByte> {`
	`216`	`+ sealed class JniSByteValueMarshaler : JniValueMarshaler<SByte> {`
`217`	`217`
`218`	`218`	`internal static readonly JniSByteValueMarshaler Instance = new JniSByteValueMarshaler ();`
`219`	`219`
`@@ -281,7 +281,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`
`284`		`- class JniNullableSByteValueMarshaler : JniValueMarshaler<SByte?> {`
	`284`	`+ sealed class JniNullableSByteValueMarshaler : JniValueMarshaler<SByte?> {`
`285`	`285`
`286`	`286`	`internal static readonly JniNullableSByteValueMarshaler Instance = new JniNullableSByteValueMarshaler ();`
`287`	`287`
`@@ -340,7 +340,7 @@ internal static Char GetValueFromJni (ref JniObjectReference self, JniObjectRefe`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`343`		`- class JniCharValueMarshaler : JniValueMarshaler<Char> {`
	`343`	`+ sealed class JniCharValueMarshaler : JniValueMarshaler<Char> {`
`344`	`344`
`345`	`345`	`internal static readonly JniCharValueMarshaler Instance = new JniCharValueMarshaler ();`
`346`	`346`
`@@ -408,7 +408,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`408`	`408`	`}`
`409`	`409`	`}`
`410`	`410`
`411`		`- class JniNullableCharValueMarshaler : JniValueMarshaler<Char?> {`
	`411`	`+ sealed class JniNullableCharValueMarshaler : JniValueMarshaler<Char?> {`
`412`	`412`
`413`	`413`	`internal static readonly JniNullableCharValueMarshaler Instance = new JniNullableCharValueMarshaler ();`
`414`	`414`
`@@ -467,7 +467,7 @@ internal static Int16 GetValueFromJni (ref JniObjectReference self, JniObjectRef`
`467`	`467`	`}`
`468`	`468`	`}`
`469`	`469`
`470`		`- class JniInt16ValueMarshaler : JniValueMarshaler<Int16> {`
	`470`	`+ sealed class JniInt16ValueMarshaler : JniValueMarshaler<Int16> {`
`471`	`471`
`472`	`472`	`internal static readonly JniInt16ValueMarshaler Instance = new JniInt16ValueMarshaler ();`
`473`	`473`
`@@ -535,7 +535,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`- class JniNullableInt16ValueMarshaler : JniValueMarshaler<Int16?> {`
	`538`	`+ sealed class JniNullableInt16ValueMarshaler : JniValueMarshaler<Int16?> {`
`539`	`539`
`540`	`540`	`internal static readonly JniNullableInt16ValueMarshaler Instance = new JniNullableInt16ValueMarshaler ();`
`541`	`541`
`@@ -594,7 +594,7 @@ internal static Int32 GetValueFromJni (ref JniObjectReference self, JniObjectRef`
`594`	`594`	`}`
`595`	`595`	`}`
`596`	`596`
`597`		`- class JniInt32ValueMarshaler : JniValueMarshaler<Int32> {`
	`597`	`+ sealed class JniInt32ValueMarshaler : JniValueMarshaler<Int32> {`
`598`	`598`
`599`	`599`	`internal static readonly JniInt32ValueMarshaler Instance = new JniInt32ValueMarshaler ();`
`600`	`600`
`@@ -662,7 +662,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`
`665`		`- class JniNullableInt32ValueMarshaler : JniValueMarshaler<Int32?> {`
	`665`	`+ sealed class JniNullableInt32ValueMarshaler : JniValueMarshaler<Int32?> {`
`666`	`666`
`667`	`667`	`internal static readonly JniNullableInt32ValueMarshaler Instance = new JniNullableInt32ValueMarshaler ();`
`668`	`668`
`@@ -721,7 +721,7 @@ internal static Int64 GetValueFromJni (ref JniObjectReference self, JniObjectRef`
`721`	`721`	`}`
`722`	`722`	`}`
`723`	`723`
`724`		`- class JniInt64ValueMarshaler : JniValueMarshaler<Int64> {`
	`724`	`+ sealed class JniInt64ValueMarshaler : JniValueMarshaler<Int64> {`
`725`	`725`
`726`	`726`	`internal static readonly JniInt64ValueMarshaler Instance = new JniInt64ValueMarshaler ();`
`727`	`727`
`@@ -789,7 +789,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`789`	`789`	`}`
`790`	`790`	`}`
`791`	`791`
`792`		`- class JniNullableInt64ValueMarshaler : JniValueMarshaler<Int64?> {`
	`792`	`+ sealed class JniNullableInt64ValueMarshaler : JniValueMarshaler<Int64?> {`
`793`	`793`
`794`	`794`	`internal static readonly JniNullableInt64ValueMarshaler Instance = new JniNullableInt64ValueMarshaler ();`
`795`	`795`
`@@ -848,7 +848,7 @@ internal static Single GetValueFromJni (ref JniObjectReference self, JniObjectRe`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`
`851`		`- class JniSingleValueMarshaler : JniValueMarshaler<Single> {`
	`851`	`+ sealed class JniSingleValueMarshaler : JniValueMarshaler<Single> {`
`852`	`852`
`853`	`853`	`internal static readonly JniSingleValueMarshaler Instance = new JniSingleValueMarshaler ();`
`854`	`854`
`@@ -916,7 +916,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`916`	`916`	`}`
`917`	`917`	`}`
`918`	`918`
`919`		`- class JniNullableSingleValueMarshaler : JniValueMarshaler<Single?> {`
	`919`	`+ sealed class JniNullableSingleValueMarshaler : JniValueMarshaler<Single?> {`
`920`	`920`
`921`	`921`	`internal static readonly JniNullableSingleValueMarshaler Instance = new JniNullableSingleValueMarshaler ();`
`922`	`922`
`@@ -975,7 +975,7 @@ internal static Double GetValueFromJni (ref JniObjectReference self, JniObjectRe`
`975`	`975`	`}`
`976`	`976`	`}`
`977`	`977`
`978`		`- class JniDoubleValueMarshaler : JniValueMarshaler<Double> {`
	`978`	`+ sealed class JniDoubleValueMarshaler : JniValueMarshaler<Double> {`
`979`	`979`
`980`	`980`	`internal static readonly JniDoubleValueMarshaler Instance = new JniDoubleValueMarshaler ();`
`981`	`981`
`@@ -1043,7 +1043,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`1043`	`1043`	`}`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`		`- class JniNullableDoubleValueMarshaler : JniValueMarshaler<Double?> {`
	`1046`	`+ sealed class JniNullableDoubleValueMarshaler : JniValueMarshaler<Double?> {`
`1047`	`1047`
`1048`	`1048`	`internal static readonly JniNullableDoubleValueMarshaler Instance = new JniNullableDoubleValueMarshaler ();`
`1049`	`1049`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ namespace Java.Interop {`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- class Jni<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>> {`
	`93`	`+ sealed class Jni<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>> {`
`94`	`94`
`95`	`95`	`internal static readonly Jni<#= type.Type #>ValueMarshaler Instance = new Jni<#= type.Type #>ValueMarshaler ();`
`96`	`96`
`@@ -158,7 +158,7 @@ namespace Java.Interop {`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- class JniNullable<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>?> {`
	`161`	`+ sealed class JniNullable<#= type.Type #>ValueMarshaler : JniValueMarshaler<<#= type.Type #>?> {`
`162`	`162`
`163`	`163`	`internal static readonly JniNullable<#= type.Type #>ValueMarshaler Instance = new JniNullable<#= type.Type #>ValueMarshaler ();`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public bool IsDirectMethod (ParameterInfo[] methodParameters)`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`- class IntPtrValueMarshaler : JniValueMarshaler<IntPtr> {`
	`146`	`+ sealed class IntPtrValueMarshaler : JniValueMarshaler<IntPtr> {`
`147`	`147`	`internal static IntPtrValueMarshaler Instance = new IntPtrValueMarshaler ();`
`148`	`148`
`149`	`149`	`public override Expression CreateParameterFromManagedExpression (Java.Interop.Expressions.JniValueMarshalerContext context, ParameterExpression sourceValue, ParameterAttributes synchronize)`
Original file line number	Diff line number	Diff line change
`@@ -441,9 +441,8 @@ public JniValueMarshaler<T> GetValueMarshaler<T>()`
`441`	`441`	`return r;`
`442`	`442`	`lock (Marshalers) {`
`443`	`443`	`JniValueMarshaler d;`
`444`		`- if (Marshalers.TryGetValue (typeof (T), out d))`
`445`		`- return (JniValueMarshaler<T>) d;`
`446`		`- Marshalers.Add (typeof (T), d = new DelegatingValueMarshaler<T> (m));`
	`444`	`+ if (!Marshalers.TryGetValue (typeof (T), out d))`
	`445`	`+ Marshalers.Add (typeof (T), d = new DelegatingValueMarshaler<T> (m));`
`447`	`446`	`return (JniValueMarshaler<T>) d;`
`448`	`447`	`}`
`449`	`448`	`}`
`@@ -503,7 +502,7 @@ protected virtual JniValueMarshaler GetValueMarshalerCore (Type type)`
`503`	`502`	`}`
`504`	`503`	`}`
`505`	`504`
`506`		`- class VoidValueMarshaler : JniValueMarshaler {`
	`505`	`+ sealed class VoidValueMarshaler : JniValueMarshaler {`
`507`	`506`
`508`	`507`	`internal static VoidValueMarshaler Instance = new VoidValueMarshaler ();`
`509`	`508`
`@@ -527,7 +526,7 @@ public override void DestroyArgumentState (object value, ref JniValueMarshalerSt`
`527`	`526`	`}`
`528`	`527`	`}`
`529`	`528`
`530`		`- class JavaPeerableValueMarshaler : JniValueMarshaler<IJavaPeerable> {`
	`529`	`+ sealed class JavaPeerableValueMarshaler : JniValueMarshaler<IJavaPeerable> {`
`531`	`530`
`532`	`531`	`internal static JavaPeerableValueMarshaler Instance = new JavaPeerableValueMarshaler ();`
`533`	`532`
`@@ -594,7 +593,7 @@ public override Expression CreateParameterToManagedExpression (JniValueMarshaler`
`594`	`593`	`}`
`595`	`594`	`}`
`596`	`595`
`597`		`- class DelegatingValueMarshaler<T> : JniValueMarshaler<T> {`
	`596`	`+ sealed class DelegatingValueMarshaler<T> : JniValueMarshaler<T> {`
`598`	`597`
`599`	`598`	`JniValueMarshaler ValueMarshaler;`
`600`	`599`
`@@ -634,7 +633,7 @@ public override Expression CreateReturnValueFromManagedExpression (JniValueMarsh`
`634`	`633`	`}`
`635`	`634`	`}`
`636`	`635`
`637`		`- class ProxyValueMarshaler : JniValueMarshaler<object> {`
	`636`	`+ sealed class ProxyValueMarshaler : JniValueMarshaler<object> {`
`638`	`637`
`639`	`638`	`internal static ProxyValueMarshaler Instance = new ProxyValueMarshaler ();`
`640`	`639`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Java.Interop.Expressions {`
`10`	`10`
`11`		`- class VariableCollection : KeyedCollection<string, ParameterExpression> {`
	`11`	`+ sealed class VariableCollection : KeyedCollection<string, ParameterExpression> {`
`12`	`12`
`13`	`13`	`protected override string GetKeyForItem (ParameterExpression item)`
`14`	`14`	`{`
`@@ -162,6 +162,8 @@ protected Expression ReturnObjectReferenceToJni (JniValueMarshalerContext contex`
`162`	`162`	`{`
`163`	`163`	`Func<JniObjectReference, IntPtr> m = JniEnvironment.References.NewReturnToJniRef;`
`164`	`164`	`var r = Expression.Variable (MarshalType, namePrefix + "_rtn");`
	`165`	`+ if (context == null)`
	`166`	`+ throw new ArgumentNullException (nameof (context));`
`165`	`167`	`context.LocalVariables.Add (r);`
`166`	`168`	`context.CreationStatements.Add (`
`167`	`169`	`Expression.Assign (r,`