src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java

*** 166,207 ****
          }
          if (value instanceof Handle) {
              Handle h = (Handle) value;
              return new Handle(h.getTag(), mapType(h.getOwner()), mapMethodName(
                      h.getOwner(), h.getName(), h.getDesc()),
!                     mapMethodDesc(h.getDesc()));
          }
          return value;
      }
  
      /**
!      *
       * @param typeSignature
       *            true if signature is a FieldTypeSignature, such as the
       *            signature parameter of the ClassVisitor.visitField or
       *            MethodVisitor.visitLocalVariable methods
       */
      public String mapSignature(String signature, boolean typeSignature) {
          if (signature == null) {
              return null;
          }
          SignatureReader r = new SignatureReader(signature);
          SignatureWriter w = new SignatureWriter();
!         SignatureVisitor a = createRemappingSignatureAdapter(w);
          if (typeSignature) {
              r.acceptType(a);
          } else {
              r.accept(a);
          }
          return w.toString();
      }
  
      protected SignatureVisitor createRemappingSignatureAdapter(
              SignatureVisitor v) {
!         return new RemappingSignatureAdapter(v, this);
      }
  
      /**
       * Map method name to the new name. Subclasses can override.
       *
       * @param owner
       *            owner of the method.
--- 166,218 ----
          }
          if (value instanceof Handle) {
              Handle h = (Handle) value;
              return new Handle(h.getTag(), mapType(h.getOwner()), mapMethodName(
                      h.getOwner(), h.getName(), h.getDesc()),
!                     mapMethodDesc(h.getDesc()), h.isInterface());
          }
          return value;
      }
  
      /**
!      * @param signature
!      *            signature for mapper
       * @param typeSignature
       *            true if signature is a FieldTypeSignature, such as the
       *            signature parameter of the ClassVisitor.visitField or
       *            MethodVisitor.visitLocalVariable methods
+      * @return signature rewritten as a string
       */
      public String mapSignature(String signature, boolean typeSignature) {
          if (signature == null) {
              return null;
          }
          SignatureReader r = new SignatureReader(signature);
          SignatureWriter w = new SignatureWriter();
!         SignatureVisitor a = createSignatureRemapper(w);
          if (typeSignature) {
              r.acceptType(a);
          } else {
              r.accept(a);
          }
          return w.toString();
      }
  
+     /**
+      * @deprecated use {@link #createSignatureRemapper} instead.
+      */
+     @Deprecated
      protected SignatureVisitor createRemappingSignatureAdapter(
              SignatureVisitor v) {
!         return new SignatureRemapper(v, this);
      }
  
+     protected SignatureVisitor createSignatureRemapper(
+             SignatureVisitor v) {
+         return createRemappingSignatureAdapter(v);
+     }
+ 
      /**
       * Map method name to the new name. Subclasses can override.
       *
       * @param owner
       *            owner of the method.
*** 243,252 ****
--- 254,267 ----
          return name;
      }
  
      /**
       * Map type name to the new name. Subclasses can override.
+      *
+      * @param typeName
+      *            the type name
+      * @return new name, default implementation is the identity.
       */
      public String map(String typeName) {
          return typeName;
      }
  }