Repository: nifi Updated Branches: refs/heads/master 9324a2a74 -> 6baea8ccf
http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy index 0400efe..2441e94 100644 --- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy +++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/client/NiFiClientUtilSpec.groovy @@ -16,9 +16,6 @@ */ package org.apache.nifi.toolkit.admin.client -import com.sun.jersey.api.client.Client -import com.sun.jersey.api.client.ClientResponse -import com.sun.jersey.api.client.WebResource import org.apache.nifi.util.NiFiProperties import org.apache.nifi.web.api.entity.ClusterEntity import org.junit.Rule @@ -26,6 +23,9 @@ import org.junit.contrib.java.lang.system.ExpectedSystemExit import org.junit.contrib.java.lang.system.SystemOutRule import spock.lang.Specification +import javax.ws.rs.client.Client +import javax.ws.rs.client.Invocation +import javax.ws.rs.client.WebTarget import javax.ws.rs.core.Response class NiFiClientUtilSpec extends Specification{ @@ -57,9 +57,9 @@ class NiFiClientUtilSpec extends Specification{ given: def Client client = Mock Client def NiFiProperties niFiProperties = Mock NiFiProperties - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity when: @@ -68,11 +68,11 @@ class NiFiClientUtilSpec extends Specification{ then: 3 * niFiProperties.getProperty(_) - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.get(_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.get() >> response 1 * response.getStatus() >> 200 - 1 * response.getEntity(ClusterEntity.class) >> clusterEntity + 1 * response.readEntity(ClusterEntity.class) >> clusterEntity entity == clusterEntity } @@ -82,9 +82,9 @@ class NiFiClientUtilSpec extends Specification{ given: def Client client = Mock Client def NiFiProperties niFiProperties = Mock NiFiProperties - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity when: @@ -95,12 +95,12 @@ class NiFiClientUtilSpec extends Specification{ niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8081" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder 1 * builder.header(_,_) >> builder - 1 * builder.get(_) >> response + 1 * builder.get() >> response 1 * response.getStatus() >> 200 - 1 * response.getEntity(ClusterEntity.class) >> clusterEntity + 1 * response.readEntity(ClusterEntity.class) >> clusterEntity entity == clusterEntity } @@ -111,9 +111,9 @@ class NiFiClientUtilSpec extends Specification{ given: def Client client = Mock Client def NiFiProperties niFiProperties = Mock NiFiProperties - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def Response.StatusType statusType = Mock Response.StatusType when: @@ -123,11 +123,11 @@ class NiFiClientUtilSpec extends Specification{ then: 3 * niFiProperties.getProperty(_) - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.get(_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.get() >> response 1 * response.getStatus() >> 500 - 1 * response.getEntity(String.class) >> "Only a node connected to a cluster can process the request." + 1 * response.readEntity(String.class) >> "Only a node connected to a cluster can process the request." def e = thrown(RuntimeException) e.message == "Unable to obtain cluster information" http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy index d5f3705..b68e1a6 100644 --- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy +++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/nodemanager/NodeManagerToolSpec.groovy @@ -16,9 +16,6 @@ */ package org.apache.nifi.toolkit.admin.nodemanager -import com.sun.jersey.api.client.Client -import com.sun.jersey.api.client.ClientResponse -import com.sun.jersey.api.client.WebResource import org.apache.commons.cli.ParseException import org.apache.nifi.toolkit.admin.client.ClientFactory import org.apache.nifi.util.NiFiProperties @@ -31,6 +28,9 @@ import org.junit.contrib.java.lang.system.ExpectedSystemExit import org.junit.contrib.java.lang.system.SystemOutRule import spock.lang.Specification +import javax.ws.rs.client.Client +import javax.ws.rs.client.Invocation +import javax.ws.rs.client.WebTarget import javax.ws.rs.core.Response class NodeManagerToolSpec extends Specification{ @@ -103,9 +103,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -121,14 +121,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.put(_,_) >> response - builder.delete(ClientResponse.class,_) >> response + builder.delete() >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -171,9 +171,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "http://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NodeManagerTool() when: @@ -181,9 +181,9 @@ class NodeManagerToolSpec extends Specification{ then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.delete(_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.delete() >> response 1 * response.getStatus() >> 200 } @@ -193,9 +193,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "https://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NodeManagerTool() when: @@ -203,10 +203,10 @@ class NodeManagerToolSpec extends Specification{ then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder 1 * builder.header(_,_) >> builder - 1 * builder.delete(_) >> response + 1 * builder.delete() >> response 1 * response.getStatus() >> 200 } @@ -217,9 +217,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "http://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def Response.StatusType statusType = Mock Response.StatusType def config = new NodeManagerTool() @@ -227,11 +227,11 @@ class NodeManagerToolSpec extends Specification{ config.deleteNode(url,client,null) then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.delete(_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.delete() >> response 2 * response.getStatus() >> 403 - 1 * response.getEntity(String.class) >> "Unauthorized User" + 1 * response.readEntity(String.class) >> "Unauthorized User" def e = thrown(RuntimeException) e.message == "Failed with HTTP error code 403 with reason: Unauthorized User" @@ -242,9 +242,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "http://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def NodeDTO nodeDTO = new NodeDTO() def NodeEntity nodeEntity = Mock NodeEntity def config = new NodeManagerTool() @@ -253,11 +253,11 @@ class NodeManagerToolSpec extends Specification{ def entity = config.updateNode(url,client,nodeDTO,NodeManagerTool.STATUS.DISCONNECTING,null) then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.put(_,_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.put(_) >> response 1 * response.getStatus() >> 200 - 1 * response.getEntity(NodeEntity.class) >> nodeEntity + 1 * response.readEntity(NodeEntity.class) >> nodeEntity entity == nodeEntity } @@ -267,9 +267,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "https://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def NodeDTO nodeDTO = new NodeDTO() def NodeEntity nodeEntity = Mock NodeEntity def config = new NodeManagerTool() @@ -278,12 +278,12 @@ class NodeManagerToolSpec extends Specification{ def entity = config.updateNode(url,client,nodeDTO,NodeManagerTool.STATUS.DISCONNECTING,null) then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder 1 * builder.header(_,_) >> builder - 1 * builder.put(_,_) >> response + 1 * builder.put(_) >> response 1 * response.getStatus() >> 200 - 1 * response.getEntity(NodeEntity.class) >> nodeEntity + 1 * response.readEntity(NodeEntity.class) >> nodeEntity entity == nodeEntity } @@ -293,9 +293,9 @@ class NodeManagerToolSpec extends Specification{ given: def String url = "http://locahost:8080/nifi-api/controller"; def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def Response.StatusType statusType = Mock Response.StatusType def NodeDTO nodeDTO = new NodeDTO() def config = new NodeManagerTool() @@ -304,11 +304,11 @@ class NodeManagerToolSpec extends Specification{ config.updateNode(url,client,nodeDTO,NodeManagerTool.STATUS.DISCONNECTING,null) then: - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.put(_,_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.put(_) >> response 2 * response.getStatus() >> 403 - 1 * response.getEntity(String.class) >> "Unauthorized User" + 1 * response.readEntity(String.class) >> "Unauthorized User" def e = thrown(RuntimeException) e.message == "Failed with HTTP error code 403 with reason: Unauthorized User" @@ -319,8 +319,9 @@ class NodeManagerToolSpec extends Specification{ given: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NodeManagerTool() when: @@ -329,8 +330,9 @@ class NodeManagerToolSpec extends Specification{ then: niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8080" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" - 1 * client.resource(_ as String) >> resource - 1 * resource.get(ClientResponse.class) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.get() >> response 1 * response.getStatus() >> 200 } @@ -339,8 +341,9 @@ class NodeManagerToolSpec extends Specification{ given: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NodeManagerTool() when: @@ -349,10 +352,11 @@ class NodeManagerToolSpec extends Specification{ then: niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8080" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" - 1 * client.resource(_ as String) >> resource - 1 * resource.get(ClientResponse.class) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.get() >> response 2 * response.getStatus() >> 403 - 1 * response.getEntity(String.class) >> "Unauthorized User" + 1 * response.readEntity(String.class) >> "Unauthorized User" } def "get multiple node status successfully"(){ @@ -360,8 +364,9 @@ class NodeManagerToolSpec extends Specification{ given: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NodeManagerTool() def activeUrls = ["https://localhost:8080","https://localhost1:8080";] @@ -371,8 +376,9 @@ class NodeManagerToolSpec extends Specification{ then: niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8080" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" - 2 * client.resource(_ as String) >> resource - 2 * resource.get(ClientResponse.class) >> response + 2 * client.target(_ as String) >> resource + 2 * resource.request() >> builder + 2 * builder.get() >> response 2 * response.getStatus() >> 200 } @@ -382,9 +388,9 @@ class NodeManagerToolSpec extends Specification{ setup: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -398,13 +404,13 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response - builder.put(_,_) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -420,9 +426,9 @@ class NodeManagerToolSpec extends Specification{ setup: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -436,14 +442,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.header(_,_) >> builder - builder.put(_,_) >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -457,9 +463,9 @@ class NodeManagerToolSpec extends Specification{ setup: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -473,13 +479,13 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response - builder.put(_,_) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -494,9 +500,9 @@ class NodeManagerToolSpec extends Specification{ setup: def NiFiProperties niFiProperties = Mock NiFiProperties def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -510,14 +516,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response - builder.put(_,_) >> response - builder.delete(ClientResponse.class,_) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response + builder.put(_) >> response + builder.delete() >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -533,9 +539,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -550,14 +556,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response - builder.put(_,_) >> response - builder.delete(ClientResponse.class,_) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response + builder.put(_) >> response + builder.delete() >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -574,9 +580,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -591,14 +597,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.header(_,_) >> builder - builder.put(_,_) >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -619,9 +625,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -636,14 +642,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(_) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.header(_,_) >> builder - builder.put(_,_) >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -659,9 +665,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -676,14 +682,14 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8081" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.header(_,_) >> builder - builder.put(_,_) >> response + builder.put(_) >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" @@ -699,9 +705,9 @@ class NodeManagerToolSpec extends Specification{ def NiFiProperties niFiProperties = Mock NiFiProperties def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def ClusterEntity clusterEntity = Mock ClusterEntity def ClusterDTO clusterDTO = Mock ClusterDTO def NodeDTO nodeDTO = new NodeDTO() @@ -717,15 +723,15 @@ class NodeManagerToolSpec extends Specification{ niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_PORT) >> "8081" niFiProperties.getProperty(NiFiProperties.WEB_HTTPS_HOST) >> "localhost" clientFactory.getClient(_,_) >> client - client.resource(_ as String) >> resource - resource.type(_) >> builder - builder.get(ClientResponse.class) >> response + client.target(_ as String) >> resource + resource.request() >> builder + builder.get() >> response builder.header(_,_) >> builder - builder.put(_,_) >> response - builder.delete(ClientResponse.class,_) >> response + builder.put(_) >> response + builder.delete() >> response response.getStatus() >> 200 - response.getEntity(ClusterEntity.class) >> clusterEntity - response.getEntity(NodeEntity.class) >> nodeEntity + response.readEntity(ClusterEntity.class) >> clusterEntity + response.readEntity(NodeEntity.class) >> nodeEntity clusterEntity.getCluster() >> clusterDTO clusterDTO.getNodes() >> nodeDTOs nodeDTO.address >> "localhost" http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy index a0ec50f..cd2da87 100644 --- a/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy +++ b/nifi-toolkit/nifi-toolkit-admin/src/test/groovy/org/apache/nifi/toolkit/admin/notify/NotificationToolSpec.groovy @@ -17,9 +17,6 @@ package org.apache.nifi.toolkit.admin.notify -import com.sun.jersey.api.client.Client -import com.sun.jersey.api.client.ClientResponse -import com.sun.jersey.api.client.WebResource import org.apache.commons.cli.ParseException import org.apache.commons.lang3.SystemUtils import org.apache.nifi.toolkit.admin.client.ClientFactory @@ -30,6 +27,9 @@ import org.junit.contrib.java.lang.system.ExpectedSystemExit import org.junit.contrib.java.lang.system.SystemOutRule import spock.lang.Specification +import javax.ws.rs.client.Client +import javax.ws.rs.client.Invocation +import javax.ws.rs.client.WebTarget import javax.ws.rs.core.Response import java.nio.file.Files import java.nio.file.attribute.PosixFilePermission @@ -104,9 +104,9 @@ class NotificationToolSpec extends Specification{ given: def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NotificationTool() @@ -116,9 +116,9 @@ class NotificationToolSpec extends Specification{ then: 1 * clientFactory.getClient(_,_) >> client - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.post(_,_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.post(_) >> response 1 * response.getStatus() >> 200 } @@ -140,9 +140,9 @@ class NotificationToolSpec extends Specification{ def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NotificationTool() @@ -152,10 +152,10 @@ class NotificationToolSpec extends Specification{ then: 1 * clientFactory.getClient(_,_) >> client - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder 1 * builder.header(_,_) >> builder - 1 * builder.post(_,_) >> response + 1 * builder.post(_) >> response 1 * response.getStatus() >> 200 cleanup: @@ -170,9 +170,9 @@ class NotificationToolSpec extends Specification{ given: def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def Response.StatusType statusType = Mock Response.StatusType def config = new NotificationTool() @@ -183,11 +183,11 @@ class NotificationToolSpec extends Specification{ then: 1 * clientFactory.getClient(_,_) >> client - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.post(_,_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.post(_) >> response 1 * response.getStatus() >> 403 - 1 * response.getEntity(String.class) >> "Unauthorized User" + 1 * response.readEntity(String.class) >> "Unauthorized User" def e = thrown(RuntimeException) e.message == "Failed with HTTP error code 403 with reason: Unauthorized User" @@ -210,9 +210,9 @@ class NotificationToolSpec extends Specification{ def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NotificationTool() @@ -222,7 +222,7 @@ class NotificationToolSpec extends Specification{ then: 1 * clientFactory.getClient(_,_) >> client - 1 * client.resource(_ as String) >> resource + 1 * client.target(_ as String) >> resource def e = thrown(UnsupportedOperationException) e.message == "Proxy DN is required for sending a notification to this node or cluster" @@ -236,9 +236,9 @@ class NotificationToolSpec extends Specification{ given: def ClientFactory clientFactory = Mock ClientFactory def Client client = Mock Client - def WebResource resource = Mock WebResource - def WebResource.Builder builder = Mock WebResource.Builder - def ClientResponse response = Mock ClientResponse + def WebTarget resource = Mock WebTarget + def Invocation.Builder builder = Mock Invocation.Builder + def Response response = Mock Response def config = new NotificationTool() @@ -248,9 +248,9 @@ class NotificationToolSpec extends Specification{ then: 1 * clientFactory.getClient(_,_) >> client - 1 * client.resource(_ as String) >> resource - 1 * resource.type(_) >> builder - 1 * builder.post(_,_) >> response + 1 * client.target(_ as String) >> resource + 1 * resource.request() >> builder + 1 * builder.post(_) >> response 1 * response.getStatus() >> 200 } http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml index a6148b8..f77af2e 100644 --- a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml +++ b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml @@ -111,12 +111,10 @@ <logger name="org.eclipse.jetty" level="INFO"/> <!-- Suppress non-error messages due to excessive logging by class or library --> - <logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR"/> - <logger name="com.sun.jersey.spi.spring" level="ERROR"/> <logger name="org.springframework" level="ERROR"/> <!-- Suppress non-error messages due to known warning about redundant path annotation (NIFI-574) --> - <logger name="com.sun.jersey.spi.inject.Errors" level="ERROR"/> + <logger name="org.glassfish.jersey.internal.Errors" level="ERROR"/> <!-- Logger for capturing user events. We do not want to propagate these http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml index 8d1db0a..1927a2e 100644 --- a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml +++ b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml @@ -112,12 +112,10 @@ <logger name="org.eclipse.jetty" level="INFO"/> <!-- Suppress non-error messages due to excessive logging by class or library --> - <logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR"/> - <logger name="com.sun.jersey.spi.spring" level="ERROR"/> <logger name="org.springframework" level="ERROR"/> <!-- Suppress non-error messages due to known warning about redundant path annotation (NIFI-574) --> - <logger name="com.sun.jersey.spi.inject.Errors" level="ERROR"/> + <logger name="org.glassfish.jersey.internal.Errors" level="ERROR"/> <!-- Logger for capturing user events. We do not want to propagate these http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-assembly/NOTICE b/nifi-toolkit/nifi-toolkit-assembly/NOTICE index 68a17ab..ff89f5e 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/NOTICE +++ b/nifi-toolkit/nifi-toolkit-assembly/NOTICE @@ -95,3 +95,19 @@ The following binary components are provided under the Apache Software License v This product includes software developed by The Groovy community (http://groovy.codehaus.org/). + +************************ +Common Development and Distribution License 1.1 +************************ + +The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. + + (CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-s2s/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-s2s/pom.xml b/nifi-toolkit/nifi-toolkit-s2s/pom.xml index 7efb4b0..8a5f141 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/pom.xml +++ b/nifi-toolkit/nifi-toolkit-s2s/pom.xml @@ -40,5 +40,10 @@ <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteCliMain.java ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteCliMain.java b/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteCliMain.java index f03a0bf..8ab546a 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteCliMain.java +++ b/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteCliMain.java @@ -18,6 +18,7 @@ package org.apache.nifi.toolkit.s2s; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Value; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.cli.CommandLine; @@ -87,7 +88,7 @@ public class SiteToSiteCliMain { } ObjectMapper objectMapper = new ObjectMapper(); objectMapper.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + objectMapper.setDefaultPropertyInclusion(Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.ALWAYS)); System.out.println("s2s is a command line tool that can either read a list of DataPackets from stdin to send over site-to-site or write the received DataPackets to stdout"); System.out.println(); System.out.println("The s2s cli input/output format is a JSON list of DataPackets. They can have the following formats:"); http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiver.java ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiver.java b/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiver.java index b68185f..88ad8f3 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiver.java +++ b/nifi-toolkit/nifi-toolkit-s2s/src/main/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiver.java @@ -23,8 +23,8 @@ import org.apache.nifi.remote.TransactionCompletion; import org.apache.nifi.remote.TransferDirection; import org.apache.nifi.remote.client.SiteToSiteClient; import org.apache.nifi.remote.protocol.DataPacket; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/nifi-toolkit/nifi-toolkit-s2s/src/test/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiverTest.java ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-s2s/src/test/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiverTest.java b/nifi-toolkit/nifi-toolkit-s2s/src/test/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiverTest.java index d5ea6be..88ba6ac 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/src/test/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiverTest.java +++ b/nifi-toolkit/nifi-toolkit-s2s/src/test/java/org/apache/nifi/toolkit/s2s/SiteToSiteReceiverTest.java @@ -17,7 +17,8 @@ package org.apache.nifi.toolkit.s2s; -import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude.Value; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.nifi.remote.Transaction; import org.apache.nifi.remote.TransactionCompletion; @@ -42,7 +43,7 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class SiteToSiteReceiverTest { - private final ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL); + private final ObjectMapper objectMapper = new ObjectMapper().setDefaultPropertyInclusion(Value.construct(Include.NON_NULL, Include.ALWAYS));; @Mock SiteToSiteClient siteToSiteClient; @Mock http://git-wip-us.apache.org/repos/asf/nifi/blob/6baea8cc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ab46861..0a21d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ <lucene.version>4.10.4</lucene.version> <spring.version>4.3.10.RELEASE</spring.version> <spring.security.version>4.2.3.RELEASE</spring.security.version> - <jersey.version>1.19</jersey.version> + <jersey.version>2.26</jersey.version> <hadoop.version>2.7.3</hadoop.version> <hadoop.guava.version>12.0.1</hadoop.guava.version> <hadoop.http.client.version>4.2.5</hadoop.http.client.version> @@ -107,8 +107,7 @@ <hbase.version>1.1.2</hbase.version> <storm.version>1.1.1</storm.version> <hwx.registry.version>0.3.0</hwx.registry.version> - <jackson.version>2.8.6</jackson.version> - <jackson.old.version>1.9.13</jackson.old.version> + <jackson.version>2.9.1</jackson.version> </properties> <repositories> @@ -353,43 +352,11 @@ </exclusions> </dependency> <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-spring</artifactId> - <version>${jersey.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.nimbusds</groupId> <artifactId>oauth2-oidc-sdk</artifactId> <version>5.34</version> </dependency> <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-multipart</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${spring.version}</version> @@ -702,31 +669,6 @@ <version>1.8.1</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version>
