Reverted commit D3334273

Reviewed By: astreet

Differential Revision: D3334273

fbshipit-source-id: a3849604ea89db74900850c294685e7da9aeeacc

ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java

@@ -15,7 +15,6 @@
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.testing.ReactInstanceSpecForTest;
 import com.facebook.react.testing.ReactAppInstrumentationTestCase;
 
@@ -46,8 +45,6 @@ protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
   }
 
   // See ScrollViewListenerModule.js
-  // Matches ScrollViewListenerModule.js
-  @ReactModule(name = "ScrollListener")
   protected static class ScrollListenerModule extends BaseJavaModule {
 
     private final ArrayList<Double> mXOffsets = new ArrayList<Double>();
@@ -57,6 +54,12 @@ protected static class ScrollListenerModule extends BaseJavaModule {
     private boolean mScrollBeginDragCalled;
     private boolean mScrollEndDragCalled;
 
+    // Matches ScrollViewListenerModule.js
+    @Override
+    public String getName() {
+      return "ScrollListener";
+    }
+
     @ReactMethod
     public void onScroll(double x, double y) {
       mXOffsets.add(x);

ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java

@@ -12,21 +12,24 @@
 
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 
 /**
  * NativeModule for tests that allows assertions from JS to propagate to Java.
  */
-@ReactModule(name = "Assert")
 public class AssertModule extends BaseJavaModule {
 
   private boolean mGotSuccess;
   private boolean mGotFailure;
   private @Nullable String mFirstFailureStackTrace;
 
+  @Override
+  public String getName() {
+    return "Assert";
+  }
+
   @ReactMethod
   public void fail(String stackTrace) {
     if (!mGotFailure) {

ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java

@@ -14,12 +14,10 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.annotations.ReactModule;
 
 /**
  * Dummy implementation of storage module, used for testing
  */
-@ReactModule(name = "AsyncSQLiteDBStorage")
 public final class FakeAsyncLocalStorage extends BaseJavaModule {
 
   private static WritableMap errorMessage;
@@ -28,6 +26,11 @@ public final class FakeAsyncLocalStorage extends BaseJavaModule {
     errorMessage.putString("message", "Fake Async Local Storage");
   }
 
+  @Override
+  public String getName() {
+    return "AsyncSQLiteDBStorage";
+  }
+
   @ReactMethod
   public void multiGet(final ReadableArray keys, final Callback callback) {
     callback.invoke(errorMessage, null);

ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java

@@ -15,18 +15,21 @@
 
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
 /**
  * Native module provides single method {@link #record} which records its single int argument
  * in calls array
  */
-@ReactModule(name = "Recording")
 public class IntRecordingModule extends BaseJavaModule {
 
   private final List<Integer> mCalls = new ArrayList<>();
   private final CountDownLatch mCountDownLatch = new CountDownLatch(1);
 
+  @Override
+  public String getName() {
+    return "Recording";
+  }
+
   @ReactMethod
   public void record(int i) {
     mCalls.add(i);

ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java

@@ -14,7 +14,6 @@
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
 /**
  * This class is used to verify that some JS integration tests have completed successfully.
@@ -24,7 +23,6 @@
  * to wait for the test to run, and {#link JSIntegrationTestChecker#isTestDone()} to check if it
  * completed successfully.
  */
-@ReactModule(name = "TestModule")
 public class JSIntegrationTestChecker extends BaseJavaModule {
 
   private final CountDownLatch mLatch;
@@ -33,6 +31,11 @@ public JSIntegrationTestChecker() {
     mLatch = new CountDownLatch(1);
   }
 
+  @Override
+  public String getName() {
+    return "TestModule";
+  }
+
   @ReactMethod
   public void markTestCompleted() {
     mLatch.countDown();

ReactAndroid/src/androidTest/java/com/facebook/react/testing/NetworkRecordingModuleMock.java

@@ -19,14 +19,12 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 /**
  * Mock Networking module that records last request received by {@link #sendRequest} method and
  * returns reponse code and body that should be set with {@link #setResponse}
  */
-@ReactModule(name = "RCTNetworking")
 public class NetworkRecordingModuleMock extends ReactContextBaseJavaModule {
 
   public int mRequestCount = 0;
@@ -65,6 +63,11 @@ public void setRequestListener(RequestListener requestListener) {
     mRequestListener = requestListener;
   }
 
+  @Override
+  public final String getName() {
+    return "RCTNetworking";
+  }
+
   private void fireReactCallback(
       Callback callback,
       int status,

ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java

@@ -13,17 +13,20 @@
 
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
 /**
  * Native module provides single method {@link #record} which records its single string argument
  * in calls array
  */
-@ReactModule(name = "Recording")
 public class StringRecordingModule extends BaseJavaModule {
 
   private final List<String> mCalls = new ArrayList<String>();
 
+  @Override
+  public String getName() {
+    return "Recording";
+  }
+
   @ReactMethod
   public void record(String text) {
     mCalls.add(text);

ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java

@@ -29,7 +29,6 @@
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
@@ -669,13 +668,17 @@ private void mapGetByType(ReadableMap map, String key, String typeToAskFor) {
     }
   }
 
-  @ReactModule(name = "Recording")
   private class RecordingTestModule extends BaseJavaModule {
 
     private final List<Object[]> mBasicTypesCalls = new ArrayList<Object[]>();
     private final List<ReadableArray> mArrayCalls = new ArrayList<ReadableArray>();
     private final List<ReadableMap> mMapCalls = new ArrayList<ReadableMap>();
 
+    @Override
+    public String getName() {
+      return "Recording";
+    }
+
     @ReactMethod
     public void receiveBasicTypes(String s, double d, boolean b, String nullableString) {
       mBasicTypesCalls.add(new Object[]{s, d, b, nullableString});

ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java

@@ -12,13 +12,12 @@
 import android.test.ActivityInstrumentationTestCase2;
 
 import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.bridge.annotations.ReactModule;
+import com.facebook.react.testing.FakeWebSocketModule;
+import com.facebook.react.testing.ReactInstanceSpecForTest;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactAppTestActivity;
-import com.facebook.react.testing.ReactInstanceSpecForTest;
 
 /**
  * Simple test case for passing initial props to the root React application.
@@ -28,11 +27,15 @@ public class InitialPropsTestCase extends
 
   public static final String DEFAULT_JS_BUNDLE = "AndroidTestBundle.js";
 
-  @ReactModule(name = "InitialPropsRecordingModule")
   private static class RecordingModule extends BaseJavaModule {
     private int mCount = 0;
     private ReadableMap mProps;
 
+    @Override
+    public String getName() {
+      return "InitialPropsRecordingModule";
+    }
+
     @ReactMethod
     public void recordProps(ReadableMap props) {
       mProps = props;

ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java

@@ -20,9 +20,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
-@ReactModule(name = "JSCHeapCapture")
 public class JSCHeapCapture extends ReactContextBaseJavaModule {
   public interface HeapCapture extends JavaScriptModule {
     void captureHeap(String path);
@@ -134,6 +132,11 @@ public synchronized void captureComplete(String path, String error) {
     }
   }
 
+  @Override
+  public String getName() {
+    return "JSCHeapCapture";
+  }
+
   @Override
   public void initialize() {
     super.initialize();

ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java

@@ -16,10 +16,8 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
-@ReactModule(name = "AppState")
 public class AppStateModule extends ReactContextBaseJavaModule
         implements LifecycleEventListener {
 
@@ -32,6 +30,11 @@ public AppStateModule(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
+  @Override
+  public String getName() {
+    return "AppState";
+  }
+
   @Override
   public void initialize() {
     getReactApplicationContext().addLifecycleEventListener(this);

ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java

@@ -50,15 +50,13 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.common.ReactConstants;
 
 // TODO #6015104: rename to something less iOSish
 /**
  * {@link NativeModule} that allows JS to interact with the photos on the device (i.e.
  * {@link MediaStore.Images}).
  */
-@ReactModule(name = "RKCameraRollManager")
 public class CameraRollManager extends ReactContextBaseJavaModule {
 
   private static final String ERROR_UNABLE_TO_LOAD = "E_UNABLE_TO_LOAD";
@@ -100,6 +98,11 @@ public CameraRollManager(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
+  @Override
+  public String getName() {
+    return "RKCameraRollManager";
+  }
+
   @Override
   public Map<String, Object> getConstants() {
     return Collections.emptyMap();
@@ -437,4 +440,5 @@ private static void putLocationInfo(
       node.putMap("location", location);
     }
   }
+
 }

ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java

@@ -46,13 +46,11 @@
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.annotations.ReactModule;
 import com.facebook.react.common.ReactConstants;
 
 /**
  * Native module that provides image cropping functionality.
  */
-@ReactModule(name = "RKImageEditingManager")
 public class ImageEditingManager extends ReactContextBaseJavaModule {
 
   private static final List<String> LOCAL_URI_PREFIXES = Arrays.asList(
@@ -91,11 +89,17 @@ public class ImageEditingManager extends ReactContextBaseJavaModule {
     ExifInterface.TAG_WHITE_BALANCE
   };
 
+
   public ImageEditingManager(ReactApplicationContext reactContext) {
     super(reactContext);
     new CleanTask(getReactApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }
 
+  @Override
+  public String getName() {
+    return "RKImageEditingManager";
+  }
+
   @Override
   public Map<String, Object> getConstants() {
     return Collections.emptyMap();
@@ -278,6 +282,7 @@ protected void doInBackgroundGuarded(Void... params) {
         }
 
         mSuccess.invoke(Uri.fromFile(tempFile).toString());
+
       } catch (Exception e) {
         mError.invoke(e.getMessage());
       }

ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java

@@ -27,9 +27,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.annotations.ReactModule;
 
-@ReactModule(name = "ImageStoreManager")
 public class ImageStoreManager extends ReactContextBaseJavaModule {
 
   private static final int BUFFER_SIZE = 8192;
@@ -38,6 +36,11 @@ public ImageStoreManager(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
+  @Override
+  public String getName() {
+    return "ImageStoreManager";
+  }
+
   /**
    * Calculate the base64 representation for an image. The "tag" comes from iOS naming.
    *