Merge pull request #449 from microsoftgraph/feature/remove-jersey-server

- removes jersey server to reduce depencies and fix licensing

Author: baywet

build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
     implementation 'com.google.code.gson:gson:2.8.6'
 
-    implementation 'com.sun.jersey:jersey-server:1.19.4'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
 
     // Core Http library 
     implementation 'com.microsoft.graph:microsoft-graph-core:1.0.2'

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

@@ -22,8 +22,8 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URI;
-import javax.ws.rs.core.UriBuilder;
+import okhttp3.HttpUrl;
+import okhttp3.HttpUrl.Builder;
 
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.IBaseClient;
@@ -172,11 +172,10 @@ public BaseRequest(final String requestUrl,
     @Override
     public URL getRequestUrl() {
         String requestUrl = addFunctionParameters();
-        URI baseUrl = URI.create(requestUrl);
-        final UriBuilder uriBuilder = UriBuilder.fromUri(baseUrl);
+        final Builder uriBuilder = HttpUrl.parse(requestUrl).newBuilder();
 
         for (final QueryOption option : queryOptions) {
-        	uriBuilder.queryParam(option.getName(), option.getValue().toString());
+        	uriBuilder.addQueryParameter(option.getName(), option.getValue().toString());
         }
 
         try {

src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java

@@ -24,7 +24,7 @@ public class BaseCollectionPageTests {
     private IRequestBuilder mRequestBuilder;
     private static ArrayList<String> list;
     private BaseCollectionPage<String, IRequestBuilder> baseCollectionPage;
-    private String requestUrl = "https://a.b.c";
+    private String requestUrl = "https://a.b.c/";
 
     @Before
     public void setUp() throws Exception {

src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java

@@ -59,7 +59,7 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        request = new BaseCollectionRequest<JsonObject,String>("https://a.b.c", mBaseClient, null, JsonObject.class,null){};
+        request = new BaseCollectionRequest<JsonObject,String>("https://a.b.c/", mBaseClient, null, JsonObject.class,null){};
     }
 
     @Test
@@ -80,21 +80,21 @@ public void testPost() {
     public void testFunctionParameters() {
         final Option f1 = new FunctionOption("1", "one");
         final Option f2 = new FunctionOption("2", null);
-        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2), null,null){};
-        assertEquals("https://a.b.c(1='one',2=null)", request.getRequestUrl().toString());
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c/", null, Arrays.asList(f1, f2), null,null){};
+        assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
-        assertEquals("https://a.b.c(1='one',2=null,3='two')", request.getRequestUrl().toString());
+        assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
         assertEquals(4, request.getOptions().size());
     }
 
     @Test
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(q1, q2), null,null){};
-        assertEquals("https://a.b.c?q1=option1+&q2=option2", request.getRequestUrl().toString());
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c/", null, Arrays.asList(q1, q2), null,null){};
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
-        assertEquals("https://a.b.c?q1=option1+&q2=option2&q3=option3", request.getRequestUrl().toString());
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
         assertEquals(4,request.getOptions().size());
     }
 
@@ -104,8 +104,8 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2, q1, q2), null,null){};
-        assertEquals("https://a.b.c(f1='fun1',f2=null)?q1=option1+&q2=option2", request.getRequestUrl().toString());
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c/", null, Arrays.asList(f1, f2, q1, q2), null,null){};
+        assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         assertEquals(5, request.getOptions().size());
     }
 
