Skip to content

Commit 03d1a32

Browse files
lpatino10lpatino10
committed
refactor: Fix references based on deletions and renaming
1 parent 71ef17e commit 03d1a32

File tree

10 files changed

+52
-69
lines changed

10 files changed

+52
-69
lines changed

‎src/main/java/com/ibm/cloud/sdk/core/http/RequestBuilder.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@
1212
*/
1313
package com.ibm.cloud.sdk.core.http;
1414

15-
import java.io.InputStream;
16-
import java.util.ArrayList;
17-
import java.util.List;
18-
1915
import com.google.gson.JsonObject;
20-
import com.ibm.cloud.sdk.core.service.WatsonService;
16+
import com.ibm.cloud.sdk.core.service.BaseService;
2117
import com.ibm.cloud.sdk.core.util.GsonSingleton;
2218
import com.ibm.cloud.sdk.core.util.StringHelper;
2319
import com.ibm.cloud.sdk.core.util.Validator;
24-
2520
import okhttp3.FormBody;
2621
import okhttp3.HttpUrl;
2722
import okhttp3.MediaType;
2823
import okhttp3.Request;
2924
import okhttp3.RequestBody;
3025

26+
import java.io.InputStream;
27+
import java.util.ArrayList;
28+
import java.util.List;
29+
3130
/**
3231
* Convenience class for constructing HTTP/HTTPS requests.
3332
*/
@@ -334,10 +333,10 @@ public RequestBuilder bodyContent(InputStream stream, String contentType) {
334333
public RequestBuilder bodyContent(String contentType, Object jsonContent, Object jsonPatchContent,
335334
InputStream nonJsonContent) {
336335
if (contentType != null) {
337-
if (WatsonService.isJsonMimeType(contentType)) {
336+
if (BaseService.isJsonMimeType(contentType)) {
338337
this.bodyContent(
339338
GsonSingleton.getGson().toJsonTree(jsonContent).getAsJsonObject().toString(), contentType);
340-
} else if (WatsonService.isJsonPatchMimeType(contentType)) {
339+
} else if (BaseService.isJsonPatchMimeType(contentType)) {
341340
this.bodyContent(
342341
GsonSingleton.getGson().toJsonTree(jsonPatchContent).getAsJsonObject().toString(), contentType);
343342
} else {

‎src/test/java/com/ibm/cloud/sdk/core/test/BaseServiceUnitTest.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ibm.cloud.sdk.core.test.service;
1+
package com.ibm.cloud.sdk.core.test;
22

33
import com.google.gson.Gson;
44
import com.ibm.cloud.sdk.core.http.HttpMediaType;
@@ -13,18 +13,6 @@
1313
import static com.ibm.cloud.sdk.core.http.HttpHeaders.CONTENT_TYPE;
1414

1515
public class BaseServiceUnitTest {
16-
/** The Constant DELETE. */
17-
protected static final String DELETE = "DELETE";
18-
19-
/** The Constant GET. */
20-
protected static final String GET = "GET";
21-
22-
/** The Constant POST. */
23-
protected static final String POST = "POST";
24-
25-
/** The Constant PUT. */
26-
protected static final String PUT = "PUT";
27-
2816
private static final Gson GSON = GsonSingleton.getGson();
2917

3018
/** The server. */
@@ -35,7 +23,6 @@ public class BaseServiceUnitTest {
3523
*
3624
* @throws Exception the exception
3725
*/
38-
@Override
3926
public void setUp() throws Exception {
4027
server = new MockWebServer();
4128
server.start();

‎src/test/java/com/ibm/cloud/sdk/core/test/TestUtils.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
1111
* specific language governing permissions and limitations under the License.
1212
*/
13-
package com.ibm.cloud.sdk.core.test.util;
13+
package com.ibm.cloud.sdk.core.test;
1414

1515
import com.ibm.cloud.sdk.core.util.GsonSingleton;
1616
import org.junit.Ignore;
@@ -28,16 +28,19 @@
2828
@Ignore
2929
public final class TestUtils {
3030
/** The Constant DELETE. */
31-
protected static final String DELETE = "DELETE";
31+
public static final String DELETE = "DELETE";
32+
33+
/** The Constant HEAD. */
34+
public static final String HEAD = "HEAD";
3235

3336
/** The Constant GET. */
34-
protected static final String GET = "GET";
37+
public static final String GET = "GET";
3538

3639
/** The Constant POST. */
37-
protected static final String POST = "POST";
40+
public static final String POST = "POST";
3841

3942
/** The Constant PUT. */
40-
protected static final String PUT = "PUT";
43+
public static final String PUT = "PUT";
4144

4245
/**
4346
* Private constructor.
@@ -50,7 +53,7 @@ private TestUtils() { }
5053
* @param is the input stream
5154
* @return the string from input stream
5255
*/
53-
static String getStringFromInputStream(InputStream is) {
56+
public static String getStringFromInputStream(InputStream is) {
5457
BufferedReader br = null;
5558
final StringBuilder sb = new StringBuilder();
5659

‎src/test/java/com/ibm/cloud/sdk/core/test/service/AuthenticationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.ibm.cloud.sdk.core.test.service;
22

3-
import com.ibm.cloud.sdk.core.service.WatsonService;
3+
import com.ibm.cloud.sdk.core.service.BaseService;
44
import com.ibm.cloud.sdk.core.util.CredentialUtils;
5-
65
import org.junit.Test;
76

8-
import static org.junit.Assert.assertTrue;
97
import static org.junit.Assert.assertFalse;
8+
import static org.junit.Assert.assertTrue;
109

1110
public class AuthenticationTest {
1211
private static final String APIKEY_USERNAME = "apikey";
1312
private static final String APIKEY = "12345";
1413
private static final String ICP_APIKEY = "icp-12345";
1514
private static final String BASIC_USERNAME = "basicUser";
1615

17-
public class TestService extends WatsonService {
16+
public class TestService extends BaseService {
1817
private static final String SERVICE_NAME = "test";
1918

2019
public TestService() {

‎src/test/java/com/ibm/cloud/sdk/core/test/service/ErrorResponseTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.ibm.cloud.sdk.core.http.HttpMediaType;
1616
import com.ibm.cloud.sdk.core.http.RequestBuilder;
1717
import com.ibm.cloud.sdk.core.http.ServiceCall;
18-
import com.ibm.cloud.sdk.core.service.WatsonService;
18+
import com.ibm.cloud.sdk.core.service.BaseService;
1919
import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
2020
import com.ibm.cloud.sdk.core.service.exception.ConflictException;
2121
import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
@@ -27,19 +27,20 @@
2727
import com.ibm.cloud.sdk.core.service.exception.UnauthorizedException;
2828
import com.ibm.cloud.sdk.core.service.exception.UnsupportedException;
2929
import com.ibm.cloud.sdk.core.service.model.GenericModel;
30-
import com.ibm.cloud.sdk.core.test.WatsonServiceUnitTest;
30+
import com.ibm.cloud.sdk.core.test.BaseServiceUnitTest;
3131
import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
3232
import okhttp3.HttpUrl;
3333
import okhttp3.mockwebserver.MockResponse;
3434
import org.junit.Before;
3535
import org.junit.Test;
3636

37+
import static com.ibm.cloud.sdk.core.http.HttpHeaders.CONTENT_TYPE;
3738
import static org.junit.Assert.assertEquals;
3839
import static org.junit.Assert.assertTrue;
3940

40-
public class ErrorResponseTest extends WatsonServiceUnitTest {
41+
public class ErrorResponseTest extends BaseServiceUnitTest {
4142

42-
public class TestService extends WatsonService {
43+
public class TestService extends BaseService {
4344

4445
private static final String SERVICE_NAME = "test";
4546

‎src/test/java/com/ibm/cloud/sdk/core/test/service/HeadersTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
import com.ibm.cloud.sdk.core.http.HttpMediaType;
1616
import com.ibm.cloud.sdk.core.http.RequestBuilder;
1717
import com.ibm.cloud.sdk.core.http.ServiceCall;
18-
import com.ibm.cloud.sdk.core.service.WatsonService;
18+
import com.ibm.cloud.sdk.core.service.BaseService;
1919
import com.ibm.cloud.sdk.core.service.model.GenericModel;
20-
import com.ibm.cloud.sdk.core.test.WatsonServiceUnitTest;
20+
import com.ibm.cloud.sdk.core.test.BaseServiceUnitTest;
2121
import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
22-
2322
import okhttp3.HttpUrl;
2423
import okhttp3.mockwebserver.MockResponse;
2524
import okhttp3.mockwebserver.RecordedRequest;
2625
import org.junit.Before;
2726
import org.junit.Test;
2827

28+
import static com.ibm.cloud.sdk.core.http.HttpHeaders.CONTENT_TYPE;
2929
import static org.junit.Assert.assertTrue;
3030

31-
public class HeadersTest extends WatsonServiceUnitTest {
31+
public class HeadersTest extends BaseServiceUnitTest {
3232

3333
private class TestModel extends GenericModel { }
3434

35-
public class TestService extends WatsonService {
35+
public class TestService extends BaseService {
3636

3737
private static final String SERVICE_NAME = "test";
3838

‎src/test/java/com/ibm/cloud/sdk/core/test/service/IamManagerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
import com.ibm.cloud.sdk.core.service.security.IamOptions;
1616
import com.ibm.cloud.sdk.core.service.security.IamToken;
1717
import com.ibm.cloud.sdk.core.service.security.IamTokenManager;
18-
import com.ibm.cloud.sdk.core.test.WatsonServiceUnitTest;
1918

19+
import com.ibm.cloud.sdk.core.test.BaseServiceUnitTest;
2020
import org.junit.Before;
2121
import org.junit.Test;
2222

23+
import static com.ibm.cloud.sdk.core.test.TestUtils.loadFixture;
2324
import static org.junit.Assert.assertEquals;
2425

25-
public class IamManagerTest extends WatsonServiceUnitTest {
26+
public class IamManagerTest extends BaseServiceUnitTest {
2627

2728
private IamToken expiredTokenData;
2829
private IamToken validTokenData;

‎src/test/java/com/ibm/cloud/sdk/core/test/service/RequestBuilderTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.google.gson.JsonObject;
1616
import com.ibm.cloud.sdk.core.http.HttpMediaType;
1717
import com.ibm.cloud.sdk.core.http.RequestBuilder;
18+
import com.ibm.cloud.sdk.core.test.TestUtils;
1819
import okhttp3.HttpUrl;
1920
import okhttp3.MediaType;
2021
import okhttp3.Request;
@@ -54,7 +55,7 @@ public void testBuild() {
5455
.header(X_TOKEN, "token1");
5556
final Request request = builder.build();
5657

57-
assertEquals("POST", request.method());
58+
assertEquals(TestUtils.POST, request.method());
5859
assertEquals("token1", request.header(xToken));
5960
assertNotNull(builder.toString());
6061
}
@@ -73,7 +74,7 @@ public void testUrlNull() {
7374
@Test
7475
public void testDelete() {
7576
final Request request = RequestBuilder.delete(HttpUrl.parse(urlWithQuery)).build();
76-
assertEquals("DELETE", request.method());
77+
assertEquals(TestUtils.DELETE, request.method());
7778
assertEquals(urlWithQuery, request.url().toString());
7879
}
7980

@@ -83,7 +84,7 @@ public void testDelete() {
8384
@Test
8485
public void testGet() {
8586
final Request request = RequestBuilder.get(HttpUrl.parse(urlWithQuery)).build();
86-
assertEquals("GET", request.method());
87+
assertEquals(TestUtils.GET, request.method());
8788
assertEquals(urlWithQuery, request.url().toString());
8889
}
8990

@@ -93,7 +94,7 @@ public void testGet() {
9394
@Test
9495
public void testHead() {
9596
final Request request = RequestBuilder.head(HttpUrl.parse(urlWithQuery)).build();
96-
assertEquals("HEAD", request.method());
97+
assertEquals(TestUtils.HEAD, request.method());
9798
assertEquals(urlWithQuery, request.url().toString());
9899
}
99100

@@ -120,7 +121,7 @@ public void testIllegalArgumentExceptionEvenNumbers() {
120121
@Test
121122
public void testPost() {
122123
final Request request = RequestBuilder.post(HttpUrl.parse(url)).build();
123-
assertEquals("POST", request.method());
124+
assertEquals(TestUtils.POST, request.method());
124125
assertEquals(url, request.url().toString());
125126
}
126127

@@ -130,7 +131,7 @@ public void testPost() {
130131
@Test
131132
public void testPut() {
132133
final Request request = RequestBuilder.put(HttpUrl.parse(urlWithQuery)).build();
133-
assertEquals("PUT", request.method());
134+
assertEquals(TestUtils.PUT, request.method());
134135
assertEquals(urlWithQuery, request.url().toString());
135136
}
136137

‎src/test/java/com/ibm/cloud/sdk/core/test/service/ResponseTest.java

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
import com.ibm.cloud.sdk.core.http.Response;
1717
import com.ibm.cloud.sdk.core.http.ServiceCall;
1818
import com.ibm.cloud.sdk.core.http.ServiceCallbackWithDetails;
19-
import com.ibm.cloud.sdk.core.service.WatsonService;
19+
import com.ibm.cloud.sdk.core.service.BaseService;
2020
import com.ibm.cloud.sdk.core.service.model.GenericModel;
21-
import com.ibm.cloud.sdk.core.test.WatsonServiceUnitTest;
21+
import com.ibm.cloud.sdk.core.test.BaseServiceUnitTest;
2222
import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
23-
24-
import jersey.repackaged.jsr166e.CompletableFuture;
2523
import okhttp3.Headers;
2624
import okhttp3.HttpUrl;
2725
import okhttp3.mockwebserver.MockResponse;
@@ -34,11 +32,11 @@
3432
import static org.junit.Assert.assertNotNull;
3533
import static org.junit.Assert.assertNull;
3634

37-
public class ResponseTest extends WatsonServiceUnitTest {
35+
public class ResponseTest extends BaseServiceUnitTest {
3836

3937
private class TestModel extends GenericModel { }
4038

41-
public class TestService extends WatsonService {
39+
public class TestService extends BaseService {
4240

4341
private static final String SERVICE_NAME = "test";
4442

@@ -117,12 +115,9 @@ public void onFailure(Exception e) { }
117115
public void testRxWithDetailsCallback() throws InterruptedException {
118116
server.enqueue(new MockResponse().setBody("{\"test_key\": \"test_value\"}"));
119117

120-
service.testMethod().rxWithDetails().thenAccept(new CompletableFuture.Action<Response<TestModel>>() {
121-
@Override
122-
public void accept(Response<TestModel> response) {
123-
assertNotNull(response.getResult());
124-
assertNotNull(response.getHeaders());
125-
}
118+
service.testMethod().rxWithDetails().thenAccept(response -> {
119+
assertNotNull(response.getResult());
120+
assertNotNull(response.getHeaders());
126121
});
127122
}
128123

@@ -135,12 +130,9 @@ public void accept(Response<TestModel> response) {
135130
public void testRxWithDetailsAsync() throws InterruptedException {
136131
server.enqueue(new MockResponse().setBody("{\"test_key\": \"test_value\"}"));
137132

138-
service.testMethod().rxWithDetails().thenAcceptAsync(new CompletableFuture.Action<Response<TestModel>>() {
139-
@Override
140-
public void accept(Response<TestModel> response) {
141-
assertNotNull(response.getResult());
142-
assertNotNull(response.getHeaders());
143-
}
133+
service.testMethod().rxWithDetails().thenAcceptAsync(response -> {
134+
assertNotNull(response.getResult());
135+
assertNotNull(response.getHeaders());
144136
});
145137
}
146138

‎src/test/java/com/ibm/cloud/sdk/core/test/util/CredentialUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
package com.ibm.cloud.sdk.core.test.util;
1414

15-
import com.ibm.cloud.sdk.core.test.WatsonServiceTest;
1615
import com.ibm.cloud.sdk.core.util.CredentialUtils;
1716

1817
import org.junit.Before;
@@ -21,6 +20,7 @@
2120
import java.io.InputStream;
2221
import java.util.Hashtable;
2322

23+
import static com.ibm.cloud.sdk.core.test.TestUtils.getStringFromInputStream;
2424
import static org.junit.Assert.assertEquals;
2525
import static org.junit.Assert.assertFalse;
2626
import static org.junit.Assert.assertNull;
@@ -29,7 +29,7 @@
2929
/**
3030
* The Class CredentialUtilsTest.
3131
*/
32-
public class CredentialUtilsTest extends WatsonServiceTest {
32+
public class CredentialUtilsTest {
3333
private static final String SERVICE_NAME = "personality_insights";
3434
private static final String VCAP_SERVICES = "vcap_services.json";
3535
private static final String APIKEY = "apikey";

0 commit comments

Comments
 (0)