From ff22722e47e34570ddd1bb51fb913f6d7fdc307b Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Thu, 13 Feb 2020 05:48:25 -0800 Subject: [PATCH] Daily `arc lint --take GOOGLEJAVAFORMAT` Summary: Changelog: [Internal] Differential Revision: D19875191 fbshipit-source-id: 3a1e22a4342d523f556c847a9fa780a898a96771 --- .../facebook/react/bridge/ArgumentsTest.java | 17 +++++++---------- .../react/ReactInstanceManagerBuilder.java | 4 ++-- .../com/facebook/react/bridge/Arguments.java | 1 - .../views/scroll/ReactScrollViewManager.java | 3 +-- .../react/views/text/CustomStyleSpan.java | 4 ++-- .../react/views/text/TextAttributeProps.java | 4 +--- 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/bridge/ArgumentsTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/bridge/ArgumentsTest.java index f96c16b0c99..7e26d3506fe 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/bridge/ArgumentsTest.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/bridge/ArgumentsTest.java @@ -7,26 +7,23 @@ package com.facebook.react.bridge; +import static com.facebook.react.bridge.Arguments.fromBundle; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; - import androidx.annotation.NonNull; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; - import com.facebook.soloader.SoLoader; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static com.facebook.react.bridge.Arguments.fromBundle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - @RunWith(AndroidJUnit4.class) public class ArgumentsTest { @@ -42,9 +39,9 @@ public class ArgumentsTest { } /** - * When passing a bundle via {@link Intent} extras, it gets parceled and unparceled. - * Any array of bundles will return as an array of {@link Parcelable} instead. This test - * verifies that {@link Arguments#fromArray} handles this situation correctly. + * When passing a bundle via {@link Intent} extras, it gets parceled and unparceled. Any array of + * bundles will return as an array of {@link Parcelable} instead. This test verifies that {@link + * Arguments#fromArray} handles this situation correctly. */ @Test public void testFromMarshaledBundle() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java index adbfffd6201..77b2e0f8cd4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java @@ -13,7 +13,6 @@ import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriend import android.app.Activity; import android.app.Application; import android.content.Context; - import androidx.annotation.Nullable; import com.facebook.hermes.reactexecutor.HermesExecutorFactory; import com.facebook.infer.annotation.Assertions; @@ -290,7 +289,8 @@ public class ReactInstanceManagerBuilder { mCustomPackagerCommandHandlers); } - private JavaScriptExecutorFactory getDefaultJSExecutorFactory(String appName, String deviceName, Context applicationContext) { + private JavaScriptExecutorFactory getDefaultJSExecutorFactory( + String appName, String deviceName, Context applicationContext) { try { // If JSC is included, use it as normal initializeSoLoaderIfNecessary(applicationContext); diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java index 21e816d1e96..6302abe043e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java @@ -9,7 +9,6 @@ package com.facebook.react.bridge; import android.os.Bundle; import android.os.Parcelable; - import androidx.annotation.Nullable; import java.lang.reflect.Array; import java.util.AbstractList; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java index 0f435ad4aa6..d7fc393f4e4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java @@ -86,8 +86,7 @@ public class ReactScrollViewManager extends ViewGroupManager } @ReactProp(name = "disableIntervalMomentum") - public void setDisableIntervalMomentum( - ReactScrollView view, boolean disbaleIntervalMomentum) { + public void setDisableIntervalMomentum(ReactScrollView view, boolean disbaleIntervalMomentum) { view.setDisableIntervalMomentum(disbaleIntervalMomentum); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java index eeaa0630c2b..1becdbacaf6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java @@ -81,8 +81,8 @@ public class CustomStyleSpan extends MetricAffectingSpan implements ReactSpan { @Nullable String fontFeatureSettings, @Nullable String family, AssetManager assetManager) { - Typeface typeface = ReactTypefaceUtils.applyStyles( - paint.getTypeface(), style, weight, family, assetManager); + Typeface typeface = + ReactTypefaceUtils.applyStyles(paint.getTypeface(), style, weight, family, assetManager); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { paint.setFontFeatureSettings(fontFeatureSettings); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java index ca26c4f7a6d..9a829a75766 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java @@ -93,9 +93,7 @@ public class TextAttributeProps { */ protected @Nullable String mFontFamily = null; - /** - * @see android.graphics.Paint#setFontFeatureSettings - */ + /** @see android.graphics.Paint#setFontFeatureSettings */ protected @Nullable String mFontFeatureSettings = null; protected boolean mContainsImages = false;