You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/02/07 12:51:18 UTC
[4/5] brooklyn-library git commit: Remove unnecessary casts
Remove unnecessary casts
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/9c66fa14
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/9c66fa14
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/9c66fa14
Branch: refs/heads/master
Commit: 9c66fa14a12e167da27eac8f32da65175aa232bc
Parents: e90848c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jan 20 16:58:18 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Feb 7 14:33:40 2017 +0200
----------------------------------------------------------------------
.../org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java | 4 ++--
.../brooklyn/entity/database/postgresql/PostgreSqlChefTest.java | 2 +-
.../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 4 ++--
.../brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java | 2 +-
.../org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 4 ++--
.../brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java | 4 ++--
.../entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java | 2 +-
.../apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java | 2 +-
.../brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java | 2 +-
.../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java b/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
index a63fc38..e83b244 100644
--- a/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
+++ b/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
@@ -238,8 +238,8 @@ public class JavaWebAppsIntegrationTest {
Assert.assertEquals(policy.getConfig(AutoScalerPolicy.MAX_POOL_SIZE), (Integer)5);
Assert.assertEquals(policy.getConfig(AutoScalerPolicy.MIN_POOL_SIZE), (Integer)1);
Assert.assertEquals(policy.getConfig(AutoScalerPolicy.METRIC), DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW_PER_NODE);
- Assert.assertEquals(policy.getConfig(AutoScalerPolicy.METRIC_LOWER_BOUND), (Integer)10);
- Assert.assertEquals(policy.getConfig(AutoScalerPolicy.METRIC_UPPER_BOUND), (Integer)100);
+ Assert.assertEquals(policy.getConfig(AutoScalerPolicy.METRIC_LOWER_BOUND), 10);
+ Assert.assertEquals(policy.getConfig(AutoScalerPolicy.METRIC_UPPER_BOUND), 100);
Assert.assertTrue(policy.isRunning());
EntityAsserts.assertAttributeEqualsEventually(app, Attributes.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java
index 6f1d014..c682b23 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlChefTest.java
@@ -71,7 +71,7 @@ public class PostgreSqlChefTest extends ChefLiveTestSupport {
t.getTask().blockUntilEnded(Duration.TEN_SECONDS);
if (!t.isDone())
Assert.fail("Task not finished yet: "+t.getTask());
- Assert.assertNotEquals(t.get(), (Integer)0, "Task ended with code "+t.get()+"; output: "+t.getStdout() );
+ Assert.assertNotEquals(t.get(), 0, "Task ended with code "+t.get()+"; output: "+t.getStdout() );
} catch (Exception e) {
// host has been killed, that is fine
log.info("Machine "+targetMachine+" destroyed on stop (expected - "+e+")");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
index 9c6a01d..488f0e9 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
@@ -346,7 +346,7 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements CassandraN
if (name == null) {
name = "UNKNOWN_DATACENTER";
}
- sensors().set((AttributeSensor<String>)DATACENTER_NAME, name);
+ sensors().set(DATACENTER_NAME, name);
}
return name;
}
@@ -365,7 +365,7 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements CassandraN
if (name == null) {
name = "UNKNOWN_RACK";
}
- sensors().set((AttributeSensor<String>)RACK_NAME, name);
+ sensors().set(RACK_NAME, name);
}
return name;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
index db33f50..1c9a37c 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
@@ -229,7 +229,7 @@ public class CouchbaseClusterImpl extends DynamicClusterImpl implements Couchbas
Tasks.resetBlockingDetails();
}
- ((CouchbaseNode)getPrimaryNode()).rebalance();
+ getPrimaryNode().rebalance();
} else {
if (getQuorumSize()>1) {
log.warn(this+" is not quorate; will likely fail later, but proceeding for now");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
index dcc9164..8444096 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
@@ -153,11 +153,11 @@ public class RiakNodeSshDriver extends JavaSoftwareProcessSshDriver implements R
// TODO osDetails.getName() is returning "linux", instead of debian/ubuntu on AWS with jenkins image,
// running as integration test targetting localhost.
// TODO Debian support (default debian image fails with 'sudo: command not found')
- downloadUrl = (String)entity.getAttribute(RiakNode.DOWNLOAD_URL_DEBIAN);
+ downloadUrl = entity.getAttribute(RiakNode.DOWNLOAD_URL_DEBIAN);
osReleaseCmd = osDetails.getVersion().substring(0, osDetails.getVersion().indexOf("."));
} else {
// assume Ubuntu
- downloadUrl = (String)entity.getAttribute(RiakNode.DOWNLOAD_URL_UBUNTU);
+ downloadUrl = entity.getAttribute(RiakNode.DOWNLOAD_URL_UBUNTU);
osReleaseCmd = "`lsb_release -sc` && " +
"export OS_RELEASE=`([[ \"lucid natty precise\" =~ (^| )\\$OS_RELEASE($| ) ]] && echo $OS_RELEASE || echo precise)`";
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java
index 7e32569..3635831 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterTest.java
@@ -99,7 +99,7 @@ public class CassandraDatacenterTest extends BrooklynAppUnitTestSupport {
// calling the driver stop for this entity will cause SERVICE_UP to become false, and stay false
// (and that's all it does, incidentally); if we just set the attribute it will become true on serviceUp sensor feed
log.info("Simulating failure of cassandra node "+e1);
- ((EmptySoftwareProcess)e1).getDriver().stop();
+ e1.getDriver().stop();
// not necessary, but speeds things up:
if (fast)
e1.sensors().set(Attributes.SERVICE_UP, false);
@@ -118,7 +118,7 @@ public class CassandraDatacenterTest extends BrooklynAppUnitTestSupport {
if (!checkSeedsConstantOnRejoining) {
// cluster should not revert to e1+e2, simply because e1 has come back; but e1 should rejoin the group
// (not that important, and waits for 1s, so only done as part of integration)
- ((EmptySoftwareProcessSshDriver)(((EmptySoftwareProcess)e1).getDriver())).launch();
+ ((EmptySoftwareProcessSshDriver)(e1.getDriver())).launch();
if (fast)
e1.sensors().set(Attributes.SERVICE_UP, true);
EntityAsserts.assertAttributeEqualsEventually(e1, CassandraNode.SERVICE_UP, true);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java
index 3baff9f..3626dff 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayEc2LiveTest.java
@@ -40,7 +40,7 @@ public class CouchbaseSyncGatewayEc2LiveTest extends AbstractEc2LiveTest {
.configure(CouchbaseNode.COUCHBASE_ADMIN_USERNAME, "Administrator")
.configure(CouchbaseNode.COUCHBASE_ADMIN_PASSWORD, "Password")
.configure(DynamicCluster.INITIAL_SIZE, 3)
- .configure(CouchbaseCluster.CREATE_BUCKETS, (List<Map<String,Object>>)ImmutableList.of(
+ .configure(CouchbaseCluster.CREATE_BUCKETS, ImmutableList.of(
(Map<String,Object>)ImmutableMap.<String, Object>of(
"bucket", "default",
"bucket-ramsize", 100,
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
index 843673f..0f96c87 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
@@ -197,7 +197,7 @@ public abstract class AbstractGeoDnsServiceImpl extends AbstractEntity implement
return;
if (targetEntityProvider instanceof DynamicGroup)
((DynamicGroup) targetEntityProvider).rescanEntities();
- Set<Entity> pool = MutableSet.copyOf(targetEntityProvider instanceof Group ? ((Group)targetEntityProvider).getMembers(): targetEntityProvider.getChildren());
+ Set<Entity> pool = MutableSet.copyOf(targetEntityProvider instanceof Group ? targetEntityProvider.getMembers(): targetEntityProvider.getChildren());
if (log.isDebugEnabled()) log.debug("GeoDns {} refreshing targets, pool now {}", this, pool);
boolean changed = false;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
index 5321c11..913c0cd 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java
@@ -195,7 +195,7 @@ public class NginxClusterIntegrationTest extends BrooklynAppLiveTestSupport {
@SuppressWarnings({ "rawtypes", "unchecked" })
private List<NginxController> findNginxs() {
ImmutableList result = ImmutableList.copyOf(Iterables.filter(app.getManagementContext().getEntityManager().getEntities(), Predicates.instanceOf(NginxController.class)));
- return (List<NginxController>) result;
+ return result;
}
private List<String> findNginxRootUrls() {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9c66fa14/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
index ee38b3c..a488eb9 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
@@ -324,7 +324,7 @@ public abstract class AbstractWebAppFixtureIntegrationTest {
Integer requestCount = entity.getAttribute(WebAppService.REQUEST_COUNT);
log.info("avg-requests="+avgReqs+"; total-requests="+requestCount);
- assertEquals(avgReqs.doubleValue(), (double)desiredMsgsPerSec, 3.0d);
+ assertEquals(avgReqs.doubleValue(), desiredMsgsPerSec, 3.0d);
assertEquals(requestCount.intValue(), preRequestCount+reqsSent.get());
}});