Skip to content

Commit 36f4f8b

Browse files
committed
- generic IHttpRequest
1 parent e9d2433 commit 36f4f8b

45 files changed

Lines changed: 197 additions & 275 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222

2323
package com.microsoft.graph.concurrency;
2424

25-
import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
26-
import com.microsoft.graph.concurrency.ChunkedUploadRequest;
27-
import com.microsoft.graph.concurrency.ChunkedUploadResult;
28-
import com.microsoft.graph.concurrency.IUploadSession;
2925
import com.microsoft.graph.core.ClientException;
3026
import com.microsoft.graph.core.IBaseClient;
3127
import com.microsoft.graph.options.Option;
@@ -66,7 +62,7 @@ public class ChunkedUploadProvider<UploadType> {
6662
/**
6763
* The client
6864
*/
69-
private final IBaseClient client;
65+
private final IBaseClient<?> client;
7066

7167
/**
7268
* The input stream
@@ -103,7 +99,7 @@ public class ChunkedUploadProvider<UploadType> {
10399
* @param uploadTypeClass the upload type class
104100
*/
105101
public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
106-
@Nonnull final IBaseClient client,
102+
@Nonnull final IBaseClient<?> client,
107103
@Nonnull final InputStream inputStream,
108104
final long streamSize,
109105
@Nonnull final Class<UploadType> uploadTypeClass) {
@@ -173,7 +169,7 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
173169
}
174170

