Adds contains() method to TypeAndElementSource

Signed-off-by: Laird Nelson <[email protected]>
microbean · Oct 16, 2024 · c6eb71b · c6eb71b
1 parent 846bee1
commit c6eb71b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Maven dependency:
   <groupId>org.microbean</groupId>
   <artifactId>microbean-lang</artifactId>
   <!-- Always check https://search.maven.org/artifact/org.microbean/microbean-lang for up-to-date available versions. -->
-  <version>0.0.20</version>
+  <version>0.0.21</version>
 </dependency>
 ```
 

diff --git a/lang/src/main/java/org/microbean/lang/Lang.java b/lang/src/main/java/org/microbean/lang/Lang.java
@@ -2239,6 +2239,11 @@ public final TypeElement boxedClass(final PrimitiveType t) {
       return Lang.boxedClass(t);
     }
 
+    @Override
+    public final boolean contains(final TypeMirror t, final TypeMirror s) {
+      return Lang.contains(t, s);
+    }
+
     @Override
     public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... typeArguments) {
       return Lang.declaredType(typeElement, typeArguments);

diff --git a/lang/src/main/java/org/microbean/lang/TypeAndElementSource.java b/lang/src/main/java/org/microbean/lang/TypeAndElementSource.java
@@ -51,7 +51,21 @@ public interface TypeAndElementSource {
   // Note the strange positioning of payload and receiver.
   public boolean assignable(final TypeMirror payload, final TypeMirror receiver);
 
-  public TypeElement boxedClass(final PrimitiveType t);
+  public default TypeElement boxedClass(final PrimitiveType t) {
+    return switch (t.getKind()) { // won't cause symbol completion
+    case BOOLEAN -> this.typeElement("java.lang.Boolean");
+    case BYTE -> this.typeElement("java.lang.Byte");
+    case CHAR -> this.typeElement("java.lang.Character");
+    case DOUBLE -> this.typeElement("java.lang.Double");
+    case FLOAT -> this.typeElement("java.lang.Float");
+    case INT -> this.typeElement("java.lang.Integer");
+    case LONG -> this.typeElement("java.lang.Long");
+    case SHORT -> this.typeElement("java.lang.Short");
+    default -> throw new IllegalArgumentException("t: " + t);
+    };
+  }
+
+  public boolean contains(final TypeMirror t, final TypeMirror s);
 
   public DeclaredType declaredType(final DeclaredType enclosingType,
                                    final TypeElement typeElement,

diff --git a/lang/src/test/java/org/microbean/lang/TestErase.java b/lang/src/test/java/org/microbean/lang/TestErase.java
@@ -115,6 +115,10 @@ public final TypeElement boxedClass(final PrimitiveType t) {
           return javacModelTypes.boxedClass(t);
         }
         @Override
+        public final boolean contains(final TypeMirror t, final TypeMirror s) {
+          return javacModelTypes.contains(t, s);
+        }
+        @Override
         public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... arguments) {
           return javacModelTypes.getDeclaredType(typeElement, arguments);
         }

diff --git a/lang/src/test/java/org/microbean/lang/TestSameTypeVisitor.java b/lang/src/test/java/org/microbean/lang/TestSameTypeVisitor.java
@@ -81,6 +81,10 @@ public final TypeElement boxedClass(final PrimitiveType t) {
           return javacModelTypes.boxedClass(t);
         }
         @Override
+        public final boolean contains(final TypeMirror t, final TypeMirror s) {
+          return javacModelTypes.contains(t, s);
+        }
+        @Override
         public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... arguments) {
           return javacModelTypes.getDeclaredType(typeElement, arguments);
         }

diff --git a/lang/src/test/java/org/microbean/lang/TestSupertypeVisitor.java b/lang/src/test/java/org/microbean/lang/TestSupertypeVisitor.java
@@ -101,6 +101,10 @@ public final TypeElement boxedClass(final PrimitiveType t) {
           return javacModelTypes.boxedClass(t);
         }
         @Override
+        public final boolean contains(final TypeMirror t, final TypeMirror s) {
+          return javacModelTypes.contains(t, s);
+        }
+        @Override
         public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... arguments) {
           return javacModelTypes.getDeclaredType(typeElement, arguments);
         }

diff --git a/lang/src/test/java/org/microbean/lang/TestTypeClosure.java b/lang/src/test/java/org/microbean/lang/TestTypeClosure.java
@@ -96,6 +96,10 @@ public final TypeElement boxedClass(final PrimitiveType t) {
           return javacModelTypes.boxedClass(t);
         }
         @Override
+        public final boolean contains(final TypeMirror t, final TypeMirror s) {
+          return javacModelTypes.contains(t, s);
+        }
+        @Override
         public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... arguments) {
           return javacModelTypes.getDeclaredType(typeElement, arguments);
         }
@@ -210,6 +214,10 @@ public final TypeElement boxedClass(final PrimitiveType t) {
           return javacModelTypes.boxedClass(t);
         }
         @Override
+        public final boolean contains(final TypeMirror t, final TypeMirror s) {
+          return javacModelTypes.contains(t, s);
+        }
+        @Override
         public final DeclaredType declaredType(final TypeElement typeElement, final TypeMirror... arguments) {
           return javacModelTypes.getDeclaredType(typeElement, arguments);
         }