@@ -122,7 +122,7 @@ public void testHttpMethod() {
     public void testHeader() {
         String expectedHeader = "header key";
         String expectedValue = "header value";
-        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, null, null,null){};
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c/", null, null, null,null){};
         assertEquals(1, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
         assertEquals(2,request.getHeaders().size());

src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java

@@ -11,7 +11,7 @@
  */
 public class BaseRequestBuilderTests {
 
-    private String expectedRequestUrl = "https://a.b.c";
+    private String expectedRequestUrl = "https://a.b.c/";
     private BaseRequestBuilder baseRequestBuilder;
 
     @Before

src/test/java/com/microsoft/graph/http/BaseRequestTests.java

@@ -64,7 +64,7 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        request = new BaseRequest("https://a.b.c", mBaseClient, null,null){};
+        request = new BaseRequest("https://a.b.c/", mBaseClient, null,null){};
     }
 
     @Test
@@ -102,21 +102,21 @@ public void failure(ClientException ex) {
     public void testFunctionParameters() {
         final Option fo1 = new FunctionOption("1", "one");
         final Option fo2 = new FunctionOption("2", null);
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, Arrays.asList(fo1, fo2), null){};
-        assertEquals("https://a.b.c(1='one',2=null)", request.getRequestUrl().toString());
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, Arrays.asList(fo1, fo2), null){};
+        assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
-        assertEquals("https://a.b.c(1='one',2=null,3='two')", request.getRequestUrl().toString());
+        assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
         assertEquals(4, request.getOptions().size());
     }
 
     @Test
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, Arrays.asList(q1, q2), null){};
-        assertEquals("https://a.b.c?q1=option1+&q2=option2", request.getRequestUrl().toString());
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, Arrays.asList(q1, q2), null){};
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
-        assertEquals("https://a.b.c?q1=option1+&q2=option2&q3=option3", request.getRequestUrl().toString());
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
         assertEquals(4,request.getOptions().size());
     }
 
@@ -126,14 +126,14 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, Arrays.asList(f1, f2, q1, q2), null){};
-        assertEquals("https://a.b.c(f1='fun1',f2=null)?q1=option1+&q2=option2", request.getRequestUrl().toString());
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, Arrays.asList(f1, f2, q1, q2), null){};
+        assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         assertEquals(5, request.getOptions().size());
     }
 
     @Test
     public void testHttpMethod() {
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, null, null){};
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, null, null){};
         assertNull(request.getHttpMethod());
         request.setHttpMethod(HttpMethod.GET);
         assertEquals(HttpMethod.GET, request.getHttpMethod());
@@ -143,7 +143,7 @@ public void testHttpMethod() {
     public void testHeader() {
         String expectedHeader = "header key";
         String expectedValue = "header value";
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, null, null){};
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, null, null){};
         assertEquals(1, request.getHeaders().size());
         assertEquals("SdkVersion", request.getHeaders().get(0).getName());
         //assertEquals(String.format("graph-android-v%s", BuildConfig.VERSION_NAME), request.getHeaders().get(0).getValue());
@@ -157,7 +157,7 @@ public void testProtectedProperties() {
         assertEquals(0, request.queryOptions.size());
         final Option q1 = new QueryOption("q1","option1 ");
         final Option f1 = new FunctionOption("f1","option2");
-        final BaseRequest request = new BaseRequest("https://a.b.c", null, Arrays.asList(q1,f1), null){};
+        final BaseRequest request = new BaseRequest("https://a.b.c/", null, Arrays.asList(q1,f1), null){};
         assertEquals(1, request.functionOptions.size());
         assertEquals(1, request.queryOptions.size());
         assertEquals("q1", request.queryOptions.get(0).getName());

src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java

@@ -61,7 +61,7 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        final BaseStreamRequest<String> request = new BaseStreamRequest<String>("https://a.b.c", mBaseClient,null, null){};
+        final BaseStreamRequest<String> request = new BaseStreamRequest<String>("https://a.b.c/", mBaseClient,null, null){};
         request.send();
         assertEquals(1, mAuthenticationProvider.getInterceptionCount());
     }
@@ -105,7 +105,7 @@ public void failure(ClientException ex) {
                 failure.set(true);
             }
         };
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         request.send(callback);
         assertTrue(success.get());
         assertFalse(failure.get());
@@ -151,7 +151,7 @@ public void failure(ClientException ex) {
                 failure.set(true);
             }
         };
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         request.send(new byte[]{1, 2, 3, 4},callback);
         assertTrue(success.get());
         assertFalse(failure.get());
@@ -184,15 +184,15 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         request.send(new byte[]{1, 2, 3, 4});
         assertEquals(1, mAuthenticationProvider.getInterceptionCount());
     }
 
     @Test
     public void testBaseMethod() {
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
-        assertEquals("https://a.b.c", request.getRequestUrl().toString());
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        assertEquals("https://a.b.c/", request.getRequestUrl().toString());
         request.addHeader("header key", "header value");
         assertEquals(2,request.getHeaders().size());
         assertNull(request.getHttpMethod());