Skip to content

improve NativeModuleRegistryBuilder.java #16402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vonovak wants to merge 3 commits into from
+15 −21
Closed

improve NativeModuleRegistryBuilder.java #16402

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d177990
add possible cause to message
vonovak Oct 15, 2017
c96948d
add canOverrideExistingModule
vonovak Oct 15, 2017
e848836
use getCanOverrideExistingModule
vonovak Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,7 @@ public void processPackage(ReactPackage reactPackage) {
}

String name = moduleHolder.getName();
if (namesToType.containsKey(name)) {
Class<? extends NativeModule> existingNativeModule = namesToType.get(name);
if (!moduleHolder.getCanOverrideExistingModule()) {
throw new IllegalStateException("Native module " + type.getSimpleName() +
" tried to override " + existingNativeModule.getSimpleName() + " for module name " +
name + ". If this was your intention, set canOverrideExistingModule=true");
}

mModules.remove(existingNativeModule);
}

namesToType.put(name, type);
mModules.put(type, moduleHolder);
putModuleTypeAndHolderToModuleMaps(type, name, moduleHolder);
}
} else {
FLog.d(
Expand All @@ -117,19 +105,25 @@ public void processPackage(ReactPackage reactPackage) {
public void addNativeModule(NativeModule nativeModule) {
String name = nativeModule.getName();
Class<? extends NativeModule> type = nativeModule.getClass();
if (namesToType.containsKey(name)) {
Class<? extends NativeModule> existingModule = namesToType.get(name);
if (!nativeModule.canOverrideExistingModule()) {
putModuleTypeAndHolderToModuleMaps(type, name, new ModuleHolder(nativeModule));
}

private void putModuleTypeAndHolderToModuleMaps(Class<? extends NativeModule> type, String underName,
ModuleHolder moduleHolder) throws IllegalStateException {
if (namesToType.containsKey(underName)) {
Class<? extends NativeModule> existingNativeModule = namesToType.get(underName);
if (!moduleHolder.getCanOverrideExistingModule()) {
throw new IllegalStateException("Native module " + type.getSimpleName() +
" tried to override " + existingModule.getSimpleName() + " for module name " +
name + ". If this was your intention, set canOverrideExistingModule=true");
" tried to override " + existingNativeModule.getSimpleName() + " for module name " +
underName + ". Check the getPackages() method in MainApplication.java, it might be " +
"that module is being created twice. " +
"If this was your intention, set canOverrideExistingModule=true");
}

mModules.remove(existingModule);
mModules.remove(existingNativeModule);
}

namesToType.put(name, type);
ModuleHolder moduleHolder = new ModuleHolder(nativeModule);
namesToType.put(underName, type);
mModules.put(type, moduleHolder);
}

Expand Down