From a45ffce11872c0052437dfe6c2cd43b73165db03 Mon Sep 17 00:00:00 2001
From: Slawomir Dabek <slawomir@dabek.name>
Date: Sun, 20 Nov 2016 22:19:53 +0100
Subject: [PATCH] Restore Java 7 compatibility for adapters.

---
 authz/client/pom.xml                                   | 10 +++++++++-
 .../keycloak/authorization/client/util/HttpMethod.java |  4 ++--
 .../authorization/client/util/HttpMethodResponse.java  |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/authz/client/pom.xml b/authz/client/pom.xml
index bf3f6b87d05..a07c7b1ee64 100644
--- a/authz/client/pom.xml
+++ b/authz/client/pom.xml
@@ -63,6 +63,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+		    <source>${maven.compiler.source}</source>
+		    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
             <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -98,4 +106,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java
index be839877505..d132620bac8 100644
--- a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java
+++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java
@@ -48,7 +48,7 @@ public class HttpMethod<R> {
     private HttpMethodResponse<R> response;
 
     public HttpMethod(Configuration configuration, RequestBuilder builder) {
-        this(configuration, builder, new HashMap<>(), new HashMap<>());
+        this(configuration, builder, new HashMap<String, String>(), new HashMap<String, String>());
     }
 
     public HttpMethod(Configuration configuration, RequestBuilder builder, HashMap<String, String> params, HashMap<String, String> headers) {
@@ -155,4 +155,4 @@ public class HttpMethod<R> {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java
index 4155240f7a2..fceca19d616 100644
--- a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java
+++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java
@@ -41,7 +41,7 @@ public class HttpMethodResponse<R> {
         });
     }
 
-    public HttpMethodResponse<R> json(Class<R> responseType) {
+    public HttpMethodResponse<R> json(final Class<R> responseType) {
         return new HttpMethodResponse<R>(this.method) {
             @Override
             public R execute() {