175171
final ChunkedUploadRequest<UploadType> request =
176-
new ChunkedUploadRequest<UploadType>(this.uploadUrl, this.client, options, buffer, buffRead,
172+
new ChunkedUploadRequest<>(this.uploadUrl, this.client, options, buffer, buffRead,
177173
this.readSoFar, this.streamSize);
178174
final ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
179175
// TODO: upload should return a future, use sendfuture instead and the futures should be chained with completableFuture.then apply

‎src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import javax.annotation.Nullable;
1111
import javax.annotation.Nonnull;
1212

13-
import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
1413
import com.microsoft.graph.core.ClientException;
1514
import com.microsoft.graph.http.BaseRequest;
1615
import com.microsoft.graph.http.HttpMethod;
@@ -56,7 +55,7 @@ public class ChunkedUploadRequest<UploadType> {
5655
*/
5756
@SuppressWarnings("unchecked")
5857
protected ChunkedUploadRequest(@Nonnull final String requestUrl,
59-
@Nonnull final IBaseClient client,
58+
@Nonnull final IBaseClient<?> client,
6059
@Nullable final List<? extends Option> options,
6160
@Nonnull final byte[] chunk,
6261
final int chunkSize,

‎src/main/java/com/microsoft/graph/core/BaseClient.java‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@
4040
import javax.annotation.Nonnull;
4141

4242
import okhttp3.OkHttpClient;
43+
import okhttp3.Request;
4344

4445
/**
4546
* A client that communications with an OData service
47+
* @param <NativeRequestType> type of a request for the native http client
4648
*/
47-
public class BaseClient implements IBaseClient {
49+
public class BaseClient<NativeRequestType> implements IBaseClient<NativeRequestType> {
4850
/**
4951
* Restricted constructor
5052
*/
@@ -86,7 +88,7 @@ public void setServiceRoot(@Nonnull final String value) {
8688
*/
8789
@Nonnull
8890
public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
89-
return new CustomRequestBuilder<T>(getServiceRoot() + url, this, null, responseType);
91+
return new CustomRequestBuilder<>(getServiceRoot() + url, this, null, responseType);
9092
}
9193

9294
/**
@@ -98,7 +100,7 @@ public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Non
98100
*/
99101
@Nonnull
100102
public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url) {
101-
return new CustomRequestBuilder<JsonElement>(getServiceRoot() + url, this, null,
103+
return new CustomRequestBuilder<>(getServiceRoot() + url, this, null,
102104
JsonElement.class);
103105
}
104106

@@ -111,23 +113,36 @@ public BatchRequestBuilder batch() {
111113
return new BatchRequestBuilder(getServiceRoot() + "/$batch", this, null);
112114
}
113115

116+
/**
117+
* Gets the builder to start configuring the client
118+
*
119+
* @return builder to start configuring the client
120+
*/
121+
@Nonnull
122+
public static Builder<OkHttpClient, Request> builder() {
123+
return builder(OkHttpClient.class, Request.class);
124+
}
125+
114126
/**
115127
* Gets the builder to start configuring the client
116128
*
129+
* @param <nativeClient> the type of the native http client
130+
* @param <nativeRequest> the type of the native http request
117131
* @return builder to start configuring the client
118132
*/
119133
@Nonnull
120-
public static Builder<OkHttpClient> builder() {
134+
public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
121135
return new Builder<>();
122136
}
123137

124138
/**
125139
* Builder to help configure the Graph service client
126140
* @param <httpClientType> type of the native http library client
141+
* @param <NativeRequestType> type of a request for the native http client
127142
*/
128-
public static class Builder<httpClientType> {
143+
public static class Builder<httpClientType, NativeRequestType> {
129144
private ISerializer serializer;
130-
private IHttpProvider httpProvider;
145+
private IHttpProvider<NativeRequestType> httpProvider;
131146
private ILogger logger;
132147
private httpClientType httpClient;
133148
private IAuthenticationProvider auth;
@@ -160,10 +175,11 @@ private httpClientType getHttpClient() {
160175
} else {
161176
return httpClient;
162177
}
163-
}
164-
private IHttpProvider getHttpProvider() {
178+
}
179+
@SuppressWarnings("unchecked")
180+
private IHttpProvider<NativeRequestType> getHttpProvider() {
165181
if(httpProvider == null) {
166-
return new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
182+
return (IHttpProvider<NativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
167183
} else {
168184
return httpProvider;
169185
}
@@ -177,7 +193,7 @@ private IHttpProvider getHttpProvider() {
177193
* @return the instance of this builder
178194
*/
179195
@Nonnull
180-
public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
196+
public Builder<httpClientType, NativeRequestType> serializer(@Nonnull final ISerializer serializer) {
181197
checkNotNull(serializer, "serializer");
182198
this.serializer = serializer;
183199
return this;
@@ -191,7 +207,7 @@ public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer)
191207
* @return the instance of this builder
192208
*/
193209
@Nonnull
194-
public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
210+
public Builder<httpClientType, NativeRequestType> httpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
195211
checkNotNull(httpProvider, "httpProvider");
196212
this.httpProvider = httpProvider;
197213
return this;
@@ -205,7 +221,7 @@ public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpPro
205221
* @return the instance of this builder
206222
*/
207223
@Nonnull
208-
public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
224+
public Builder<httpClientType, NativeRequestType> logger(@Nonnull final ILogger logger) {
209225
checkNotNull(logger, "logger");
210226
this.logger = logger;
211227
return this;
@@ -219,7 +235,7 @@ public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
219235
* @return the instance of this builder
220236
*/
221237
@Nonnull
222-
public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
238+
public Builder<httpClientType, NativeRequestType> httpClient(@Nonnull final httpClientType client) {
223239
checkNotNull(client, "client");
224240
this.httpClient = client;
225241
return this;
@@ -232,7 +248,7 @@ public Builder<httpClientType> httpClient(@Nonnull final httpClientType client)
232248
* @return the instance of this builder
233249
*/
234250
@Nonnull
235-
public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
251+
public Builder<httpClientType, NativeRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
236252
checkNotNull(auth, "auth");
237253
this.auth = auth;
238254
return this;
@@ -248,7 +264,7 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthentica
248264
* if there was an exception creating the client
249265
*/
250266
@Nonnull
251-
protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
267+
protected <ClientType extends BaseClient<NativeRequestType>> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
252268
Objects.requireNonNull(instance, "The instance cannot be null");
253269
instance.setHttpProvider(this.getHttpProvider());
254270
instance.setLogger(this.getLogger());
@@ -264,8 +280,8 @@ protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull Client
264280
* if there was an exception creating the client
265281
*/
266282
@Nonnull
267-
public IBaseClient buildClient() throws ClientException {
268-
return buildClient(new BaseClient());
283+
public IBaseClient<NativeRequestType> buildClient() throws ClientException {
284+
return buildClient(new BaseClient<>());
269285
}
270286
}
271287

@@ -284,7 +300,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
284300
/**
285301
* The HTTP provider instance
286302
*/
287-
private IHttpProvider httpProvider;
303+
private IHttpProvider<NativeRequestType> httpProvider;
288304

289305
/**
290306
* The logger
@@ -303,7 +319,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
303319
*/
304320
@Override
305321
@Nullable
306-
public IHttpProvider getHttpProvider() {
322+
public IHttpProvider<NativeRequestType> getHttpProvider() {
307323
return httpProvider;
308324
}
309325

@@ -343,7 +359,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
343359
*
344360
* @param httpProvider The HTTP provider
345361
*/
346-
protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
362+
protected void setHttpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
347363
checkNotNull(httpProvider, "httpProvider");
348364
this.httpProvider = httpProvider;
349365
}

‎src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import javax.annotation.Nullable;
66
import javax.annotation.Nonnull;
77

8-
import com.microsoft.graph.core.IBaseClient;
98
import com.microsoft.graph.http.BaseRequestBuilder;
109
import com.microsoft.graph.http.CustomRequest;
1110
import com.microsoft.graph.options.Option;
@@ -18,34 +17,34 @@
1817
public class CustomRequestBuilder<T> extends BaseRequestBuilder<T> {
1918
/** Type to use for response deserialization */
2019
public final Class<T> responseType;
21-
20+
2221
/**
2322
* Instanciates a new custom request builder
24-
*
23+
*
2524
* @param requestUrl the URL to send the request to
2625
* @param client the client to use for the request
2726
* @param requestOptions options to apply to the request
2827
* @param responseType type to use for response deserialization
2928
*/
30-
public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
29+
public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
3130
super(requestUrl, client, requestOptions);
3231
this.responseType = responseType;
3332
}
34-
33+
3534
/**
3635
* Builds the request to be executed
37-
*
36+
*
3837
* @return the request to be executed
3938
* @param requestOptions the options to apply to the request
4039
*/
4140
@Nonnull
4241
public CustomRequest<T> buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
4342
return buildRequest(getOptions(requestOptions));
4443
}
45-
44+
4645
/**
4746
* Builds the request to be executed
48-
*
47+
*
4948
* @return the request to be executed
5049
* @param requestOptions the options to apply to the request
5150
*/

‎src/main/java/com/microsoft/graph/core/IBaseClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333

3434
/**
3535
* A client that communications with an OData service
36+
* @param <NativeRequestType> type of a request for the native http client
3637
*/
37-
public interface IBaseClient {
38+
public interface IBaseClient<NativeRequestType> {
3839
/**
3940
* Gets the service root
4041
*
@@ -56,7 +57,7 @@ public interface IBaseClient {
5657
* @return the HTTP provider
5758
*/
5859
@Nullable
59-
IHttpProvider getHttpProvider();
60+
IHttpProvider<NativeRequestType> getHttpProvider();
6061

6162
/**
6263
* Gets the logger

‎src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,14 @@
2222

2323
package com.microsoft.graph.http;
2424

25-
import java.net.URL;
2625
import java.lang.NoSuchFieldException;
2726
import java.lang.IllegalAccessException;
28-
import java.util.ArrayList;
2927
import java.util.List;
3028
import javax.annotation.Nullable;
3129
import javax.annotation.Nonnull;
3230

3331
import com.microsoft.graph.core.ClientException;
3432
import com.microsoft.graph.core.IBaseClient;
35-
import com.microsoft.graph.http.ICollectionResponse;
36-
import com.microsoft.graph.http.BaseCollectionPage;
3733
import com.microsoft.graph.options.Option;
3834

3935
/**
@@ -58,7 +54,7 @@ public abstract class BaseActionCollectionRequest<T, T2 extends ICollectionRespo
5854
* @param collectionRequestBuilderClass the class for the collection request builder
5955
*/
6056
public BaseActionCollectionRequest(@Nonnull final String requestUrl,
61-
@Nonnull final IBaseClient client,
57+
@Nonnull final IBaseClient<?> client,
6258
@Nullable final List<? extends Option> options,
6359
@Nonnull final Class<T2> responseCollectionClass,
6460
@Nonnull final Class<T3> collectionPageClass,

‎src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
package com.microsoft.graph.http;
66

77
import com.microsoft.graph.core.IBaseClient;
8-
import com.microsoft.graph.http.BaseRequestBuilder;
98
import com.microsoft.graph.options.Option;
109

11-
import java.util.HashMap;
1210
import java.util.List;
13-
import java.util.Map;
1411

1512
import javax.annotation.Nonnull;
1613
import javax.annotation.Nullable;
@@ -34,7 +31,7 @@ public class BaseActionCollectionRequestBuilder<T, T2 extends BaseRequestBuilder
3431
*/
3532
public BaseActionCollectionRequestBuilder(
3633
@Nonnull final String requestUrl,
37-
@Nonnull final IBaseClient client,
34+
@Nonnull final IBaseClient<?> client,
3835
@Nullable final List<? extends Option> options,
3936
@Nonnull final Class<T2> requestBuilderClass,
4037
@Nonnull final Class<T5> collectionRequestClass

‎src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
package com.microsoft.graph.http;
66

77
import com.microsoft.graph.core.IBaseClient;
8-
import com.microsoft.graph.http.BaseRequestBuilder;
98
import com.microsoft.graph.options.Option;
109

11-
import java.util.HashMap;
1210
import java.util.List;
13-
import java.util.Map;
1411

1512
import javax.annotation.Nullable;
1613
import javax.annotation.Nonnull;
@@ -28,7 +25,7 @@ public class BaseActionRequestBuilder<T> extends BaseRequestBuilder<T> {
2825
*/
2926
public BaseActionRequestBuilder(
3027
@Nonnull final String requestUrl,
31-
@Nonnull final IBaseClient client,
28+
@Nonnull final IBaseClient<?> client,
3229
@Nullable final List<? extends Option> options
3330
) {
3431
super(requestUrl, client, options);

‎src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
package com.microsoft.graph.http;
2424

2525
import com.microsoft.graph.core.IBaseClient;
26-
import com.microsoft.graph.options.Option;
27-
28-
import java.lang.reflect.InvocationTargetException;
29-
import java.util.List;
3026

3127
import javax.annotation.Nonnull;
3228
import javax.annotation.Nullable;
@@ -47,7 +43,7 @@ public class BaseCollectionReferenceRequestBuilder<T, T2 extends BaseRequestBuil
4743
* @param requestBuilderClass the class for the request builder
4844
* @param collectionRequestClass the class for the collection request
4945
*/
50-
public BaseCollectionReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
46+
public BaseCollectionReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
5147
@Nonnull final Class<T2> requestBuilderClass,
5248
@Nonnull final Class<T5> collectionRequestClass) {
5349
super(requestUrl, client, requestOptions, requestBuilderClass, collectionRequestClass);

0 commit comments

Comments
 (0)