From 4a3d1c689f6586380d1a77c99103ea9ad76dec13 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Mon, 22 Oct 2018 11:37:09 -0700
Subject: [PATCH] Remove functional interfaces (#3165)

---
 .../signalr/src/main/java/com/microsoft/signalr/Action.java    | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action1.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action2.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action3.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action4.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action5.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action6.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action7.java   | 3 ++-
 .../signalr/src/main/java/com/microsoft/signalr/Action8.java   | 3 ++-
 .../src/main/java/com/microsoft/signalr/ActionBase.java        | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
index 86d329e2ac..d1d8172916 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
@@ -6,7 +6,8 @@ package com.microsoft.signalr;
 /**
  * A callback that takes no parameters.
  */
-@FunctionalInterface
 public interface Action {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke();
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
index fae504356f..3943b7026c 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
@@ -8,7 +8,8 @@ package com.microsoft.signalr;
  *
  * @param <T1> The type of the first parameter to the callback.
  */
-@FunctionalInterface
 public interface Action1<T1> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
index 7c5d51c0e8..bd0a366118 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
@@ -9,7 +9,8 @@ package com.microsoft.signalr;
  * @param <T1> The type of the first parameter to the callback.
  * @param <T2> The type of the second parameter to the callback.
  */
-@FunctionalInterface
 public interface Action2<T1, T2> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
index b7d65872a9..c1d0fb39ca 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
@@ -10,7 +10,8 @@ package com.microsoft.signalr;
  * @param <T2> The type of the second parameter to the callback.
  * @param <T3> The type of the third parameter to the callback.
  */
-@FunctionalInterface
 public interface Action3<T1, T2, T3> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
index 69d82365b3..48430b05fc 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
@@ -11,7 +11,8 @@ package com.microsoft.signalr;
  * @param <T3> The type of the third parameter to the callback.
  * @param <T4> The type of the fourth parameter to the callback.
  */
-@FunctionalInterface
 public interface Action4<T1, T2, T3, T4> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
index 266297e452..6520733a89 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
@@ -12,7 +12,8 @@ package com.microsoft.signalr;
  * @param <T4> The type of the fourth parameter to the callback.
  * @param <T5> The type of the fifth parameter to the callback.
  */
-@FunctionalInterface
 public interface Action5<T1, T2, T3, T4, T5> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
index 9aaded586d..fc1b166b4a 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
@@ -13,7 +13,8 @@ package com.microsoft.signalr;
  * @param <T5> The type of the fifth parameter to the callback.
  * @param <T6> The type of the sixth parameter to the callback.
  */
-@FunctionalInterface
 public interface Action6<T1, T2, T3, T4, T5, T6> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
index 1fd8c9bbff..3aa510baf3 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
@@ -14,7 +14,8 @@ package com.microsoft.signalr;
  * @param <T6> The type of the sixth parameter to the callback.
  * @param <T7> The type of the seventh parameter to the callback.
  */
-@FunctionalInterface
 public interface Action7<T1, T2, T3, T4, T5, T6, T7> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
index d4abd3f8c7..351656d3d9 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
@@ -15,7 +15,8 @@ package com.microsoft.signalr;
  * @param <T7> The type of the seventh parameter to the callback.
  * @param <T8> The type of the eighth parameter to the callback.
  */
-@FunctionalInterface
 public interface Action8<T1, T2, T3, T4, T5, T6, T7, T8> {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8);
 }
diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java
index 4ed72e8ce6..63631da4f7 100644
--- a/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java
+++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java
@@ -3,7 +3,8 @@
 
 package com.microsoft.signalr;
 
-@FunctionalInterface
 interface ActionBase {
+    // We can't use the @FunctionalInterface annotation because it's only
+    // available on Android API Level 24 and above.
     void invoke(Object ... params);
 }