Skip to content

Commit e8d2211

Browse files
committed
- removes unecessary validate method for base client
- improves testing coverage for base client
1 parent a6f6ab4 commit e8d2211

3 files changed

Lines changed: 12 additions & 51 deletions

File tree

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ protected <ClientType extends BaseClient> ClientType buildClient(ClientType inst
238238
instance.setHttpProvider(this.getHttpProvider());
239239
instance.setLogger(this.getLogger());
240240
instance.setSerializer(this.getSerializer());
241-
instance.validate();
242241
return instance;
243242
}
244243

@@ -314,26 +313,13 @@ public ISerializer getSerializer() {
314313
return serializer;
315314
}
316315

317-
/**
318-
* Validates this client
319-
*/
320-
@Override
321-
public void validate() {
322-
if (httpProvider == null) {
323-
throw new NullPointerException("HttpProvider");
324-
}
325-
326-
if (serializer == null) {
327-
throw new NullPointerException("Serializer");
328-
}
329-
}
330-
331316
/**
332317
* Sets the logger
333318
*
334319
* @param logger The logger
335320
*/
336321
protected void setLogger(@Nonnull final ILogger logger) {
322+
checkNotNull(logger, "logger");
337323
this.logger = logger;
338324
}
339325

@@ -343,6 +329,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
343329
* @param httpProvider The HTTP provider
344330
*/
345331
protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
332+
checkNotNull(httpProvider, "httpProvider");
346333
this.httpProvider = httpProvider;
347334
}
348335

@@ -352,6 +339,7 @@ protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
352339
* @param serializer The serializer
353340
*/
354341
public void setSerializer(@Nonnull final ISerializer serializer) {
342+
checkNotNull(serializer, "serializer");
355343
this.serializer = serializer;
356344
}
357345

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ public interface IBaseClient {
7373
@Nullable
7474
ISerializer getSerializer();
7575

76-
/**
77-
* Validates this client
78-
*/
79-
void validate();
80-
8176
/**
8277
* Gets a builder to execute a custom request
8378
*

‎src/test/java/com/microsoft/graph/core/BaseClientTests.java‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import okhttp3.OkHttpClient;
1414

1515
import com.microsoft.graph.http.IHttpProvider;
16+
import com.google.gson.JsonObject;
1617
import com.microsoft.graph.http.CoreHttpProvider;
1718
import com.microsoft.graph.logger.ILogger;
1819
import com.microsoft.graph.serializer.ISerializer;
@@ -22,25 +23,14 @@
2223
*/
2324
public class BaseClientTests {
2425
public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
25-
private String mEndpoint = DEFAULT_GRAPH_ENDPOINT;
2626
private BaseClient baseClient;
2727
private IHttpProvider mHttpProvider;
2828
private ILogger mLogger;
2929
private ISerializer mSerializer;
3030

3131
@Before
3232
public void setUp() throws Exception {
33-
baseClient = new BaseClient() {
34-
@Override
35-
public String getServiceRoot() {
36-
return mEndpoint;
37-
}
38-
39-
@Override
40-
public void setServiceRoot(String value) {
41-
mEndpoint = value;
42-
}
43-
};
33+
baseClient = new BaseClient();
4434
mLogger = mock(ILogger.class);
4535
mSerializer = mock(ISerializer.class);
4636
mHttpProvider = new CoreHttpProvider(mSerializer,
@@ -56,24 +46,6 @@ public void testNotNull() {
5646
assertNotNull(mSerializer);
5747
}
5848

59-
@Test
60-
public void testValidateThrowException() {
61-
Boolean success = false;
62-
try {
63-
baseClient.validate();
64-
}catch (NullPointerException nEx){
65-
success = true;
66-
}
67-
assertTrue(success);
68-
}
69-
70-
@Test
71-
public void testValidateSuccess() throws Exception {
72-
baseClient.setHttpProvider(mHttpProvider);
73-
baseClient.setSerializer(mSerializer);
74-
baseClient.validate();
75-
}
76-
7749
@Test
7850
public void testEndPoint() {
7951
assertEquals(DEFAULT_GRAPH_ENDPOINT, baseClient.getServiceRoot());
@@ -101,5 +73,11 @@ public void testSerializer() {
10173
baseClient.setSerializer(mSerializer);
10274
assertEquals(mSerializer, baseClient.getSerializer());
10375
}
104-
76+
@Test
77+
public void testCustomRequest() {
78+
final CustomRequestBuilder<JsonObject> simpleRequest = baseClient.customRequest("");
79+
assertNotNull(simpleRequest);
80+
final CustomRequestBuilder<String> stringRequest = baseClient.customRequest("", String.class);
81+
assertNotNull(stringRequest);
82+
}
10583
}

0 commit comments

Comments
 (0)