Java7fix (#496)

* Fixes java7 complaints

* remove unused imports

* set source/target compatibility options regardless of the JAVA_JRE_7 variable

Author: grlima

gradle/common-java.gradle

@@ -27,6 +27,12 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat;
 
 apply plugin: 'java'
 
+tasks.withType(JavaCompile) {
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+}
+
+// setting this variable is highly recommended
 def java7JreDir = System.env.'JAVA_JRE_7'
 if (java7JreDir) {
     def requiredJavaBootArchives = ["rt.jar", "jsse.jar"]
@@ -40,8 +46,6 @@ if (java7JreDir) {
         bootClasspath += "$archivePath;"
     }
     tasks.withType(JavaCompile) {
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
         options.bootClasspath = bootClasspath
     }
 } else {

web/src/main/java/com/microsoft/applicationinsights/web/extensibility/initializers/WebOperationIdTelemetryInitializer.java

@@ -70,7 +70,9 @@ protected void onInitializeTelemetry(Telemetry telemetry) {
         // add correlation context to properties
         Map<String, String> correlationContextMap = telemetryContext.getCorrelationContext().getMappings();
         for (String key : correlationContextMap.keySet()) {
-            telemetry.getProperties().putIfAbsent(key, correlationContextMap.get(key));
+            if (telemetry.getProperties().get(key) == null) {
+                telemetry.getProperties().put(key, correlationContextMap.get(key));
+            }
         }
     }
 }

web/src/test/java/com/microsoft/applicationinsights/web/internal/correlation/mocks/MockHttpAsyncClientWrapper.java

@@ -22,8 +22,8 @@
 package com.microsoft.applicationinsights.web.internal.correlation.mocks;
 
 import org.apache.http.nio.client.HttpAsyncClient;
-import org.apache.http.ProtocolVersion;
 import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.concurrent.FutureCallback;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.mock;
@@ -45,7 +45,7 @@ public MockHttpAsyncClientWrapper() {
 
         this.mockClient = mock(HttpAsyncClient.class);
 
-        when(mockClient.execute(any(HttpUriRequest.class), any())).thenReturn(this.task);
+        when(mockClient.execute(any(HttpUriRequest.class), any(FutureCallback.class))).thenReturn(this.task);
     }
 
     public void setAppId(String appId) {

web/src/test/java/com/microsoft/applicationinsights/web/utils/ServletUtils.java

@@ -82,7 +82,7 @@ public static HttpServletRequest createServletRequestWithHeaders(Map<String, Str
         return createServletRequestWithHeaders(headers, 0);
     }
 
-    public static HttpServletRequest createServletRequestWithHeaders(Map<String, String> headers, int correlationContextHeaderCount) {
+    public static HttpServletRequest createServletRequestWithHeaders(Map<String, String> headers, final int correlationContextHeaderCount) {
         HttpServletRequest request = mock(HttpServletRequest.class);
 
         for (String headerName : headers.keySet()) {