Merge pull request #200 from microsoftgraph/dev

2.0.2 release

Author: baywet

.github/dependabot.yml

@@ -5,6 +5,11 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

build.gradle

@@ -14,7 +14,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '4.7.0'
+    id 'com.github.spotbugs' version '4.7.1'
 }
 
 java {
@@ -30,7 +30,7 @@ jacocoTestReport {
 }
 
 jacoco {
-    toolVersion = "0.8.7-SNAPSHOT" //https://github.com/gradle/gradle/issues/15038
+    toolVersion = "0.8.7"
 }
 
 spotbugsMain {

devx.yml

@@ -0,0 +1,6 @@
+languages:
+- java
+extensions:
+  services:
+  - Microsoft Graph
+dependencyFile: /gradle/dependencies.gradle

gradle.properties

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 1
+mavenPatchVersion    = 2
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests

gradle/dependencies.gradle

@@ -9,5 +9,5 @@ dependencies {
     implementation 'com.google.guava:guava:30.1.1-jre'
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    api 'com.azure:azure-identity:1.2.5'
+    api 'com.azure:azure-core:1.16.0'
 }

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph-core</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1-jre</version>
+            <version>30.1.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -34,19 +34,19 @@
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.2.0</version>
+            <artifactId>azure-core</artifactId>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.5.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>3.8.0</version>
+            <artifactId>mockito-inline</artifactId>
+            <version>3.9.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

readme.md

@@ -13,14 +13,16 @@ Get started with the Microsoft Graph Core SDK for Java by integrating the [Micro
 
 Add the repository and a compile dependency for `microsoft-graph-core` to your project's `build.gradle`:
 
-```gradle
+```groovy
 repositories {
     mavenCentral()
 }
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.1'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.2'
+    // This dependency is only needed if you are using the TokenCrendentialAuthProvider
+    implementation 'com.azure:azure-identity:1.2.5'
 }
 ```
 
@@ -30,9 +32,14 @@ Add the dependency in `dependencies` in pom.xml
 
 ```xml
 <dependency>
-	<groupId>com.microsoft.graph</groupId>
-	<artifactId>microsoft-graph-core</artifactId>
-	<version>2.0.1</version>
+    <!-- Include the sdk as a dependency -->
+    <groupId>com.microsoft.graph</groupId>
+    <artifactId>microsoft-graph-core</artifactId>
+    <version>2.0.2</version>
+    <!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
+    <groupId>com.azure</groupId>
+    <artifactId>azure-identity</artifactId>
+    <version>1.2.5</version>
 </dependency>
 ```
 

src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java

@@ -81,7 +81,7 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S
      * ?token=thetoken (onedrive)
      * delta(token='thetoken') (formal OData function usage)
      */
-    private static Pattern pattern = Pattern.compile("(?i)(?>\\$?delta)?token=['\"]?([\\w-\\.]+)");
+    private static Pattern pattern = Pattern.compile("(?>[$]?delta)?token=['\"]?([\\w\\-\\.]+)", Pattern.CASE_INSENSITIVE);
     /**
      * Gets the delta token from the delta link provided by the previous response
      * @param deltaLink the delta link provided by the previous request
@@ -91,9 +91,9 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S
     protected String getDeltaTokenFromLink(@Nonnull final String deltaLink) {
         Objects.requireNonNull(deltaLink, "parameter deltaLink cannot be null");
         final Matcher matcher = pattern.matcher(deltaLink);
-        if(matcher.matches()) {
+        if(matcher.find()) {
             return matcher.group(1);
         }
-        return  "";
+        return "";
     }
 }

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

@@ -25,7 +25,7 @@ public class TelemetryHandler implements Interceptor{
     /**
      * Current SDK version
      */
-    public static final String VERSION = "v2.0.1";
+    public static final String VERSION = "v2.0.2";
     /**
      * Verion prefix
      */