Make lambda parameter last

Change-Id: Ie4627aab27ebaf0f8e03100635e980c0a08e7d01

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/data/client/CountryListLoadTask.java

@@ -50,9 +50,9 @@ public interface Listener {
     Set<String> whitelistedCountryIsos;
     Set<String> blacklistedCountryIsos;
 
-    public CountryListLoadTask(Listener listener,
-                               @Nullable List<String> whitelistedCountries,
-                               @Nullable List<String> blacklistedCountries) {
+    public CountryListLoadTask(@Nullable List<String> whitelistedCountries,
+                               @Nullable List<String> blacklistedCountries,
+                               Listener listener) {
         mListener = listener;
 
         if (whitelistedCountries != null) {

auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java

@@ -148,9 +148,8 @@ public void onClick(View view) {
     }
 
     private void loadCountryList() {
-        new CountryListLoadTask(this,
-                whitelistedCountries,
-                blacklistedCountries).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        new CountryListLoadTask(whitelistedCountries, blacklistedCountries, this
+        ).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     private void executeUserClickListener(View view) {

auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryListLoadTaskTests.java

@@ -301,7 +301,7 @@ public void setUp() {
 
     @Test
     public void testExecute_withoutUserInput_expectAllCountriesAdded() {
-        mTask = new CountryListLoadTask(mListener, null, null);
+        mTask = new CountryListLoadTask(null, null, mListener);
 
         mTask.execute();
 
@@ -325,7 +325,7 @@ public void testExecute_withUserWhitelistInput_expectUserCountriesAddedOnly() {
         List<CountryInfo> expectedOutput = new ArrayList<>();
         expectedOutput.add(new CountryInfo(new Locale("", "US"), 1));
 
-        mTask = new CountryListLoadTask(mListener, whitelistedCountryIsos, null);
+        mTask = new CountryListLoadTask(whitelistedCountryIsos, null, mListener);
 
         mTask.execute();
 
@@ -348,7 +348,7 @@ public void testExecute_withUserBlacklistInput_expectUserCountriesRemoved() {
         List<CountryInfo> expectedOutput = new ArrayList<>(COUNTRY_LIST);
         expectedOutput.remove(new CountryInfo(new Locale("", "US"), 1));
 
-        mTask = new CountryListLoadTask(mListener, null, blacklistedCountryIsos);
+        mTask = new CountryListLoadTask(null, blacklistedCountryIsos, mListener);
 
         mTask.execute();
 
@@ -373,7 +373,7 @@ public void testExecute_withCodeWhitelistInput_expectUserCodeCountriesAddedOnly(
             expectedOutput.add(new CountryInfo(new Locale("", iso), 1));
         }
 
-        mTask = new CountryListLoadTask(mListener, whitelistedCountries, null);
+        mTask = new CountryListLoadTask(whitelistedCountries, null, mListener);
 
         mTask.execute();
 
@@ -401,7 +401,7 @@ public void testExecute_withCodeBlacklistInput_expectUserCodeCountriesRemoved()
         List<CountryInfo> expectedOutput = new ArrayList<>(COUNTRY_LIST);
         expectedOutput.removeAll(excludedCountries);
 
-        mTask = new CountryListLoadTask(mListener, null, blacklistedCountries);
+        mTask = new CountryListLoadTask(null, blacklistedCountries, mListener);
 
         mTask.execute();
 
@@ -429,7 +429,7 @@ public void testOnPostExecute_nullListener() {
 
     @Test
     public void testOnPostExecute() {
-        mTask = new CountryListLoadTask(mListener, null, null);
+        mTask = new CountryListLoadTask(null, null, mListener);
         mTask.onPostExecute(COUNTRY_LIST);
         verify(mListener).onLoadComplete(COUNTRY_LIST);
     }

library/quality/lint-baseline.xml

@@ -8,22 +8,4 @@
         <location file="src/main/AndroidManifest.xml" />
     </issue>
 
-    <issue
-        id="LambdaLast"
-        severity="Error"
-        message="Functional interface parameters (such as parameter 1, &quot;listener&quot;, in com.firebase.ui.auth.data.client.CountryListLoadTask.CountryListLoadTask) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-        category="Interoperability:Kotlin Interoperability"
-        priority="6"
-        summary="Lambda Parameters Last"
-        explanation="To improve calling this code from Kotlin,&#xA;parameter types eligible for SAM conversion should be last."
-        url="https://android.github.io/kotlin-guides/interop.html#lambda-parameters-last"
-        urls="https://android.github.io/kotlin-guides/interop.html#lambda-parameters-last"
-        errorLine1="                               @Nullable List&lt;String> blacklistedCountries) {"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="/usr/local/google/home/samstern/Projects/firebase/firebaseui-android/auth/src/main/java/com/firebase/ui/auth/data/client/CountryListLoadTask.java"
-            line="55"
-            column="32"/>
-    </issue>
-
 </issues>