Merge pull request #80 from microsoftgraph/dev

release 1.0.5

Author: baywet

build.gradle

@@ -16,6 +16,10 @@ plugins {
     id 'com.jfrog.bintray' version '1.8.5'
 }
 
+java {
+    modularity.inferModulePath = true
+}
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use jcenter for resolving your dependencies.
@@ -48,6 +52,12 @@ def pomConfig = {
 //Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
 //Bintray Snapshot: publishSnapshotPublicationToMaven3Repository
 
+tasks.jar {
+    manifest {
+        attributes('Automatic-Module-Name': project.property('mavenGroupId') + '.core')
+    }
+}
+
 task sourceJar(type: Jar) {
     from sourceSets.main.allJava
     archiveClassifier = 'sources'

gradle.properties

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 1
 mavenMinorVersion    = 0
-mavenPatchVersion    = 4
+mavenPatchVersion    = 5
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 

readme.md

@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.4'
+    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.5'
 }
 ```
 
@@ -32,7 +32,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph-core</artifactId>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 </dependency>
 ```
 

src/main/java/com/microsoft/graph/httpcore/HttpClients.java

@@ -1,7 +1,10 @@
 package com.microsoft.graph.httpcore;
 
+import java.util.Arrays;
+
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import okhttp3.OkHttpClient.Builder;
 
 public class HttpClients {
@@ -16,7 +19,10 @@ private HttpClients() {
      * @return OkHttpClient.Builder() custom builder for developer to add its own interceptors to it
      */
     public static Builder custom() {
-        return new OkHttpClient.Builder().addInterceptor(new TelemetryHandler());
+        return new OkHttpClient.Builder()
+                    .addInterceptor(new TelemetryHandler())
+                    .followRedirects(false)
+                    .protocols(Arrays.asList(Protocol.HTTP_1_1)); //https://stackoverflow.com/questions/62031298/sockettimeout-on-java-11-but-not-on-java-8
     }
 
     /**
@@ -27,11 +33,10 @@ public static Builder custom() {
      * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers 
      */
     public static OkHttpClient createDefault(ICoreAuthenticationProvider auth) {
-    	return new OkHttpClient.Builder().addInterceptor(new AuthenticationHandler(auth))
-    			.followRedirects(false)
+        return custom()
+                .addInterceptor(new AuthenticationHandler(auth))
     			.addInterceptor(new RetryHandler())
     			.addInterceptor(new RedirectHandler())
-    			.addInterceptor(new TelemetryHandler())
     			.build();
     }
 
@@ -42,13 +47,12 @@ public static OkHttpClient createDefault(ICoreAuthenticationProvider auth) {
      * @return OkHttpClient build with interceptors provided 
      */
     public static OkHttpClient createFromInterceptors(Interceptor[] interceptors) {
-    	OkHttpClient.Builder builder = new OkHttpClient.Builder();
+    	OkHttpClient.Builder builder = custom();
     	if(interceptors != null)
     		for(Interceptor interceptor : interceptors) {
     			if(interceptor != null)
     				builder.addInterceptor(interceptor);
     		}
-    	builder.addInterceptor(new TelemetryHandler());
     	return builder.build();
     }
 }

src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java

@@ -11,7 +11,7 @@
 public class TelemetryHandler implements Interceptor{
 
 	public static final String SDK_VERSION = "SdkVersion";
-	public static final String VERSION = "v1.0.4";
+	public static final String VERSION = "v1.0.5";
 	public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
 	public static final String JAVA_VERSION_PREFIX = "java";
 	public static final String CLIENT_REQUEST_ID = "client-request-id";