[TurboModule] Android: Refactor the code to use a shared implementation

Riccardo Cipolleschi · Riccardo Cipolleschi · commit 1110898284f0 · 2022-12-11T13:32:52.000Z
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@
 * [[TurboModule] Update the Native iOS code](#ios-tm-code)
 * [[TurboModule] Android: Convert ReactPackage to a backward compatible TurboReactPackage](#android-backward)
 * [[TurboModule] Android: Update the Native code to use two sourcesets](#android-sourceset)
+* [[TurboModule] Android: Refactor the code to use a shared implementation](#android-refactor)
 
 ## Steps
 
@@ -587,3 +588,106 @@ end
         }
     }
     ```
+
+### <a name="android-refactor" />[[TurboModule] Android: Refactor the code to use a shared implementation](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/)
+
+1. Create a new `calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorModuleImpl.java` file (notice that the `src`'s subfolder is now `main`) and paste the following code:
+    ```java
+    package com.rnnewarchitecturelibrary;
+
+    import androidx.annotation.NonNull;
+    import com.facebook.react.bridge.Promise;
+    import java.util.Map;
+    import java.util.HashMap;
+
+    public class CalculatorModuleImpl {
+
+        public static final String NAME = "RNCalculator";
+
+        public static void add(double a, double b, Promise promise) {
+            promise.resolve(a + b);
+        }
+
+    }
+    ```
+1. Open the `calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorPackage.java` file and update the following lines:
+    ```diff
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    -    if (name.equals(CalculatorModule.NAME)) {
+    +    if (name.equals(CalculatorModuleImpl.NAME)) {
+            return new CalculatorModule(reactContext);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+            moduleInfos.put(
+    -                CalculatorModule.NAME,
+    +                CalculatorModuleImpl.NAME,
+                    new ReactModuleInfo(
+    -                        CalculatorModule.NAME,
+    -                        CalculatorModule.NAME,
+    +                        CalculatorModuleImpl.NAME,
+    +                        CalculatorModuleImpl.NAME,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            isTurboModule // isTurboModule
+            ));
+            return moduleInfos;
+        };
+    }
+    ```
+1. Open the `calculator/android/src/newarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java` file and update it as it follows:
+    ```diff
+    public class CalculatorModule extends NativeCalculatorSpec {
+
+    -    public static final String NAME = "RNCalculator";
+
+        CalculatorModule(ReactApplicationContext context) {
+            super(context);
+        }
+
+        @Override
+        @NonNull
+        public String getName() {
+    -        return NAME;
+    +        return CalculatorModuleImpl.NAME;
+        }
+
+        @Override
+        public void add(double a, double b, Promise promise) {
+    -        promise.resolve(a + b);
+    +        CalculatorModuleImpl.add(a, b, promise);
+        }
+    }
+    ```
+1. Open the `calculator/android/src/oldarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java` and update it as it follows:
+    ```diff
+    public class CalculatorModule extends ReactContextBaseJavaModule {
+
+    -    public static final String NAME = "RNCalculator";
+
+        CalculatorModule(ReactApplicationContext context) {
+            super(context);
+        }
+
+        @Override
+        public String getName() {
+    -        return NAME;
+    +        return CalculatorModuleImpl.NAME;
+        }
+
+        @ReactMethod
+        public void add(int a, int b, Promise promise) {
+    -        promise.resolve(a + b);
+    +        CalculatorModuleImpl.add(a, b, promise);
+        }
+    }
+1. Remove the `android/src/main/java/com/rnnewarchitecturelibrary/CalculatorModule.java` (the one in the `main` folder).
diff --git a/calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorModuleImpl.java b/calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorModuleImpl.java
@@ -0,0 +1,16 @@
+package com.rnnewarchitecturelibrary;
+
+import androidx.annotation.NonNull;
+import com.facebook.react.bridge.Promise;
+import java.util.Map;
+import java.util.HashMap;
+
+public class CalculatorModuleImpl {
+
+    public static final String NAME = "RNCalculator";
+
+    public static void add(double a, double b, Promise promise) {
+        promise.resolve(a + b);
+    }
+
+}
diff --git a/calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorPackage.java b/calculator/android/src/main/java/com/rnnewarchitecturelibrary/CalculatorPackage.java
@@ -19,7 +19,7 @@ public class CalculatorPackage extends TurboReactPackage {
     @Nullable
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (name.equals(CalculatorModule.NAME)) {
+        if (name.equals(CalculatorModuleImpl.NAME)) {
             return new CalculatorModule(reactContext);
         } else {
             return null;
@@ -32,10 +32,10 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
             final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
             boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
             moduleInfos.put(
-                    CalculatorModule.NAME,
+                    CalculatorModuleImpl.NAME,
                     new ReactModuleInfo(
-                            CalculatorModule.NAME,
-                            CalculatorModule.NAME,
+                            CalculatorModuleImpl.NAME,
+                            CalculatorModuleImpl.NAME,
                             false, // canOverrideExistingModule
                             false, // needsEagerInit
                             true, // hasConstants
diff --git a/calculator/android/src/newarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java b/calculator/android/src/newarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java
@@ -12,20 +12,18 @@
 
 public class CalculatorModule extends NativeCalculatorSpec {
 
-    public static final String NAME = "RNCalculator";
-
     CalculatorModule(ReactApplicationContext context) {
         super(context);
     }
 
     @Override
     @NonNull
     public String getName() {
-        return NAME;
+        return CalculatorModuleImpl.NAME;
     }
 
     @Override
     public void add(double a, double b, Promise promise) {
-        promise.resolve(a + b);
+        CalculatorModuleImpl.add(a, b, promise);
     }
 }
diff --git a/calculator/android/src/oldarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java b/calculator/android/src/oldarch/java/com/rnnewarchitecturelibrary/CalculatorModule.java
@@ -11,19 +11,17 @@
 
 public class CalculatorModule extends ReactContextBaseJavaModule {
 
-    public static final String NAME = "RNCalculator";
-
     CalculatorModule(ReactApplicationContext context) {
         super(context);
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return CalculatorModuleImpl.NAME;
     }
 
     @ReactMethod
     public void add(int a, int b, Promise promise) {
-        promise.resolve(a + b);
+        CalculatorModuleImpl.add(a, b, promise);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,18 @@`
`12`	`12`
`13`	`13`	`public class CalculatorModule extends NativeCalculatorSpec {`
`14`	`14`
`15`		`- public static final String NAME = "RNCalculator";`
`16`		`-`
`17`	`15`	`CalculatorModule(ReactApplicationContext context) {`
`18`	`16`	`super(context);`
`19`	`17`	`}`
`20`	`18`
`21`	`19`	`@Override`
`22`	`20`	`@NonNull`
`23`	`21`	`public String getName() {`
`24`		`- return NAME;`
	`22`	`+ return CalculatorModuleImpl.NAME;`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`@Override`
`28`	`26`	`public void add(double a, double b, Promise promise) {`
`29`		`- promise.resolve(a + b);`
	`27`	`+ CalculatorModuleImpl.add(a, b, promise);`
`30`	`28`	`}`
`31`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,17 @@`
`11`	`11`
`12`	`12`	`public class CalculatorModule extends ReactContextBaseJavaModule {`
`13`	`13`
`14`		`- public static final String NAME = "RNCalculator";`
`15`		`-`
`16`	`14`	`CalculatorModule(ReactApplicationContext context) {`
`17`	`15`	`super(context);`
`18`	`16`	`}`
`19`	`17`
`20`	`18`	`@Override`
`21`	`19`	`public String getName() {`
`22`		`- return NAME;`
	`20`	`+ return CalculatorModuleImpl.NAME;`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`@ReactMethod`
`26`	`24`	`public void add(int a, int b, Promise promise) {`
`27`		`- promise.resolve(a + b);`
	`25`	`+ CalculatorModuleImpl.add(a, b, promise);`
`28`	`26`	`}`
`29`	`27`	`}`