Change-Id: I0f71aeb78e31e0b66fea0d6c3bb941ef702277e5
Issue-ID: HOLMES-160
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
<dependency>\r
<groupId>org.glassfish.jersey.containers</groupId>\r
<artifactId>jersey-container-servlet-core</artifactId>\r
<dependency>\r
<groupId>org.glassfish.jersey.containers</groupId>\r
<artifactId>jersey-container-servlet-core</artifactId>\r
- <version>${jersey.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-common</artifactId>\r
</dependency>\r
</dependency>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-common</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.glassfish.jersey.core</groupId>\r
+ <artifactId>jersey-client</artifactId>\r
+ </dependency>\r
<dependency>\r
<groupId>org.apache.httpcomponents</groupId>\r
<artifactId>httpclient</artifactId>\r
<dependency>\r
<groupId>org.apache.httpcomponents</groupId>\r
<artifactId>httpclient</artifactId>\r
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
private Response patch(String host, String path, Map<String, Object> body) {
Client client = ClientBuilder.newClient();
WebTarget target = client.target(host).path(path);
private Response patch(String host, String path, Map<String, Object> body) {
Client client = ClientBuilder.newClient();
WebTarget target = client.target(host).path(path);
- return target.request().headers(getAaiHeaders()).method("PATCH", Entity.json(body));
+ return target.request().headers(getAaiHeaders()).build("PATCH", Entity.json(body))
+ .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true).invoke();
}
private JSONObject getInfo(String response, String pField, String field) {
}
private JSONObject getInfo(String response, String pField, String field) {
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.easymock.EasyMock;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.easymock.EasyMock;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.junit.*;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.*;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
- JSONArray instances = (JSONArray)Whitebox.invokeMethod(aai, "getServiceInstances",
+ JSONArray instances = (JSONArray) Whitebox.invokeMethod(aai, "getServiceInstances",
"custom-1", "service-type-1");
PowerMock.verifyAll();
"custom-1", "service-type-1");
PowerMock.verifyAll();
- JSONArray instances = (JSONArray)Whitebox.invokeMethod(aai, "getServiceInstances",
+ JSONArray instances = (JSONArray) Whitebox.invokeMethod(aai, "getServiceInstances",
"custom-1", "service-type-1");
PowerMock.verifyAll();
"custom-1", "service-type-1");
PowerMock.verifyAll();
private void mockPatchMethod() {
initCommonMock();
private void mockPatchMethod() {
initCommonMock();
- EasyMock.expect(builder.method(EasyMock.anyObject(String.class), EasyMock.anyObject(Entity.class))).andReturn(response);
+ Invocation invocation = PowerMock.createMock(Invocation.class);
+ EasyMock.expect(builder.build(EasyMock.anyObject(String.class), EasyMock.anyObject(Entity.class))).andReturn(invocation);
+ EasyMock.expect(invocation.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true)).andReturn(invocation);
+ EasyMock.expect(invocation.invoke()).andReturn(response);
}
private void initCommonMock() {
}
private void initCommonMock() {
<artifactId>msb-java-sdk</artifactId>\r
<version>1.1.1</version>\r
</dependency>\r
<artifactId>msb-java-sdk</artifactId>\r
<version>1.1.1</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.glassfish.jersey.containers</groupId>\r
+ <artifactId>jersey-container-servlet-core</artifactId>\r
+ <version>${jersey.version}</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-common</artifactId>\r
<version>${jersey.version}</version>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-common</artifactId>\r
<version>${jersey.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-client</artifactId>\r
<version>${jersey.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.glassfish.jersey.core</groupId>\r
<artifactId>jersey-client</artifactId>\r
<version>${jersey.version}</version>\r
</dependency>\r
<dependency>\r
<groupId>io.dropwizard</groupId>\r
</dependency>\r
<dependency>\r
<groupId>io.dropwizard</groupId>\r