Changing fabric to renderer as part of stable APIs refactor

Summary: Changelog: [Internal] Differential Revision: D47280468 fbshipit-source-id: e610a5b3f8395788cdfe0ad8e558baf3f808aac5
arushikesarwani94 · Jul 11, 2023 · 8c67eb1 · 8c67eb1
1 parent 3ff0160
commit 8c67eb1
Show file tree

Hide file tree

Showing 51 changed files with 128 additions and 131 deletions.
diff --git a/...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java b/...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java
@@ -48,13 +48,13 @@
 import com.facebook.react.devsupport.DevSupportManagerBase;
 import com.facebook.react.devsupport.DisabledDevSupportManager;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.interfaces.ReactHostInterface;
 import com.facebook.react.interfaces.ReactSurfaceInterface;
 import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.renderer.ComponentFactory;
+import com.facebook.react.renderer.FabricUIManager;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.BlackHoleEventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcher;

diff --git a/...eact-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt b/...eact-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt
@@ -12,7 +12,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.fabric.ReactNativeConfig
+import com.facebook.react.renderer.ReactNativeConfig
 import com.facebook.react.turbomodule.core.TurboModuleManager
 
 /**

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java
@@ -34,16 +34,16 @@
 import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.fabric.Binding;
-import com.facebook.react.fabric.BindingImpl;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.ReactNativeConfig;
-import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.JavaTimerManager;
 import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.renderer.Binding;
+import com.facebook.react.renderer.BindingImpl;
+import com.facebook.react.renderer.ComponentFactory;
+import com.facebook.react.renderer.FabricUIManager;
+import com.facebook.react.renderer.ReactNativeConfig;
+import com.facebook.react.renderer.events.EventBeatManager;
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
 import com.facebook.react.turbomodule.core.NativeMethodCallInvokerHolderImpl;
 import com.facebook.react.turbomodule.core.TurboModuleManager;

diff --git a/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java b/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java
@@ -22,11 +22,11 @@
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridgeless.internal.bolts.Task;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.fabric.SurfaceHandler;
-import com.facebook.react.fabric.SurfaceHandlerBinding;
 import com.facebook.react.interfaces.ReactSurfaceInterface;
 import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.renderer.SurfaceHandler;
+import com.facebook.react.renderer.SurfaceHandlerBinding;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nullable;

diff --git a/...ative/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt b/...ative/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt
@@ -9,7 +9,7 @@ package com.facebook.react.defaults
 
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.fabric.ComponentFactory
+import com.facebook.react.renderer.ComponentFactory
 
 /**
  * A utility class that provides users a ComponentRegistry they can customize with a C++

diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt b/...-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt
@@ -15,9 +15,9 @@ import com.facebook.react.bridge.JSIModuleType
 import com.facebook.react.bridge.JavaScriptContextHolder
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UIManager
-import com.facebook.react.fabric.ComponentFactory
-import com.facebook.react.fabric.FabricJSIModuleProvider
-import com.facebook.react.fabric.ReactNativeConfig
+import com.facebook.react.renderer.ComponentFactory
+import com.facebook.react.renderer.FabricJSIModuleProvider
+import com.facebook.react.renderer.ReactNativeConfig
 import com.facebook.react.uimanager.ViewManagerRegistry
 
 /**

diff --git a/...native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt b/...native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt
@@ -16,7 +16,7 @@ import com.facebook.react.bridgeless.JSEngineInstance
 import com.facebook.react.bridgeless.ReactHostDelegate
 import com.facebook.react.bridgeless.hermes.HermesInstance
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.fabric.ReactNativeConfig
+import com.facebook.react.renderer.ReactNativeConfig
 import com.facebook.react.turbomodule.core.TurboModuleManager
 
 /**

diff --git a/...ava/com/facebook/react/fabric/.clang-tidy → ...a/com/facebook/react/renderer/.clang-tidy b/...ava/com/facebook/react/fabric/.clang-tidy → ...a/com/facebook/react/renderer/.clang-tidy
diff --git a/...va/com/facebook/react/fabric/Binding.java → .../com/facebook/react/renderer/Binding.java b/...va/com/facebook/react/fabric/Binding.java → .../com/facebook/react/renderer/Binding.java
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.RuntimeScheduler;
-import com.facebook.react.fabric.events.EventBeatManager;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.renderer.events.EventBeatManager;
+import com.facebook.react.renderer.events.EventEmitterWrapper;
 
 public interface Binding {
 

diff --git a/...om/facebook/react/fabric/BindingImpl.java → .../facebook/react/renderer/BindingImpl.java b/...om/facebook/react/fabric/BindingImpl.java → .../facebook/react/renderer/BindingImpl.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
@@ -16,8 +16,8 @@
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.RuntimeScheduler;
 import com.facebook.react.common.mapbuffer.MapBufferSoLoader;
-import com.facebook.react.fabric.events.EventBeatManager;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.renderer.events.EventBeatManager;
+import com.facebook.react.renderer.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
 
 @DoNotStrip

diff --git a/...cebook/react/fabric/ComponentFactory.java → ...book/react/renderer/ComponentFactory.java b/...cebook/react/fabric/ComponentFactory.java → ...book/react/renderer/ComponentFactory.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.jni.HybridData;

diff --git a/.../react/fabric/CoreComponentsRegistry.java → ...eact/renderer/CoreComponentsRegistry.java b/.../react/fabric/CoreComponentsRegistry.java → ...eact/renderer/CoreComponentsRegistry.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;

diff --git a/...ok/react/fabric/CppComponentRegistry.java → .../react/renderer/CppComponentRegistry.java b/...ok/react/fabric/CppComponentRegistry.java → .../react/renderer/CppComponentRegistry.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.jni.HybridData;

diff --git a/...react/fabric/DevToolsReactPerfLogger.java → ...act/renderer/DevToolsReactPerfLogger.java b/...react/fabric/DevToolsReactPerfLogger.java → ...act/renderer/DevToolsReactPerfLogger.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import static com.facebook.react.bridge.ReactMarkerConstants.*;
 

diff --git a/.../react/fabric/EmptyReactNativeConfig.java → ...eact/renderer/EmptyReactNativeConfig.java b/.../react/fabric/EmptyReactNativeConfig.java → ...eact/renderer/EmptyReactNativeConfig.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 /**
  * An empty {@link ReactNativeConfig} that is returning empty responses and false for all the

diff --git a/...cebook/react/fabric/FabricComponents.java → ...book/react/renderer/FabricComponents.java b/...cebook/react/fabric/FabricComponents.java → ...book/react/renderer/FabricComponents.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import java.util.HashMap;

diff --git a/...react/fabric/FabricJSIModuleProvider.java → ...act/renderer/FabricJSIModuleProvider.java b/...react/fabric/FabricJSIModuleProvider.java → ...act/renderer/FabricJSIModuleProvider.java
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.events.EventBeatManager;
+import com.facebook.react.renderer.events.EventBeatManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.systrace.Systrace;
 

diff --git a/...facebook/react/fabric/FabricSoLoader.java → ...cebook/react/renderer/FabricSoLoader.java b/...facebook/react/fabric/FabricSoLoader.java → ...cebook/react/renderer/FabricSoLoader.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 

diff --git a/...acebook/react/fabric/FabricUIManager.java → ...ebook/react/renderer/FabricUIManager.java b/...acebook/react/fabric/FabricUIManager.java → ...ebook/react/renderer/FabricUIManager.java
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import static com.facebook.infer.annotation.ThreadConfined.ANY;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize;
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize;
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaMeasureMode;
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaSize;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMaxSize;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMinSize;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getYogaMeasureMode;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getYogaSize;
 import static com.facebook.react.uimanager.UIManagerHelper.PADDING_BOTTOM_INDEX;
 import static com.facebook.react.uimanager.UIManagerHelper.PADDING_END_INDEX;
 import static com.facebook.react.uimanager.UIManagerHelper.PADDING_START_INDEX;
@@ -55,19 +55,19 @@
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.fabric.events.EventBeatManager;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
-import com.facebook.react.fabric.events.FabricEventEmitter;
-import com.facebook.react.fabric.interop.InteropEventEmitter;
-import com.facebook.react.fabric.mounting.MountItemDispatcher;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.fabric.mounting.SurfaceMountingManager;
-import com.facebook.react.fabric.mounting.SurfaceMountingManager.ViewEvent;
-import com.facebook.react.fabric.mounting.mountitems.BatchMountItem;
-import com.facebook.react.fabric.mounting.mountitems.MountItem;
-import com.facebook.react.fabric.mounting.mountitems.MountItemFactory;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.renderer.events.EventBeatManager;
+import com.facebook.react.renderer.events.EventEmitterWrapper;
+import com.facebook.react.renderer.events.FabricEventEmitter;
+import com.facebook.react.renderer.interop.InteropEventEmitter;
+import com.facebook.react.renderer.mounting.MountItemDispatcher;
+import com.facebook.react.renderer.mounting.MountingManager;
+import com.facebook.react.renderer.mounting.SurfaceMountingManager;
+import com.facebook.react.renderer.mounting.SurfaceMountingManager.ViewEvent;
+import com.facebook.react.renderer.mounting.mountitems.BatchMountItem;
+import com.facebook.react.renderer.mounting.mountitems.MountItem;
+import com.facebook.react.renderer.mounting.mountitems.MountItemFactory;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactRoot;
@@ -505,11 +505,6 @@ private long measure(
   public int getColor(int surfaceId, String[] resourcePaths) {
     ThemedReactContext context =
         mMountingManager.getSurfaceManagerEnforced(surfaceId, "getColor").getContext();
-    // Surface may have been stopped
-    if (context == null) {
-      return 0;
-    }
-
     for (String resourcePath : resourcePaths) {
       Integer color = ColorPropConverter.resolveResourcePath(context, resourcePath);
       if (color != null) {
@@ -603,14 +598,16 @@ private long measureMapBuffer(
    * @return if theme data is available in the output parameters.
    */
   public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) {
-    Context context =
-        mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData").getContext();
-    if (context == null) {
+    SurfaceMountingManager surfaceMountingManager =
+        mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData");
+    ThemedReactContext themedReactContext = surfaceMountingManager.getContext();
+
+    if (themedReactContext == null) {
       FLog.w(TAG, "\"themedReactContext\" is null when call \"getThemeData\"");
       return false;
     }
-
-    float[] defaultTextInputPaddingForTheme = UIManagerHelper.getDefaultTextInputPadding(context);
+    float[] defaultTextInputPaddingForTheme =
+        UIManagerHelper.getDefaultTextInputPadding(themedReactContext);
     defaultTextInputPadding[0] = defaultTextInputPaddingForTheme[PADDING_START_INDEX];
     defaultTextInputPadding[1] = defaultTextInputPaddingForTheme[PADDING_END_INDEX];
     defaultTextInputPadding[2] = defaultTextInputPaddingForTheme[PADDING_TOP_INDEX];
@@ -872,12 +869,12 @@ public void updateRootLayoutSpecs(
       return;
     }
 
-    Context context = surfaceMountingManager.getContext();
+    ThemedReactContext reactContext = surfaceMountingManager.getContext();
     boolean isRTL = false;
     boolean doLeftAndRightSwapInRTL = false;
-    if (context != null) {
-      isRTL = I18nUtil.getInstance().isRTL(context);
-      doLeftAndRightSwapInRTL = I18nUtil.getInstance().doLeftAndRightSwapInRTL(context);
+    if (reactContext != null) {
+      isRTL = I18nUtil.getInstance().isRTL(reactContext);
+      doLeftAndRightSwapInRTL = I18nUtil.getInstance().doLeftAndRightSwapInRTL(reactContext);
     }
 
     mBinding.setConstraints(

diff --git a/...ok/react/fabric/GuardedFrameCallback.java → .../react/renderer/GuardedFrameCallback.java b/...ok/react/fabric/GuardedFrameCallback.java → .../react/renderer/GuardedFrameCallback.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.JSExceptionHandler;

diff --git a/...ebook/react/fabric/ReactNativeConfig.java → ...ook/react/renderer/ReactNativeConfig.java b/...ebook/react/fabric/ReactNativeConfig.java → ...ook/react/renderer/ReactNativeConfig.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import androidx.annotation.NonNull;
 import com.facebook.proguard.annotations.DoNotStrip;

diff --git a/...cebook/react/fabric/StateWrapperImpl.java → ...book/react/renderer/StateWrapperImpl.java b/...cebook/react/fabric/StateWrapperImpl.java → ...book/react/renderer/StateWrapperImpl.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;

diff --git a/...facebook/react/fabric/SurfaceHandler.java → ...cebook/react/renderer/SurfaceHandler.java b/...facebook/react/fabric/SurfaceHandler.java → ...cebook/react/renderer/SurfaceHandler.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
 import com.facebook.react.bridge.NativeMap;
 import javax.annotation.concurrent.ThreadSafe;

diff --git a/...k/react/fabric/SurfaceHandlerBinding.java → ...react/renderer/SurfaceHandlerBinding.java b/...k/react/fabric/SurfaceHandlerBinding.java → ...react/renderer/SurfaceHandlerBinding.java
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric;
+package com.facebook.react.renderer;
 
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize;
-import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMaxSize;
+import static com.facebook.react.renderer.mounting.LayoutMetricsConversions.getMinSize;
 
 import androidx.annotation.IntDef;
 import com.facebook.jni.HybridData;

diff --git a/...react/fabric/events/EventBeatManager.java → ...act/renderer/events/EventBeatManager.java b/...react/fabric/events/EventBeatManager.java → ...act/renderer/events/EventBeatManager.java
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric.events;
+package com.facebook.react.renderer.events;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.fabric.FabricSoLoader;
+import com.facebook.react.renderer.FabricSoLoader;
 import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
 
 /**

diff --git a/...ct/fabric/events/EventEmitterWrapper.java → .../renderer/events/EventEmitterWrapper.java b/...ct/fabric/events/EventEmitterWrapper.java → .../renderer/events/EventEmitterWrapper.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.fabric.events;
+package com.facebook.react.renderer.events;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
@@ -14,7 +14,7 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.fabric.FabricSoLoader;
+import com.facebook.react.renderer.FabricSoLoader;
 import com.facebook.react.uimanager.events.EventCategoryDef;
 
 /**