Revert D72389708: Rename assertWhenLegacyArchitectureMinifyingEnabled to assertLegacyArchitecture

Differential Revision:
D72389708

Original commit changeset: 23830df2f71c

Original Phabricator Diff: D72389708

fbshipit-source-id: 3dd074102cf75c03fa11ad5daf8ddc2f748e7879
This commit is contained in:
Thanich Juthapisuth
2025-04-04 14:22:56 -07:00
committed by Facebook GitHub Bot
parent a5a71f115f
commit 91c6cf2aed
53 changed files with 70 additions and 90 deletions
@@ -66,7 +66,7 @@ import java.util.Map;
class CoreModulesPackage extends BaseReactPackage implements ReactPackageLogger {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"CoreModulesPackage", LegacyArchitectureLogLevel.WARNING);
}
@@ -36,7 +36,7 @@ import java.util.Map;
public abstract class LazyReactPackage implements ReactPackage {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LazyReactPackage", LegacyArchitectureLogLevel.WARNING);
}
@@ -65,7 +65,7 @@ by autolinking. Try removing the existing entry and rebuild.
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NativeModuleRegistryBuilder", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -150,7 +150,7 @@ import java.util.Set;
public class ReactInstanceManager {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactInstanceManager", LegacyArchitectureLogLevel.WARNING);
}
@@ -51,7 +51,7 @@ import java.util.Map;
public class ReactInstanceManagerBuilder {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactInstanceManagerBuilder", LegacyArchitectureLogLevel.WARNING);
}
@@ -41,7 +41,7 @@ import java.util.List;
public abstract class ReactNativeHost {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactNativeHost", LegacyArchitectureLogLevel.WARNING);
}
@@ -39,7 +39,7 @@ import java.util.Collection;
@LegacyArchitecture
public class BridgeReactContext extends ReactApplicationContext {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"BridgeReactContext", LegacyArchitectureLogLevel.WARNING);
}
@@ -16,7 +16,7 @@ import com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE
@LegacyArchitecture
internal object BridgeSoLoader {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("BridgeSoLoader")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("BridgeSoLoader")
}
@JvmStatic
@@ -28,7 +28,7 @@ internal class CallbackImpl(private val jsInstance: JSInstance, private val call
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"CallbackImpl", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public class CatalystInstanceImpl implements CatalystInstance {
static {
BridgeSoLoader.staticInit();
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"CatalystInstanceImpl", LegacyArchitectureLogLevel.WARNING);
}
@@ -19,7 +19,7 @@ public open class CxxModuleWrapper protected constructor(hybridData: HybridData)
CxxModuleWrapperBase(hybridData) {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("CxxModuleWrapper")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("CxxModuleWrapper")
}
}
}
@@ -49,7 +49,7 @@ protected constructor(
private companion object {
init {
BridgeSoLoader.staticInit()
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"CxxModuleWrapperBase", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -21,7 +21,8 @@ internal class InvalidIteratorException @DoNotStrip constructor(msg: String) :
RuntimeException(msg) {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("InvalidIteratorException")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"InvalidIteratorException")
}
}
}
@@ -18,7 +18,7 @@ import org.json.JSONObject;
@LegacyArchitecture
public class JSONArguments {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"JSONArguments", LegacyArchitectureLogLevel.WARNING);
}
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
@LegacyArchitecture
class JavaMethodWrapper implements JavaModuleWrapper.NativeMethod {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"JavaMethodWrapper", LegacyArchitectureLogLevel.WARNING);
}
@@ -35,7 +35,7 @@ import java.util.Map;
@LegacyArchitecture
class JavaModuleWrapper {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"JavaModuleWrapper", LegacyArchitectureLogLevel.WARNING);
}
@@ -20,7 +20,8 @@ internal class NativeArgumentsParseException : JSApplicationCausedNativeExceptio
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("NativeArgumentsParseException")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NativeArgumentsParseException")
}
}
}
@@ -115,7 +115,7 @@ public class NativeModuleRegistry {
// short-circuit
// the search, and simply call OnBatchComplete on the UI Manager.
// With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NativeModuleRegistry.onBatchComplete()", LegacyArchitectureLogLevel.ERROR);
ModuleHolder moduleHolder = mModules.get("UIManager");
if (moduleHolder != null && moduleHolder.hasInstance()) {
@@ -18,7 +18,7 @@ import java.lang.reflect.Method
@LegacyArchitecture
public object ReactCxxErrorHandler {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactCxxErrorHandler", LegacyArchitectureLogLevel.WARNING)
}
@@ -68,7 +68,7 @@ public class ReactInstanceManagerInspectorTarget implements AutoCloseable {
}
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactInstanceManagerInspectorTarget", LegacyArchitectureLogLevel.WARNING);
BridgeSoLoader.staticInit();
}
@@ -21,7 +21,8 @@ public class ReactNoCrashBridgeNotAllowedSoftException : ReactNoCrashSoftExcepti
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("ReactNoCrashBridgeNotAllowedSoftException")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactNoCrashBridgeNotAllowedSoftException")
}
}
}
@@ -53,7 +53,7 @@ internal class InteropModuleRegistry {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("InteropModuleRegistry")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropModuleRegistry")
}
}
}
@@ -42,54 +42,28 @@ public object LegacyArchitectureLogger {
}
/**
* Asserts and logs when legacy architecture classes are being used in New Architecture. This
* Asserts and logs when legacy architecture components are being used in new architecture. This
* method will throw an exception if the app is running on the new architecture and the logLevel
* received by parameter is [LegacyArchitectureLogLevel.ERROR]. Otherwise it will show a warning
* on logcat.
* received by parameter is [LegacyArchitectureLogLevel.ERROR].
*
* @param name The name of the legacy class being used
* @param name The name of the legacy component being used
* @param logLevel The severity level of the log (ERROR or WARNING, defaults to WARNING)
*/
@JvmStatic
public fun assertLegacyArchitecture(
public fun assertWhenLegacyArchitectureMinifyingEnabled(
name: String,
logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING
) {
if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE ||
OSS_LEGACY_WARNINGS_ENABLED) {
executeAssert(name, logLevel)
}
}
/**
* Similar to [assertLegacyArchitecture] but executes only when
* [UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE] is set to true. This applies only to internal
* builds.
*
* @param name The name of the legacy class being used
* @param logLevel The severity level of the log (ERROR or WARNING, defaults to WARNING)
*/
@JvmStatic
public fun assertLegacyArchitectureOnlyWhenMinifyEnabled(
name: String,
logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING
) {
if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
executeAssert(name, logLevel)
}
}
private fun executeAssert(
name: String,
logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING
) {
when (logLevel) {
LegacyArchitectureLogLevel.ERROR -> {
throw AssertionException("$name $exceptionMessage")
}
LegacyArchitectureLogLevel.WARNING -> {
ReactSoftExceptionLogger.logSoftException(
tag, ReactNoCrashSoftException("$name $exceptionMessage"))
when (logLevel) {
LegacyArchitectureLogLevel.ERROR -> {
throw AssertionException("$name $exceptionMessage")
}
LegacyArchitectureLogLevel.WARNING -> {
ReactSoftExceptionLogger.logSoftException(
tag, ReactNoCrashSoftException("$name $exceptionMessage"))
}
}
}
}
@@ -54,7 +54,7 @@ import java.util.Map;
public final class BridgeDevSupportManager extends DevSupportManagerBase {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"BridgeDevSupportManager", LegacyArchitectureLogLevel.WARNING);
}
@@ -31,7 +31,7 @@ public class InteropEvent(
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("InteropEvent")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropEvent")
}
}
}
@@ -60,7 +60,7 @@ public class InteropEventEmitter(private val reactContext: ReactContext) : RCTEv
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("InteropEventEmitter")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropEventEmitter")
}
}
}
@@ -27,7 +27,7 @@ public class JSCExecutor internal constructor(jscConfig: ReadableNativeMap) :
private companion object {
init {
loadLibrary()
LegacyArchitectureLogger.assertLegacyArchitecture("JSCExecutor")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("JSCExecutor")
}
@JvmStatic
@@ -18,7 +18,7 @@ public class JSCExecutorFactory(private val appName: String, private val deviceN
JavaScriptExecutorFactory {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("JSCExecutorFactory")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("JSCExecutorFactory")
}
@Throws(Exception::class)
@@ -15,7 +15,7 @@ import com.facebook.yoga.YogaDirection
@LegacyArchitecture
internal object LayoutDirectionUtil {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("LayoutDirectionUtil")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("LayoutDirectionUtil")
}
@JvmStatic
@@ -40,7 +40,7 @@ import com.facebook.yoga.YogaWrap;
@LegacyArchitecture
public class LayoutShadowNode extends ReactShadowNodeImpl {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutShadowNode", LegacyArchitectureLogLevel.WARNING);
}
@@ -71,7 +71,7 @@ import javax.annotation.concurrent.NotThreadSafe;
public class NativeViewHierarchyManager {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NativeViewHierarchyManager", LegacyArchitectureLogLevel.WARNING);
}
@@ -52,7 +52,7 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
public class NativeViewHierarchyOptimizer {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NativeViewHierarchyOptimizer", LegacyArchitectureLogLevel.WARNING);
}
@@ -20,7 +20,8 @@ internal class NoSuchNativeViewException(detailMessage: String) :
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("NoSuchNativeViewException")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"NoSuchNativeViewException")
}
}
}
@@ -59,7 +59,7 @@ public class OnLayoutEvent private constructor() : Event<OnLayoutEvent>() {
public companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"OnLayoutEvent", LegacyArchitectureLogLevel.WARNING)
}
@@ -67,7 +67,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
}
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ReactShadowNodeImpl", LegacyArchitectureLogLevel.WARNING);
}
@@ -16,7 +16,7 @@ import com.facebook.yoga.YogaErrata
@LegacyArchitecture
internal object ReactYogaConfigProvider {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("ReactYogaConfigProvider")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("ReactYogaConfigProvider")
}
val yogaConfig: YogaConfig by
@@ -84,7 +84,7 @@ internal class ShadowNodeRegistry {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ShadowNodeRegistry", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -44,7 +44,7 @@ import java.util.Map;
@LegacyArchitecture
public class UIImplementation {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"UIImplementation", LegacyArchitectureLogLevel.WARNING);
}
@@ -78,7 +78,7 @@ public class UIManagerHelper {
// - BridgeReactContext is compiled-out when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true
//
// To detect a potential regression we add the following assertion ERROR
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"UIManagerHelper.getUIManager(context, uiManagerType)", LegacyArchitectureLogLevel.ERROR);
if (!context.hasCatalystInstance()) {
ReactSoftExceptionLogger.logSoftException(
@@ -89,7 +89,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
public class UIManagerModule extends ReactContextBaseJavaModule
implements OnBatchCompleteListener, LifecycleEventListener, UIManager {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"UIManagerModule", LegacyArchitectureLogLevel.WARNING);
}
@@ -52,7 +52,7 @@ import java.util.Map;
public class UIViewOperationQueue {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"UIViewOperationQueue", LegacyArchitectureLogLevel.WARNING);
}
@@ -41,7 +41,7 @@ public class ViewAtIndex(
}
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"ViewAtIndex", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -16,7 +16,7 @@ import com.facebook.yoga.YogaNode
@LegacyArchitecture
internal object YogaNodePool {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("YogaNodePool")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("YogaNodePool")
}
private val pool: ClearableSynchronizedPool<YogaNode> by
@@ -99,7 +99,7 @@ internal abstract class AbstractLayoutAnimation {
companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"AbstractLayoutAnimation", LegacyArchitectureLogLevel.WARNING)
}
@@ -78,7 +78,7 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"BaseLayoutAnimation", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -31,7 +31,7 @@ import javax.annotation.concurrent.NotThreadSafe;
public class LayoutAnimationController {
static {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutAnimationController", LegacyArchitectureLogLevel.WARNING);
}
@@ -22,7 +22,7 @@ internal enum class LayoutAnimationType {
companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutAnimationType", LegacyArchitectureLogLevel.WARNING)
}
@@ -22,7 +22,7 @@ internal class LayoutCreateAnimation : BaseLayoutAnimation() {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutCreateAnimation", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -22,7 +22,7 @@ internal class LayoutDeleteAnimation : BaseLayoutAnimation() {
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutDeleteAnimation", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -51,7 +51,7 @@ internal class LayoutUpdateAnimation : AbstractLayoutAnimation() {
private const val USE_TRANSLATE_ANIMATION = false
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"LayoutUpdateAnimation", LegacyArchitectureLogLevel.WARNING)
}
}
@@ -28,7 +28,7 @@ internal class OpacityAnimation(view: View, private val startOpacity: Float, end
init {
setAnimationListener(OpacityAnimationListener(view))
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"OpacityAnimation", LegacyArchitectureLogLevel.WARNING)
}
@@ -81,7 +81,8 @@ internal class PositionAndSizeAnimation(view: View, x: Int, y: Int, width: Int,
private companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture("PositionAndSizeAnimation")
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"PositionAndSizeAnimation")
}
}
}
@@ -10,6 +10,7 @@ package com.facebook.react.uimanager.layoutanimation
import android.view.animation.Interpolator
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.ReadableType
import com.facebook.react.bridge.ReadableType.Number
import com.facebook.react.common.annotations.internal.LegacyArchitecture
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
@@ -38,7 +39,7 @@ internal class SimpleSpringInterpolator : Interpolator {
companion object {
init {
LegacyArchitectureLogger.assertLegacyArchitecture(
LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled(
"SimpleSpringInterpolator", LegacyArchitectureLogLevel.WARNING)
}