covert RNFeedPackage and it's modules to use @ReactModule and @ReactM…

…oduleList Reviewed By: lexs Differential Revision: D3796860 fbshipit-source-id: d4b5f3635754ef28277b79cb1ea9bab07ba3ea6e
watert · Sep 2, 2016 · 3d1b79c · 3d1b79c
1 parent 6c909ef
commit 3d1b79c
Show file tree

Hide file tree

Showing 53 changed files with 216 additions and 131 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -6,13 +6,14 @@ android_library(
     '*.java',
   ]),
   deps = [
+    react_native_dep('third-party/android/support/v4:lib-support-v4'),
+    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
     react_native_target('java/com/facebook/react/modules/core:core'),
-    react_native_target('java/com/facebook/react/uimanager:uimanager'),
     react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
-    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
-    react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_dep('third-party/android/support/v4:lib-support-v4'),
+    react_native_target('java/com/facebook/react/uimanager:uimanager'),
   ],
   visibility = [
     'PUBLIC',

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -21,6 +21,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.GuardedChoreographerFrameCallback;
 import com.facebook.react.uimanager.ReactChoreographer;
@@ -70,6 +71,7 @@
  * isolates us from the problems that may be caused by concurrent updates of animated graph while UI
  * thread is "executing" the animation loop.
  */
+@ReactModule(name = "NativeAnimatedModule")
 public class NativeAnimatedModule extends ReactContextBaseJavaModule implements
     OnBatchCompleteListener, LifecycleEventListener {
 
@@ -136,8 +138,8 @@ public void onBatchComplete() {
     // from the UIManagerModule) doesn't matter as we only enqueue operations for the UI thread to
     // be executed from here. Thanks to ReactChoreographer all the operations from here are going
     // to be executed *after* all the operations enqueued by UIManager as the callback type that we
-    // use for ReactChoreographer (CallbackType.NATIVE_ANIMATED_MODULE) is run after callbacks that UIManager
-    // use
+    // use for ReactChoreographer (CallbackType.NATIVE_ANIMATED_MODULE) is run after callbacks that
+    // UIManager uses.
     ArrayList<UIThreadOperation> operations = mOperations.isEmpty() ? null : mOperations;
     if (operations != null) {
       mOperations = new ArrayList<>();

diff --git a/...tAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/...tAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
+import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
@@ -37,6 +38,7 @@
 import com.squareup.javapoet.TypeSpec;
 
 import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.tools.Diagnostic.Kind.ERROR;
 
 /**
  * Generates a list of ReactModuleInfo for modules annotated with {@link ReactModule} in
@@ -59,13 +61,16 @@ public class ReactModuleSpecProcessor extends AbstractProcessor {
   private Filer mFiler;
   @SuppressFieldNotInitialized
   private Elements mElements;
+  @SuppressFieldNotInitialized
+  private Messager mMessager;
 
   @Override
   public synchronized void init(ProcessingEnvironment processingEnv) {
     super.init(processingEnv);
 
     mFiler = processingEnv.getFiler();
     mElements = processingEnv.getElementUtils();
+    mMessager = processingEnv.getMessager();
   }
 
   @Override
@@ -89,23 +94,29 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         }
       }
 
-      MethodSpec getReactModuleInfosMethod = MethodSpec.methodBuilder("getReactModuleInfos")
-        .addModifiers(PUBLIC)
-        // TODO add function to native module interface
+      MethodSpec getReactModuleInfosMethod;
+      try {
+        getReactModuleInfosMethod = MethodSpec.methodBuilder("getReactModuleInfos")
+          .addModifiers(PUBLIC)
+          // TODO add function to native module interface
 //        .addAnnotation(Override.class)
-        .addCode(getCodeBlockForReactModuleInfos(nativeModules))
-        .returns(MAP_TYPE)
-        .build();
+          .addCode(getCodeBlockForReactModuleInfos(nativeModules))
+          .returns(MAP_TYPE)
+          .build();
+      } catch (ReactModuleSpecException reactModuleSpecException) {
+        mMessager.printMessage(ERROR, reactModuleSpecException.mMessage);
+        return false;
+      }
 
-      TypeSpec reactModulesInfosTypeSpec = TypeSpec.classBuilder(
-        fileName + "$$ReactModuleInfoProvider")
-        .addModifiers(Modifier.PUBLIC)
-        .addMethod(getReactModuleInfosMethod)
-        .build();
+        TypeSpec reactModulesInfosTypeSpec = TypeSpec.classBuilder(
+          fileName + "$$ReactModuleInfoProvider")
+          .addModifiers(Modifier.PUBLIC)
+          .addMethod(getReactModuleInfosMethod)
+          .build();
 
-      JavaFile javaFile = JavaFile.builder(packageName, reactModulesInfosTypeSpec)
-        .addFileComment("Generated by " + getClass().getName())
-        .build();
+        JavaFile javaFile = JavaFile.builder(packageName, reactModulesInfosTypeSpec)
+          .addFileComment("Generated by " + getClass().getName())
+          .build();
 
       try {
         javaFile.writeTo(mFiler);
@@ -117,7 +128,8 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     return true;
   }
 
-  private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules) {
+  private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules)
+    throws ReactModuleSpecException {
     CodeBlock.Builder builder = CodeBlock.builder()
       .addStatement("$T map = new $T()", MAP_TYPE, INSTANTIATED_MAP_TYPE);
 
@@ -126,6 +138,9 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules) {
 
       TypeElement typeElement = mElements.getTypeElement(nativeModule);
       ReactModule reactModule = typeElement.getAnnotation(ReactModule.class);
+      if (reactModule == null) {
+        throw new ReactModuleSpecException(keyString + " not found.");
+      }
       String valueString = new StringBuilder()
         .append("new ReactModuleInfo(")
         .append("\"").append(reactModule.name()).append("\"").append(", ")
@@ -140,4 +155,13 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules) {
     builder.addStatement("return map");
     return builder.build();
   }
+
+  private static class ReactModuleSpecException extends Exception {
+
+    public final String mMessage;
+
+    public ReactModuleSpecException(String message) {
+      mMessage = message;
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
@@ -16,8 +16,10 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
+@ReactModule(name = "AppState")
 public class AppStateModule extends ReactContextBaseJavaModule
         implements LifecycleEventListener {
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@@ -4,12 +4,13 @@ android_library(
   name = 'appstate',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/common:common'),
-    react_native_target('java/com/facebook/react/modules/core:core'),
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
+    react_native_target('java/com/facebook/react/modules/core:core'),
   ],
   visibility = [
     'PUBLIC',

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@@ -4,11 +4,12 @@ android_library(
   name = 'camera',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/common:common'),
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
   ],
   visibility = [
     'PUBLIC',

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
@@ -49,12 +49,14 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.module.annotations.ReactModule;
 
 // 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";

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
@@ -47,10 +47,12 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.module.annotations.ReactModule;
 
 /**
  * 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(
@@ -89,7 +91,6 @@ public class ImageEditingManager extends ReactContextBaseJavaModule {
     ExifInterface.TAG_WHITE_BALANCE
   };
 
-
   public ImageEditingManager(ReactApplicationContext reactContext) {
     super(reactContext);
     new CleanTask(getReactApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -282,7 +283,6 @@ protected void doInBackgroundGuarded(Void... params) {
         }
 
         mSuccess.invoke(Uri.fromFile(tempFile).toString());
-
       } catch (Exception e) {
         mError.invoke(e.getMessage());
       }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
@@ -27,7 +27,9 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = "ImageStoreManager")
 public class ImageStoreManager extends ReactContextBaseJavaModule {
 
   private static final int BUFFER_SIZE = 8192;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
@@ -4,11 +4,12 @@ android_library(
   name = 'clipboard',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/common:common'),
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
   ],
   visibility = [
     'PUBLIC',

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
@@ -14,24 +14,16 @@
 import android.content.ClipData;
 import android.os.Build;
 
-import com.facebook.common.logging.FLog;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
-import com.facebook.react.common.ReactConstants;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.facebook.react.module.annotations.ReactModule;
 
 /**
  * A module that allows JS to get/set clipboard contents.
  */
+@ReactModule(name = "Clipboard")
 public class ClipboardModule extends ReactContextBaseJavaModule {
 
   public ClipboardModule(ReactApplicationContext reactContext) {
@@ -48,7 +40,7 @@ private ClipboardManager getClipboardService() {
   }
 
   @ReactMethod
-  public void getString(Promise promise){
+  public void getString(Promise promise) {
     try {
       ClipboardManager clipboard = getClipboardService();
       ClipData clipData = clipboard.getPrimaryClip();
@@ -60,7 +52,7 @@ public void getString(Promise promise){
       } else {
         promise.resolve("");
       }
-    } catch(Exception e) {
+    } catch (Exception e) {
       promise.reject(e);
     }
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -4,13 +4,14 @@ android_library(
   name = 'core',
   srcs = glob(['**/*.java']),
   deps = [
+    react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
+    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/devsupport:devsupport'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
     react_native_target('java/com/facebook/react/uimanager:uimanager'),
-    react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
-    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
-    react_native_dep('third-party/java/jsr-305:jsr-305'),
   ],
   visibility = [
     'PUBLIC',

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
@@ -21,10 +21,12 @@
 import com.facebook.react.bridge.SupportsWebWorkers;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 /**
  * Native module that handles device hardware events like hardware back presses.
  */
+@ReactModule(name = "DeviceEventManager")
 public class DeviceEventManagerModule extends ReactContextBaseJavaModule {
 
   @SupportsWebWorkers

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
@@ -21,7 +21,9 @@
 import com.facebook.react.devsupport.DevSupportManager;
 import com.facebook.react.common.JavascriptException;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = "RKExceptionsManager")
 public class ExceptionsManagerModule extends BaseJavaModule {
 
   static private final Pattern mJsModuleIdPattern = Pattern.compile("(?:^|[/\\\\])(\\d+\\.js)$");

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
@@ -24,6 +24,7 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.SystemClock;
 import com.facebook.react.devsupport.DevSupportManager;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ReactChoreographer;
 
 import java.util.ArrayList;
@@ -41,6 +42,7 @@
 /**
  * Native module for JS timer execution. Timers fire on frame boundaries.
  */
+@ReactModule(name = "RCTTiming", supportsWebWorkers = true)
 public final class Timing extends ReactContextBaseJavaModule implements LifecycleEventListener,
   OnExecutorUnregisteredListener {
 
@@ -168,7 +170,7 @@ public void run() {
       long time = SystemClock.currentTimeMillis();
       long absoluteFrameStartTime = time - frameTimeElapsed;
 
-      if (FRAME_DURATION_MS - (float)frameTimeElapsed < IDLE_CALLBACK_FRAME_DEADLINE_MS) {
+      if (FRAME_DURATION_MS - (float) frameTimeElapsed < IDLE_CALLBACK_FRAME_DEADLINE_MS) {
         return;
       }
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
@@ -4,11 +4,12 @@ android_library(
   name = 'datepicker',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/common:common'),
     react_native_dep('third-party/android/support/v4:lib-support-v4'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/module/annotations:annotations'),
   ],
   visibility = [
     'PUBLIC',