This closes #994
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a5040934 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a5040934 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a5040934 Branch: refs/heads/master Commit: a5040934de597c7057314400347e82533d4d0cac Parents: 48e4fe3 c466240 Author: Alex Heneveld <[email protected]> Authored: Wed Nov 4 10:47:32 2015 -0500 Committer: Alex Heneveld <[email protected]> Committed: Wed Nov 4 10:47:32 2015 -0500 ---------------------------------------------------------------------- .../brooklyn/core/entity/EntityAsserts.java | 228 +++++++ .../org/apache/brooklyn/feed/http/HttpFeed.java | 6 +- .../brooklyn/feed/http/HttpPollConfig.java | 4 +- .../brooklyn/feed/http/HttpPollValue.java | 2 +- .../apache/brooklyn/feed/http/HttpPolls.java | 4 +- .../brooklyn/feed/http/HttpValueFunctions.java | 2 +- .../brooklyn/util/core/ResourceUtils.java | 5 +- .../brooklyn/util/core/http/HttpTool.java | 313 +--------- .../util/core/http/HttpToolResponse.java | 163 +---- .../deserializingClassRenames.properties | 10 +- .../brooklyn/core/entity/EntityAssertsTest.java | 217 +++++++ .../core/sensor/http/HttpRequestSensorTest.java | 5 +- .../core/test/TestHttpRequestHandler.java | 72 --- .../brooklyn/core/test/TestHttpServer.java | 143 ----- .../apache/brooklyn/feed/http/HttpFeedTest.java | 5 +- .../feed/http/HttpValueFunctionsTest.java | 3 +- .../util/core/ResourceUtilsHttpTest.java | 5 +- .../util/core/http/HttpToolIntegrationTest.java | 4 +- .../persist/jclouds/BlobStoreExpiryTest.java | 4 +- .../brooklynnode/BrooklynEntityMirrorImpl.java | 2 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 2 +- .../entity/brooklynnode/EntityHttpClient.java | 4 +- .../brooklynnode/EntityHttpClientImpl.java | 4 +- .../brooklynnode/RemoteEffectorBuilder.java | 2 +- .../SetHighAvailabilityModeEffectorBody.java | 2 +- ...SetHighAvailabilityPriorityEffectorBody.java | 2 +- .../BrooklynNodeIntegrationTest.java | 8 +- .../brooklynnode/CallbackEntityHttpClient.java | 5 +- .../nosql/couchbase/CouchbaseClusterImpl.java | 5 +- .../nosql/couchbase/CouchbaseNodeImpl.java | 4 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 4 +- .../elasticsearch/ElasticSearchNodeImpl.java | 2 +- .../ElasticSearchClusterIntegrationTest.java | 4 +- .../ElasticSearchNodeIntegrationTest.java | 4 +- .../geoscaling/GeoscalingDnsServiceImpl.java | 2 +- .../dns/geoscaling/GeoscalingWebClient.java | 2 +- .../entity/proxy/nginx/NginxControllerImpl.java | 4 +- .../dns/geoscaling/GeoscalingWebClientTest.java | 3 +- .../webapp/WebAppConcurrentDeployTest.java | 5 +- .../brooklynnode/BrooklynNodeRestTest.java | 8 +- .../launcher/BrooklynWebServerTest.java | 5 +- .../brooklyn/qa/longevity/MonitorUtils.java | 4 +- .../BrooklynPropertiesSecurityFilterTest.java | 4 +- .../brooklyn/rest/HaMasterCheckFilterTest.java | 4 +- .../rest/resources/CatalogResetTest.java | 4 +- .../SensorResourceIntegrationTest.java | 4 +- .../ServerResourceIntegrationTest.java | 6 +- .../json/BrooklynJacksonSerializerTest.java | 2 +- .../apache/brooklyn/test/EntityTestUtils.java | 52 +- .../org/apache/brooklyn/test/HttpTestUtils.java | 4 + .../brooklyn/test/TrustingSslSocketFactory.java | 134 ---- utils/common/pom.xml | 12 +- .../java/org/apache/brooklyn/test/Asserts.java | 615 ++++++++++++++++++- .../test/http/TestHttpRequestHandler.java | 72 +++ .../brooklyn/test/http/TestHttpServer.java | 146 +++++ .../apache/brooklyn/util/http/HttpAsserts.java | 335 ++++++++++ .../org/apache/brooklyn/util/http/HttpTool.java | 528 ++++++++++++++++ .../brooklyn/util/http/HttpToolResponse.java | 186 ++++++ .../util/http/TrustingSslSocketFactory.java | 134 ++++ .../apache/brooklyn/util/HttpAssertsTest.java | 293 +++++++++ 60 files changed, 2887 insertions(+), 930 deletions(-) ----------------------------------------------------------------------
