Change-Id: I0a6c83b50380affdc723c07df0b1ca41947a3d8e
Issue-ID: HOLMES-442
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
<parent>\r
<groupId>org.onap.holmes.common</groupId>\r
<artifactId>holmes-common-parent</artifactId>\r
<parent>\r
<groupId>org.onap.holmes.common</groupId>\r
<artifactId>holmes-common-parent</artifactId>\r
- <version>1.3.4-SNAPSHOT</version>\r
+ <version>1.3.5-SNAPSHOT</version>\r
</parent>\r
\r
<name>holmes-common-service</name>\r
</parent>\r
\r
<name>holmes-common-service</name>\r
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017 - 2021 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
private String getResponse(String url) throws CorrelationException {
try {
private String getResponse(String url) throws CorrelationException {
try {
- return new JerseyClient().headers(getHeaders()).get(url);
+ return JerseyClient.newInstance().headers(getHeaders()).get(url);
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}
private String getResponse(String url) throws CorrelationException {
try {
private String getResponse(String url) throws CorrelationException {
try {
- return new JerseyClient().headers(getHeaders()).get(url);
+ return JerseyClient.newInstance().headers(getHeaders()).get(url);
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}
private void put(String url, String content) throws CorrelationException {
try {
private void put(String url, String content) throws CorrelationException {
try {
- new JerseyClient().headers(getHeaders()).put(url, Entity.json(content));
+ JerseyClient.newInstance().headers(getHeaders()).put(url, Entity.json(content));
} catch (Exception e) {
throw new CorrelationException("Failed to put data in AAI", e);
}
} catch (Exception e) {
throw new CorrelationException("Failed to put data in AAI", e);
}
@Service\r
public class Publisher {\r
private String url;\r
@Service\r
public class Publisher {\r
private String url;\r
- private JerseyClient client = new JerseyClient(TimeUnit.SECONDS.toMillis(30));\r
+ private JerseyClient client = JerseyClient.newInstance(TimeUnit.SECONDS.toMillis(30));\r
\r
public void publish(PolicyMsg msg) {\r
client.post(url, Entity.json(msg));\r
\r
public void publish(PolicyMsg msg) {\r
client.post(url, Entity.json(msg));\r
package org.onap.holmes.common.utils;
package org.onap.holmes.common.utils;
-import org.eclipse.jetty.http.HttpStatus;
import org.onap.holmes.common.exception.HttpException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.onap.holmes.common.exception.HttpException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private Map<String, Object> parameters = new HashMap();
private List<String> paths = new ArrayList();
private Map<String, Object> parameters = new HashMap();
private List<String> paths = new ArrayList();
+ public static JerseyClient newInstance() {
+ return new JerseyClient();
+ }
+
+ public static JerseyClient newInstance(long timeout) {
+ return new JerseyClient(timeout);
+ }
- public JerseyClient() {
+ private JerseyClient() {
- public JerseyClient(long timeout) {
+ private JerseyClient(long timeout) {
this.client = ClientBuilder.newBuilder()
.connectTimeout(timeout, TimeUnit.MILLISECONDS)
.readTimeout(timeout, TimeUnit.MILLISECONDS)
this.client = ClientBuilder.newBuilder()
.connectTimeout(timeout, TimeUnit.MILLISECONDS)
.readTimeout(timeout, TimeUnit.MILLISECONDS)
}
private boolean isSuccessful(Response response) {
}
private boolean isSuccessful(Response response) {
- int status = response.getStatus();
- if (!HttpStatus.isSuccess(status)) {
- throw new HttpException(status, String.format("Failed to get response from the server. Info: %s",
+ if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
+ throw new HttpException(response.getStatus(), String.format("Failed to get response from the server. Info: %s",
response.readEntity(String.class)));
}
return true;
response.readEntity(String.class)));
}
return true;
public class MsbRegister {
private static final Logger log = LoggerFactory.getLogger(MsbRegister.class);
public class MsbRegister {
private static final Logger log = LoggerFactory.getLogger(MsbRegister.class);
- private JerseyClient client = new JerseyClient();
+ private JerseyClient client = JerseyClient.newInstance();
- * Copyright 2020 Fujitsu Limited.
+ * Copyright 2020 - 2021 Fujitsu, ZTE Limited.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("javax.net.ssl.*")
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("javax.net.ssl.*")
-@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class})
+@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class, JerseyClient.class})
public class AaiQueryMdonsTest {
@Rule
public class AaiQueryMdonsTest {
@Rule
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertThat;
-@PrepareForTest({AaiQuery.class, MicroServiceConfig.class})
+@PrepareForTest({AaiQuery.class, MicroServiceConfig.class, JerseyClient.class})
@PowerMockIgnore("javax.net.ssl.*")
@RunWith(PowerMockRunner.class)
public class AaiQueryTest {
@PowerMockIgnore("javax.net.ssl.*")
@RunWith(PowerMockRunner.class)
public class AaiQueryTest {
public class JerseyClientTest {
private final String ERROR_MSG = "Status code: <404>. Message: Failed to get response from the server. Info: Error";
public class JerseyClientTest {
private final String ERROR_MSG = "Status code: <404>. Message: Failed to get response from the server. Info: Error";
- private JerseyClient jerseyClient = new JerseyClient();
+ private JerseyClient jerseyClient = JerseyClient.newInstance();
private String url = "http://www.onap.org/holmes/test";
private String url = "http://www.onap.org/holmes/test";
@Rule
private ExpectedException exception = ExpectedException.none();
@Rule
private ExpectedException exception = ExpectedException.none();
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.header("Accept", MediaType.APPLICATION_JSON)).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.header("Accept", MediaType.APPLICATION_JSON)).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean));
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
- EasyMock.expect(mockedResponse.getStatus()).andReturn(200);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder);
EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse);
EasyMock.expect(mockedResponse.getStatus()).andReturn(404);
+ EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error");
WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient);
import static org.easymock.EasyMock.expect;
import static org.powermock.api.easymock.PowerMock.createPartialMock;
import static org.easymock.EasyMock.expect;
import static org.powermock.api.easymock.PowerMock.createPartialMock;
-@PrepareForTest({MicroServiceConfig.class})
+@PrepareForTest({MicroServiceConfig.class, JerseyClient.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"javax.net.ssl.*", "javax.security.*"})
public class MsbRegisterTest {
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"javax.net.ssl.*", "javax.security.*"})
public class MsbRegisterTest {
<artifactId>holmes-common-parent</artifactId>\r
<packaging>pom</packaging>\r
\r
<artifactId>holmes-common-parent</artifactId>\r
<packaging>pom</packaging>\r
\r
- <version>1.3.4-SNAPSHOT</version>\r
+ <version>1.3.5-SNAPSHOT</version>\r
<name>holmes-common</name>\r
<modules>\r
<module>holmes-actions</module>\r
<name>holmes-common</name>\r
<modules>\r
<module>holmes-actions</module>\r