[jnigen] Remove exclude from config (#2348)

Closes #2125

Author: HosseinYousefi

pkgs/jnigen/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.0-wip
+
+- **Breaking Change**: Removed `exclude` from config.
+
 ## 0.14.2
 
 - The name `factory` can now also be used in a method name without renaming.

pkgs/jnigen/README.md

@@ -250,9 +250,6 @@ A `*` denotes required configuration.
 | `summarizer:`          | (Subsection)  | Configuration specific to summarizer component, which builds API descriptions from Java sources or JAR files. |
 | `summarizer:` >> `backend` | `auto`, `doclet` or `asm` | Specifies the backend to use in API summary generation. `doclet` uses OpenJDK Doclet API to build summary from sources. `asm` uses ASM library to build summary from classes in `class_path` JARs. `auto` attempts to find the class in sources, and falls back to using ASM. |
 | `summarizer:` >> `extra_args` (DEV) | List of CLI arguments | Extra arguments to pass to summarizer JAR. |
-| `exclude:`             | (Subsection)  | Exclude methods or fields using regex filters. It's generally useful to exclude problematic fields or methods which, with current binding generation, can lead to syntax errors |
-| `exclude:` >> `methods`| List of methods in `classBinaryName#methodName` format where classBinaryName is same as qualified name, but `$` preceding a nested class instead of `.`. Example: `com.example.MyClass` or `com.example.MyClass$NestedClass` | Methods to exclude.
-| `exclude:` >> `fields` | List of fields in `classBinaryName#fieldName` format | Fields to exclude.
 
 It's possible to use the programmatic API instead of YAML.
 

pkgs/jnigen/example/in_app_java/jnigen.yaml

@@ -14,6 +14,3 @@ classes:
   - 'androidx.emoji2.text.DefaultEmojiCompatConfig' # From gradle's compile classpath
   - 'android.os.Build' # from gradle's compile classpath
   - 'java.util.HashMap' # from gradle's compile classpath
-exclude:
-  fields:
-    - 'android.os.Build\$VERSION_CODES#UPSIDE_DOWN_CAKE'

pkgs/jnigen/example/in_app_java/lib/android_utils.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // ignore_for_file: annotate_overrides
 // ignore_for_file: argument_type_not_assignable

pkgs/jnigen/example/kotlin_plugin/android/build.gradle

@@ -23,6 +23,10 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11

pkgs/jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // ignore_for_file: annotate_overrides
 // ignore_for_file: argument_type_not_assignable

pkgs/jnigen/example/notification_plugin/lib/notifications.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from Apache PDFBox library which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from Apache PDFBox library which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/_package.dart

@@ -1,3 +1,3 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 export 'PDDocument.dart';
 export 'PDDocumentInformation.dart';

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from Apache PDFBox library which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/_package.dart

@@ -1,2 +1,2 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 export 'PDFTextStripper.dart';

pkgs/jnigen/lib/jnigen.dart

@@ -12,6 +12,5 @@
 library;
 
 export 'src/config/config.dart';
-export 'src/config/filters.dart';
 export 'src/elements/elements.dart';
 export 'src/generate_bindings.dart';

pkgs/jnigen/lib/src/bindings/dart_generator.dart

@@ -17,7 +17,7 @@ import 'visitor.dart';
 /// Version of jnigen. Keep in sync with `pubspec.yaml` removing the `-wip`
 /// suffix.
 @visibleForTesting
-const String version = '0.14.2';
+const String version = '0.15.0';
 
 // Import prefixes.
 const _jni = r'jni$_';

pkgs/jnigen/lib/src/bindings/excluder.dart

@@ -37,9 +37,7 @@ class Excluder extends Visitor<Classes, void> with TopLevelVisitor {
   @override
   void visit(Classes node) {
     node.decls.removeWhere((_, classDecl) {
-      final excluded = classDecl.isPrivate ||
-          classDecl.isExcluded ||
-          !(config.exclude?.classes?.included(classDecl) ?? true);
+      final excluded = classDecl.isPrivate || classDecl.isExcluded;
       if (excluded) {
         log.fine('Excluded class ${classDecl.binaryName}');
       }
@@ -69,13 +67,8 @@ class _ClassExcluder extends Visitor<ClassDecl, void> {
       final isPrivate = method.isPrivate;
       final isAbstractCtor = method.isConstructor && node.isAbstract;
       final isBridgeMethod = method.isSynthetic && method.isBridge;
-      final isExcludedInConfig =
-          config.exclude?.methods?.included(node, method) ?? false;
-      final excluded = isPrivate ||
-          isAbstractCtor ||
-          isBridgeMethod ||
-          isExcludedInConfig ||
-          isExcluded;
+      final excluded =
+          isPrivate || isAbstractCtor || isBridgeMethod || isExcluded;
       if (excluded) {
         log.fine('Excluded method ${node.binaryName}#${method.name}');
       }
@@ -88,9 +81,7 @@ class _ClassExcluder extends Visitor<ClassDecl, void> {
       return !excluded;
     }).toList();
     node.fields = node.fields.where((field) {
-      final excluded = field.isExcluded ||
-          (field.isPrivate &&
-              (config.exclude?.fields?.included(node, field) ?? true));
+      final excluded = field.isExcluded || field.isPrivate;
       if (excluded) {
         log.fine('Excluded field ${node.binaryName}#${field.name}');
       }

pkgs/jnigen/lib/src/config/config_types.dart

@@ -15,7 +15,6 @@ import '../logging/logging.dart';
 import '../util/find_package.dart';
 import 'config_exception.dart';
 import 'experiments.dart';
-import 'filters.dart';
 import 'yaml_reader.dart';
 
 /// Modify this when symbols file format changes according to pub_semver.
@@ -234,13 +233,6 @@ class OutputConfig {
   SymbolsOutputConfig? symbolsConfig;
 }
 
-class BindingExclusions {
-  BindingExclusions({this.methods, this.fields, this.classes});
-  MethodFilter? methods;
-  FieldFilter? fields;
-  ClassFilter? classes;
-}
-
 bool _isCapitalized(String s) {
   final firstLetter = s.substring(0, 1);
   return firstLetter == firstLetter.toUpperCase();
@@ -270,7 +262,6 @@ class Config {
       {required this.outputConfig,
       required this.classes,
       this.experiments,
-      this.exclude,
       this.sourcePath,
       this.classPath,
       this.preamble,
@@ -303,9 +294,6 @@ class Config {
 
   Set<Experiment?>? experiments;
 
-  /// Methods and fields to be excluded from generated bindings.
-  final BindingExclusions? exclude;
-
   /// Paths to search for java source files.
   ///
   /// If a source package is downloaded through [mavenDownloads] option,
@@ -483,24 +471,6 @@ class Config {
       return res;
     }
 
-    MemberFilter<T>? regexFilter<T extends ClassMember>(String property) {
-      final exclusions = prov.getStringList(property);
-      if (exclusions == null) return null;
-      final filters = <MemberFilter<T>>[];
-      for (var exclusion in exclusions) {
-        final split = exclusion.split('#');
-        if (split.length != 2) {
-          throw ConfigException('Error parsing exclusion: "$exclusion": '
-              'expected to be in binaryName#member format.');
-        }
-        filters.add(MemberNameFilter<T>.exclude(
-          RegExp(split[0]),
-          RegExp(split[1]),
-        ));
-      }
-      return CombinedMemberFilter<T>(filters);
-    }
-
     String? getSdkRoot() {
       final root = prov.getString(_Props.androidSdkRoot) ??
           Platform.environment['ANDROID_SDK_ROOT'];
@@ -529,10 +499,6 @@ class Config {
         backend: getSummarizerBackend(prov.getString(_Props.backend), null),
         workingDirectory: prov.getPath(_Props.summarizerWorkingDir),
       ),
-      exclude: BindingExclusions(
-        methods: regexFilter<Method>(_Props.excludeMethods),
-        fields: regexFilter<Field>(_Props.excludeFields),
-      ),
       outputConfig: OutputConfig(
         dartConfig: DartCodeOutputConfig(
           path: must(prov.getPath, Uri.parse('.'), _Props.dartRoot),
@@ -620,9 +586,6 @@ class _Props {
   static const sourcePath = 'source_path';
   static const classPath = 'class_path';
   static const classes = 'classes';
-  static const exclude = 'exclude';
-  static const excludeMethods = '$exclude.methods';
-  static const excludeFields = '$exclude.fields';
 
   static const experiments = 'enable_experiment';
   static const import = 'import';

pkgs/jnigen/lib/src/config/filters.dart

@@ -5,7 +5,7 @@
 name: jnigen
 description: A Dart bindings generator for Java and Kotlin that uses JNI under the hood to interop with Java virtual machine.
 # Keep in sync with `version` in `dart_generator.dart`.
-version: 0.14.2
+version: 0.15.0-wip
 repository: https://github.com/dart-lang/native/tree/main/pkgs/jnigen
 issue_tracker: https://github.com/dart-lang/native/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ajnigen
 

pkgs/jnigen/pubspec.yaml

@@ -13,12 +13,6 @@ classes:
   - 'com.fasterxml.jackson.core.JsonParser'
   - 'com.fasterxml.jackson.core.JsonToken'
 
-exclude:
-  fields:
-    - 'com.fasterxml.jackson.core.JsonFactory#DEFAULT_QUOTE_CHAR'
-    - 'com.fasterxml.jackson.core.Base64Variant#PADDING_CHAR_NONE'
-    - 'com.fasterxml.jackson.core.base.ParserMinimalBase#CHAR_NULL'
-    - 'com.fasterxml.jackson.core.io.UTF32Reader#NC'
 
 preamble: |
   // Generated from jackson-core which is licensed under the Apache License 2.0.

pkgs/jnigen/test/jackson_core_test/jnigen.yaml

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from jackson-core which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/test/jackson_core_test/third_party/bindings/com/fasterxml/jackson/core/JsonFactory.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from jackson-core which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/test/jackson_core_test/third_party/bindings/com/fasterxml/jackson/core/JsonParser.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Generated from jackson-core which is licensed under the Apache License 2.0.
 // The following copyright from the original authors applies.

pkgs/jnigen/test/jackson_core_test/third_party/bindings/com/fasterxml/jackson/core/JsonToken.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 export 'JsonFactory.dart';
 export 'JsonParser.dart';
 export 'JsonToken.dart';

pkgs/jnigen/test/jackson_core_test/third_party/bindings/com/fasterxml/jackson/core/_package.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a

pkgs/jnigen/test/kotlin_test/bindings/kotlin.dart

@@ -1,4 +1,4 @@
-// AUTO GENERATED BY JNIGEN 0.14.2. DO NOT EDIT!
+// AUTO GENERATED BY JNIGEN 0.15.0. DO NOT EDIT!
 
 // Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a