Skip to content

Commit ac6dc39

Browse files
youngzilyoungzil
committed
feat:
1. remove @deprecated 2. add unit test
1 parent ce0c403 commit ac6dc39

File tree

3 files changed

+48
-19
lines changed

3 files changed

+48
-19
lines changed

‎apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/api/NamespaceOpenApiService.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*/
2727
public interface NamespaceOpenApiService {
2828

29-
/**
30-
* @deprecated use {@link NamespaceOpenApiService#getNamespace(String, String, String, String, boolean)} instead
31-
*/
3229
default OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) {
3330
return getNamespace(appId, env, clusterName, namespaceName, true);
3431
}
@@ -39,9 +36,6 @@ default OpenNamespaceDTO getNamespace(String appId, String env, String clusterNa
3936
*/
4037
OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName, boolean fillItemDetail);
4138

42-
/**
43-
* @deprecated use {@link NamespaceOpenApiService#getNamespaces(String, String, String, boolean)} instead
44-
*/
4539
default List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) {
4640
return getNamespaces(appId, env, clusterName, true);
4741
}

‎apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/ApolloOpenApiClient.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,8 @@ public List<OpenAppDTO> getAppsByIds(List<String> appIds) {
9999
return appService.getAppsInfo(appIds);
100100
}
101101

102-
/**
103-
* @deprecated use {@link ApolloOpenApiClient#getNamespaces(String, String, String, boolean)} instead
104-
*/
105102
public List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) {
106-
return namespaceService.getNamespaces(appId, env, clusterName, true);
103+
return namespaceService.getNamespaces(appId, env, clusterName);
107104
}
108105

109106
/**
@@ -132,11 +129,8 @@ public OpenClusterDTO createCluster(String env, OpenClusterDTO openClusterDTO) {
132129
return clusterService.createCluster(env, openClusterDTO);
133130
}
134131

135-
/**
136-
* @deprecated use {@link ApolloOpenApiClient#getNamespace(String, String, String, String, boolean)} instead
137-
*/
138132
public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) {
139-
return namespaceService.getNamespace(appId, env, clusterName, namespaceName, true);
133+
return namespaceService.getNamespace(appId, env, clusterName, namespaceName);
140134
}
141135

142136
/**

‎apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/NamespaceOpenApiServiceTest.java‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class NamespaceOpenApiServiceTest extends AbstractOpenApiServiceTest {
3737
private String someEnv;
3838
private String someCluster;
3939
private String someNamespace;
40+
private boolean fillItemDetail;
4041

4142
@Override
4243
@Before
@@ -47,6 +48,7 @@ public void setUp() throws Exception {
4748
someEnv = "someEnv";
4849
someCluster = "someCluster";
4950
someNamespace = "someNamespace";
51+
fillItemDetail = true;
5052

5153
StringEntity responseEntity = new StringEntity("{}");
5254
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
@@ -58,15 +60,33 @@ public void setUp() throws Exception {
5860
public void testGetNamespace() throws Exception {
5961
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
6062

61-
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace, true);
63+
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace);
64+
65+
verify(httpClient, times(1)).execute(request.capture());
66+
67+
HttpGet get = request.getValue();
68+
69+
assertEquals(String
70+
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s?fillItemDetail=%s", someBaseUrl, someEnv, someAppId, someCluster,
71+
someNamespace, fillItemDetail), get.getURI().toString());
72+
}
73+
74+
@Test
75+
public void testGetNamespaceWithFillItemDetailFalse() throws Exception {
76+
77+
fillItemDetail = false;
78+
79+
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
80+
81+
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace, fillItemDetail);
6282

6383
verify(httpClient, times(1)).execute(request.capture());
6484

6585
HttpGet get = request.getValue();
6686

6787
assertEquals(String
68-
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s", someBaseUrl, someEnv, someAppId, someCluster,
69-
someNamespace), get.getURI().toString());
88+
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s?fillItemDetail=%s", someBaseUrl, someEnv, someAppId, someCluster,
89+
someNamespace, fillItemDetail), get.getURI().toString());
7090
}
7191

7292
@Test(expected = RuntimeException.class)
@@ -83,17 +103,38 @@ public void testGetNamespaces() throws Exception {
83103

84104
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
85105

86-
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster, true);
106+
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster);
87107

88108
verify(httpClient, times(1)).execute(request.capture());
89109

90110
HttpGet get = request.getValue();
91111

92112
assertEquals(String
93-
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces", someBaseUrl, someEnv, someAppId, someCluster),
113+
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces?fillItemDetail=%s", someBaseUrl, someEnv, someAppId, someCluster, fillItemDetail),
94114
get.getURI().toString());
95115
}
96116

117+
@Test
118+
public void testGetNamespacesWithFillItemDetailFalse() throws Exception {
119+
120+
fillItemDetail = false;
121+
122+
StringEntity responseEntity = new StringEntity("[]");
123+
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
124+
125+
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
126+
127+
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster, fillItemDetail);
128+
129+
verify(httpClient, times(1)).execute(request.capture());
130+
131+
HttpGet get = request.getValue();
132+
133+
assertEquals(String
134+
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces?fillItemDetail=%s", someBaseUrl, someEnv, someAppId, someCluster, fillItemDetail),
135+
get.getURI().toString());
136+
}
137+
97138
@Test(expected = RuntimeException.class)
98139
public void testGetNamespacesWithError() throws Exception {
99140
when(statusLine.getStatusCode()).thenReturn(404);

0 commit comments

Comments
 (0)