Skip to content

Commit a6f6ab4

Browse files
committed
- replaces version constant by provider from the client
1 parent dec98ba commit a6f6ab4

7 files changed

Lines changed: 42 additions & 27 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,14 @@ protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
354354
public void setSerializer(@Nonnull final ISerializer serializer) {
355355
this.serializer = serializer;
356356
}
357+
358+
/**
359+
* Gets the service SDK version if the service SDK is in use, null otherwise
360+
* @return the service SDK version if the service SDK is in use, null otherwise
361+
*/
362+
@Override
363+
@Nullable
364+
public String getServiceSDKVersion() {
365+
return null;
366+
}
357367
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,5 @@ private Constants() {
2424
* The binary content type header's value
2525
*/
2626
public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
27-
28-
/** The SDK version */
29-
public static final String VERSION_NAME = "2.5.0";
3027
}
3128

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,11 @@ public interface IBaseClient {
9797
*/
9898
@Nonnull
9999
CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
100+
101+
/**
102+
* Gets the service SDK version if the service SDK is in use, null otherwise
103+
* @return the service SDK version if the service SDK is in use, null otherwise
104+
*/
105+
@Nullable
106+
String getServiceSDKVersion();
100107
}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.microsoft.graph.options.HeaderOption;
3939
import com.microsoft.graph.options.Option;
4040

41+
import java.lang.reflect.Field;
4142
import java.net.MalformedURLException;
4243
import java.net.URL;
4344
import java.util.ArrayList;
@@ -164,11 +165,13 @@ public BaseRequest(@Nonnull final String requestUrl,
164165
}
165166
}
166167
}
167-
final HeaderOption requestStatsHeader = new HeaderOption(REQUEST_STATS_HEADER_NAME,
168-
String.format(REQUEST_STATS_HEADER_VALUE_FORMAT_STRING, Constants.VERSION_NAME));
169-
headersOptions.add(requestStatsHeader);
168+
final String sdkVersion = client == null ? null : client.getServiceSDKVersion();
169+
if(sdkVersion != null) {
170+
final HeaderOption requestStatsHeader = new HeaderOption(REQUEST_STATS_HEADER_NAME,
171+
String.format(REQUEST_STATS_HEADER_VALUE_FORMAT_STRING, sdkVersion));
172+
headersOptions.add(requestStatsHeader);
173+
}
170174
}
171-
172175
/**
173176
* Gets the request URL
174177
*

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void testFunctionParameters() {
128128
assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
129129
request.addFunctionOption(new FunctionOption("3","two"));;
130130
assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
131-
assertEquals(4, request.getOptions().size());
131+
assertEquals(3, request.getOptions().size());
132132
}
133133

134134
@Test
@@ -139,7 +139,7 @@ public void testQueryParameters() {
139139
assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
140140
request.addQueryOption(new QueryOption("q3","option3"));
141141
assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
142-
assertEquals(4,request.getOptions().size());
142+
assertEquals(3,request.getOptions().size());
143143
}
144144

145145
@Test
@@ -150,7 +150,7 @@ public void testFunctionAndQueryParameters() {
150150
final Option q2 = new QueryOption("q2","option2");
151151
final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
152152
assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
153-
assertEquals(5, request.getOptions().size());
153+
assertEquals(4, request.getOptions().size());
154154
}
155155

156156
@Test
@@ -171,8 +171,8 @@ public void testHeader() {
171171
final String expectedHeader = "header key";
172172
final String expectedValue = "header value";
173173
final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), null, stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
174-
assertEquals(1, request.getHeaders().size());
174+
assertEquals(0, request.getHeaders().size());
175175
request.addHeader(expectedHeader,expectedValue);
176-
assertEquals(2,request.getHeaders().size());
176+
assertEquals(1,request.getHeaders().size());
177177
}
178178
}

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,22 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
8282
public void testFunctionParameters() {
8383
final Option fo1 = new FunctionOption("1", "one");
8484
final Option fo2 = new FunctionOption("2", null);
85-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(fo1, fo2), null){};
85+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), null){};
8686
assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
8787
request.addFunctionOption(new FunctionOption("3","two"));;
8888
assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
89-
assertEquals(4, request.getOptions().size());
89+
assertEquals(3, request.getOptions().size());
9090
}
9191

9292
@Test
9393
public void testQueryParameters() {
9494
final Option q1 = new QueryOption("q1","option1 ");
9595
final Option q2 = new QueryOption("q2","option2");
96-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1, q2), null){};
96+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), null){};
9797
assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
9898
request.addQueryOption(new QueryOption("q3","option3"));
9999
assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
100-
assertEquals(4,request.getOptions().size());
100+
assertEquals(3,request.getOptions().size());
101101
}
102102

103103
@Test
@@ -106,14 +106,14 @@ public void testFunctionAndQueryParameters() {
106106
final Option f2 = new FunctionOption("f2", null);
107107
final Option q1 = new QueryOption("q1","option1 ");
108108
final Option q2 = new QueryOption("q2","option2");
109-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(f1, f2, q1, q2), null){};
109+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), null){};
110110
assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
111-
assertEquals(5, request.getOptions().size());
111+
assertEquals(4, request.getOptions().size());
112112
}
113113

114114
@Test
115115
public void testHttpMethod() {
116-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
116+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
117117
assertNull(request.getHttpMethod());
118118
request.setHttpMethod(HttpMethod.GET);
119119
assertEquals(HttpMethod.GET, request.getHttpMethod());
@@ -123,12 +123,10 @@ public void testHttpMethod() {
123123
public void testHeader() {
124124
final String expectedHeader = "header key";
125125
final String expectedValue = "header value";
126-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
127-
assertEquals(1, request.getHeaders().size());
128-
assertEquals("SdkVersion", request.getHeaders().get(0).getName());
129-
//assertEquals(String.format("graph-android-v%s", BuildConfig.VERSION_NAME), request.getHeaders().get(0).getValue());
126+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
127+
assertEquals(0, request.getHeaders().size());
130128
request.addHeader(expectedHeader,expectedValue);
131-
assertEquals(2,request.getHeaders().size());
129+
assertEquals(1,request.getHeaders().size());
132130
}
133131

134132
@Test
@@ -137,7 +135,7 @@ public void testProtectedProperties() {
137135
assertEquals(0, mRequest.queryOptions.size());
138136
final Option q1 = new QueryOption("q1","option1 ");
139137
final Option f1 = new FunctionOption("f1","option2");
140-
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1,f1), null){};
138+
final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), null){};
141139
assertEquals(1, request.functionOptions.size());
142140
assertEquals(1, request.queryOptions.size());
143141
assertEquals("q1", request.queryOptions.get(0).getName());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ public void testBaseMethod() {
144144
final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
145145
assertEquals("https://a.b.c/", request.getRequestUrl().toString());
146146
request.addHeader("header key", "header value");
147-
assertEquals(2,request.getHeaders().size());
147+
assertEquals(1,request.getHeaders().size());
148148
assertNull(request.getHttpMethod());
149-
assertEquals(2, request.getOptions().size());
149+
assertEquals(1, request.getOptions().size());
150150
}
151151
public static OkHttpClient getMockClient(final Response response) throws IOException {
152152
final OkHttpClient mockClient = mock(OkHttpClient.class);

0 commit comments

Comments
 (0)