Merge pull request #98 from microsoftgraph/feature/v1-sync

feature/v1 sync

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:

README.md

@@ -20,6 +20,8 @@ repositories {
 dependencies {
     // Include the sdk as a dependency
     implementation 'com.microsoft.graph:microsoft-graph-beta:0.14.0-SNAPSHOT'
+    // Uncomment the line below if you are building an android application
+    //implementation 'com.google.guava:guava:30.1.1-android'
 }
 ```
 

devx.yml

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

src/test/java/com/microsoft/graph/functional/OneDriveTests.java

@@ -1,12 +1,14 @@
 package com.microsoft.graph.functional;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -24,13 +26,13 @@
 import com.microsoft.graph.models.UploadSession;
 import com.microsoft.graph.models.DriveItemCreateUploadSessionParameterSet;
 
-@Disabled
 public class OneDriveTests {
 	private TestBase testBase;
 
-	@BeforeEach
 	public void setUp() {
-	   testBase = new TestBase();
+        if(testBase == null) {
+	        testBase = new TestBase();
+        }
 	}
 
 	final IProgressCallback callback = new IProgressCallback () {
@@ -39,6 +41,17 @@ public void progress(final long current, final long max) {
 			//Check progress
 		}
 	};
+    /**
+     * Tests that paths are properly encoded acording to ODSP's expectations
+     * - everything is encoded to the application/x-www-form-urlencoded MIME format
+     * - spaces are encoded with %20
+     */
+    @Test
+    public void itemWithPathEncodesSpecialCharacters() {
+        final URL requestURL = new TestBase(false).graphClient.me().drive().root().itemWithPath("some folder/some name with a + and a #777.docx").buildRequest().getRequestUrl();
+        assertEquals("/me/drive/root:/some%20folder%2Fsome%20name%20with%20a%20%2B%20and%20a%20%23777.docx:", requestURL.getPath().replace("/v1.0", "").replace("/beta", ""));
+        // version replacement so the test is version agnostic
+    }
 	/**
 	 * Test large file upload.
 	 * https://github.com/OneDrive/onedrive-sdk-csharp/blob/master/docs/chunked-uploads.md
@@ -47,8 +60,10 @@ public void progress(final long current, final long max) {
 	 * @throws InterruptedException if the chunked upload fails
 	 */
 	@Test
+    @Disabled
 	public void testLargeFileUpload() throws IOException, InterruptedException {
-		//Get resource file from file system
+		setUp();
+        //Get resource file from file system
 		InputStream uploadFile = OneDriveTests.class.getClassLoader().getResourceAsStream("largefile10M.blob");
 		long fileSize = (long) uploadFile.available();
 
@@ -72,14 +87,18 @@ public void testLargeFileUpload() throws IOException, InterruptedException {
         assertNotNull(result);
 	}
 	@Test
+    @Disabled
 	public void testDownloadWithCustomRequest() throws IOException {
+        setUp();
 		final String testDownloadFileId = "01RWFXFJG3UYRHE75RZVFYWKNUEBB53H7A";
 		try (final InputStream stream = testBase.graphClient.customRequest("/me/drive/items/"+testDownloadFileId+"/content", InputStream.class).buildRequest().get()) {
 		   assertFalse(stream.read() == -1, "stream should not be empty");
 		}
 	}
 	@Test
+    @Disabled
 	public void downloadJsonFileFromOneDrive() throws Exception {
+        setUp();
 		final DriveItemUploadableProperties item = new DriveItemUploadableProperties();
 		item.name = "test.json";
 		item.additionalDataManager().put("@microsoft.graph.conflictBehavior", new JsonPrimitive("replace"));

src/test/java/com/microsoft/graph/functional/TestBase.java

@@ -13,7 +13,7 @@
 import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.httpcore.HttpClients;
-import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.authentication.BaseAuthenticationProvider;
 import com.microsoft.graph.requests.GraphServiceClient;
 
 import okhttp3.OkHttpClient;
@@ -58,20 +58,24 @@ private void GetClient(boolean authenticate)
             }
         }
     }
-    public IAuthenticationProvider getUnauthenticationProvider() {
-        return new IAuthenticationProvider() {
+    public BaseAuthenticationProvider getUnauthenticationProvider() {
+        return new BaseAuthenticationProvider() {
             @Override
             public CompletableFuture<String> getAuthorizationTokenAsync(final URL requestUrl) {
                 return CompletableFuture.completedFuture((String)null);
             }
         };
     }
-    public IAuthenticationProvider getAuthenticationProvider() {
+    public BaseAuthenticationProvider getAuthenticationProvider() {
         final String accessToken = GetAccessToken().replace("\"", "");
-        return new IAuthenticationProvider() {
+        return new BaseAuthenticationProvider() {
             @Override
             public CompletableFuture<String> getAuthorizationTokenAsync(final URL requestUrl) {
-                return CompletableFuture.completedFuture(accessToken);
+                if(this.shouldAuthenticateRequestWithUrl(requestUrl)) {
+                    return CompletableFuture.completedFuture(accessToken);
+                } else {
+                    return CompletableFuture.completedFuture(null);
+                }
             }
         };
     }