Skip to content

[Java.Interop.Tools.JavaCallableWrappers] require TypeDefinitionCache in more places #1075

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
merged 1 commit into from
Jan 12, 2023
Merged

[Java.Interop.Tools.JavaCallableWrappers] require TypeDefinitionCache in more places #1075

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
23 changes: 10 additions & 13 deletions ...rop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ public class JavaTypeScanner

readonly IMetadataResolver cache;

[Obsolete ("Use the TypeDefinitionCache overload for better performance.")]
public JavaTypeScanner (Action<TraceLevel, string> logger)
: this (logger, resolver: null)
{ }
[Obsolete ("Use the TypeDefinitionCache overload for better performance.", error: true)]
public JavaTypeScanner (Action<TraceLevel, string> logger) => throw new NotSupportedException ();

public JavaTypeScanner (Action<TraceLevel, string> logger, TypeDefinitionCache? cache)
: this (logger, (IMetadataResolver?) cache)
public JavaTypeScanner (Action<TraceLevel, string> logger, TypeDefinitionCache cache)
: this (logger, (IMetadataResolver) cache)
{
}

public JavaTypeScanner (Action<TraceLevel, string> logger, IMetadataResolver? resolver)
public JavaTypeScanner (Action<TraceLevel, string> logger, IMetadataResolver resolver)
{
if (logger == null)
throw new ArgumentNullException (nameof (logger));
Expand Down Expand Up @@ -96,15 +94,14 @@ public static bool ShouldSkipJavaCallableWrapperGeneration (TypeDefinition type,
return false;
}

[Obsolete ("Use the TypeDefinitionCache overload for better performance.")]
public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log) =>
GetJavaTypes (assemblies, resolver, log, metadataResolver: null);
[Obsolete ("Use the TypeDefinitionCache overload for better performance.", error: true)]
public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log) => throw new NotSupportedException ();

// Returns all types for which we need to generate Java delegate types.
public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log, TypeDefinitionCache? cache) =>
GetJavaTypes (assemblies, resolver, log, (IMetadataResolver?) cache);
public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log, TypeDefinitionCache cache) =>
GetJavaTypes (assemblies, resolver, log, (IMetadataResolver) cache);

public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log, IMetadataResolver? metadataResolver)
public static List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssemblyResolver resolver, Action<string, object []> log, IMetadataResolver metadataResolver)
{
Action<TraceLevel, string> l = (level, value) => log ("{0}", new string [] { value });
return new JavaTypeScanner (l, metadataResolver).GetJavaTypes (assemblies, resolver);
Expand Down