From a9a4f171be6c7d33ce43d04a9bc2dd20f3fd82a5 Mon Sep 17 00:00:00 2001
From: Ted Petersson <ted.petersson@ericsson.com>
Date: Thu, 6 Jun 2019 11:12:52 -0500
Subject: [PATCH] Fix JDK7 compatibility broken in cassandra-2.2

Patch by Ted Petersson; Reviewed by Michael Shuler for CASSANDRA-15050
---
 CHANGES.txt                                           | 1 +
 build.xml                                             | 4 ++--
 src/java/org/apache/cassandra/utils/MBeanWrapper.java | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1cc415312d..48bf14f5d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.15
+ * Fix JDK7 compatibility broken in cassandra-2.2 (CASSANDRA-15050)
  * Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078)
  * Fix index summary redistribution cancellation (CASSANDRA-15045)
  * Refactor Circle CI configuration (CASSANDRA-14806)
diff --git a/build.xml b/build.xml
index ca06b41e17..d522b595a4 100644
--- a/build.xml
+++ b/build.xml
@@ -71,9 +71,9 @@
     <property name="dist.dir" value="${build.dir}/dist"/>
     <property name="tmp.dir" value="${java.io.tmpdir}"/>
 	
-    <property name="source.version" value="1.7"/>
+    <property name="source.version" value="1.8"/>
     <property name="source.test.version" value="1.8"/>
-    <property name="target.version" value="1.7"/>
+    <property name="target.version" value="1.8"/>
     <property name="target.test.version" value="1.8"/>
 	
     <condition property="version" value="${base.version}">
diff --git a/src/java/org/apache/cassandra/utils/MBeanWrapper.java b/src/java/org/apache/cassandra/utils/MBeanWrapper.java
index 3b5c7cb70c..1ee787d8d8 100644
--- a/src/java/org/apache/cassandra/utils/MBeanWrapper.java
+++ b/src/java/org/apache/cassandra/utils/MBeanWrapper.java
@@ -19,7 +19,6 @@
 package org.apache.cassandra.utils;
 
 import java.lang.management.ManagementFactory;
-import java.util.function.Consumer;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -206,4 +205,10 @@ public interface MBeanWrapper
             this.handler = handler;
         }
     }
+
+    // Locally defined Consumer interface, to be compatible with Java 7. Only needed for cassandra-2.2
+    interface Consumer<T>
+    {
+        void accept(T e);
+    }
 }