Enable by default name mappings.

Change on 2018/07/20 by antoniocortes <antoniocortes@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=205463134
google · Jul 31, 2018 · ea63036 · ea63036
1 parent b7c83db
commit ea63036
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/translator/src/main/java/com/google/devtools/j2objc/Options.java b/translator/src/main/java/com/google/devtools/j2objc/Options.java
@@ -66,7 +66,8 @@ public class Options {
   private boolean jsniWarnings = true;
   private boolean buildClosure = false;
   private EnumSet<MetadataSupport> includedMetadata =
-      EnumSet.of(MetadataSupport.FULL, MetadataSupport.ENUM_CONSTANTS);
+      EnumSet.of(
+          MetadataSupport.FULL, MetadataSupport.ENUM_CONSTANTS, MetadataSupport.NAME_MAPPING);
   private boolean emitWrapperMethods = true;
   private boolean extractUnsequencedModifications = true;
   private boolean docCommentsEnabled = false;
@@ -208,8 +209,8 @@ public enum MetadataSupport {
     // Generate metadata for enum constants.
     ENUM_CONSTANTS,
 
-    // Generate class name mapping.
+    // Generate name mapping.
-    CLASS_NAMES,
+    NAME_MAPPING,
 
     // Generate all metadata.
     FULL;
@@ -387,12 +388,12 @@ private void processArg(Iterator<String> args) throws IOException {
               includedMetadata.remove(MetadataSupport.ENUM_CONSTANTS);
               break;
             }
-            case "class-names": {
+            case "name-mapping": {
-              includedMetadata.add(MetadataSupport.CLASS_NAMES);
+              includedMetadata.add(MetadataSupport.NAME_MAPPING);
               break;
             }
-            case "-class-names": {
+            case "-name-mapping": {
-              includedMetadata.remove(MetadataSupport.CLASS_NAMES);
+              includedMetadata.remove(MetadataSupport.NAME_MAPPING);
               break;
             }
             default: {
@@ -737,7 +738,7 @@ public boolean stripReflection() {
   public void setStripReflection(boolean b) {
     if (b) {
       includedMetadata.remove(MetadataSupport.FULL);
-      includedMetadata.remove(MetadataSupport.CLASS_NAMES);
+      includedMetadata.remove(MetadataSupport.NAME_MAPPING);
     } else {
       includedMetadata = EnumSet.allOf(MetadataSupport.class);
     }
@@ -756,16 +757,16 @@ public void setStripEnumConstants(boolean b) {
     }
   }
 
-  public boolean stripClassNameMapping() {
+  public boolean stripNameMapping() {
-    return !includedMetadata.contains(MetadataSupport.CLASS_NAMES);
+    return !includedMetadata.contains(MetadataSupport.NAME_MAPPING);
   }
 
   @VisibleForTesting
-  public void setStripClassNameMapping(boolean b) {
+  public void setStripNameMapping(boolean b) {
     if (b) {
-      includedMetadata.remove(MetadataSupport.CLASS_NAMES);
+      includedMetadata.remove(MetadataSupport.NAME_MAPPING);
     } else {
-      includedMetadata.add(MetadataSupport.CLASS_NAMES);
+      includedMetadata.add(MetadataSupport.NAME_MAPPING);
     }
   }
 

diff --git a/translator/src/main/java/com/google/devtools/j2objc/gen/TypeImplementationGenerator.java b/translator/src/main/java/com/google/devtools/j2objc/gen/TypeImplementationGenerator.java
@@ -230,7 +230,7 @@ private void printTypeLiteralImplementation() {
   }
 
   private void printNameMapping() {
-    if (!options.stripClassNameMapping()) {
+    if (!options.stripNameMapping()) {
       Optional<String> mapping = nameTable.getNameMapping(typeElement, typeName);
       if (mapping.isPresent()) {
         newline();

diff --git a/translator/src/main/resources/com/google/devtools/j2objc/J2ObjC.properties b/translator/src/main/resources/com/google/devtools/j2objc/J2ObjC.properties
@@ -74,7 +74,7 @@ Other options:\n\
   \n                               annotation, unless its value is known to be compatible.\n\
   --strip-reflection           Do not generate metadata needed for Java reflection.\n\
   --reflection:{all,none,enum-constants,-enum-constants,\
-  class-names,-class-names}\n\
+  name-mapping,-name-mapping}\n\
   \n                               Generate or exclude specific support needed for Java\n\
   \n                               reflection.\n\
   --no-wrapper-methods         Do not generate Objective-C wrapper methods for constructors\

diff --git a/...r/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGeneratorTest.java b/...r/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCImplementationGeneratorTest.java
@@ -684,7 +684,6 @@ public void testPackageInfoDocNoAnnotation() throws IOException {
   }
 
   public void testPackageInfoPrefixAnnotation() throws IOException {
-    options.setStripClassNameMapping(false);
     addSourcesToSourcepaths();
     addSourceFile(
         "@ObjectiveCName(\"FBM\")\n"
@@ -704,7 +703,6 @@ public void testPackageInfoPrefixAnnotation() throws IOException {
   }
 
   public void testPackageInfoPreprocessing() throws IOException {
-    options.setStripClassNameMapping(false);
     addSourceFile(
         "@ObjectiveCName(\"FBM\")\n"
         + "package foo.bar.mumble;\n"
@@ -724,7 +722,6 @@ public void testPackageInfoPreprocessing() throws IOException {
   }
 
   public void testPackageInfoOnClasspath() throws IOException {
-    options.setStripClassNameMapping(false);
     addSourceFile(
         "@ObjectiveCName(\"FBM\")\n"
         + "package foo.bar.mumble;\n"
@@ -833,7 +830,7 @@ public void testForwardDeclarationForPrivateAbstractDeclaration() throws IOExcep
   }
 
   public void testNameMappingStripped() throws IOException {
-    options.setStripReflection(true);
+    options.setStripNameMapping(true);
     String translation = translateSourceFile(
         "@com.google.j2objc.annotations.ObjectiveCName(\"NSTest\") public class Test {}",
         "Test", "Test.m");
@@ -842,15 +839,14 @@ public void testNameMappingStripped() throws IOException {
 
   public void testNameMappingNotStripped() throws IOException {
     options.setStripReflection(true);
-    options.setStripClassNameMapping(false);
+    options.setStripNameMapping(false);
     String translation = translateSourceFile(
         "@com.google.j2objc.annotations.ObjectiveCName(\"NSTest\") public class Test {}",
         "Test", "Test.m");
     assertTranslation(translation, "J2OBJC_NAME_MAPPING(NSTest, \"Test\", \"NSTest\")");
   }
 
   public void testNameMappingNestedClass() throws IOException {
-    options.setStripClassNameMapping(false);
     String hFile =
         translateSourceFile(
             "package foo; "
@@ -879,7 +875,6 @@ public void testNameMappingNestedClass() throws IOException {
    * anonymous classes.
    */
   public void testCasesWithoutNameMapping() throws IOException {
-    options.setStripClassNameMapping(false);
     addSourceFile(
         "@ObjectiveCName(\"FBM\")\n"
             + "package foo.bar.mumble;\n"