Fixes from code review.
Fix camelCase on variable names and use ${project.version} where appropriate in
pom.
See https://github.com/apache/brooklyn-server/pull/131#discussion-diff-62826490
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/531c2b57
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/531c2b57
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/531c2b57
Branch: refs/heads/master
Commit: 531c2b570c3cc2d6fe5be528109ae975ea76bb99
Parents: bc244af
Author: Geoff Macartney <[email protected]>
Authored: Thu May 12 09:59:26 2016 +0100
Committer: Geoff Macartney <[email protected]>
Committed: Thu May 12 09:59:26 2016 +0100
----------------------------------------------------------------------
.../brooklyn/karaf/commands/cloud/explorer/BlobCommand.java | 4 ++--
.../karaf/commands/cloud/explorer/DefaultTemplateCommand.java | 4 ++--
.../karaf/commands/cloud/explorer/ListContainersCommand.java | 4 ++--
.../karaf/commands/cloud/explorer/ListImagesCommand.java | 4 ++--
.../karaf/commands/cloud/explorer/TerminateInstancesCommand.java | 4 ++--
launcher-common/pom.xml | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/BlobCommand.java
----------------------------------------------------------------------
diff --git
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/BlobCommand.java
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/BlobCommand.java
index abbdf9b..f2504dd 100644
---
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/BlobCommand.java
+++
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/BlobCommand.java
@@ -38,8 +38,8 @@ public class BlobCommand extends AbstractCloudExplorerCommand
{
@Override
public Object execute() throws Exception {
- final GetBlob GetBlob =
+ final GetBlob getBlob =
new GetBlob(getManagementContext(), allLocations, location,
autoConfirm, container, blob);
- return GetBlob.call();
+ return getBlob.call();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/DefaultTemplateCommand.java
----------------------------------------------------------------------
diff --git
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/DefaultTemplateCommand.java
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/DefaultTemplateCommand.java
index ff282a2..6f6e875 100644
---
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/DefaultTemplateCommand.java
+++
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/DefaultTemplateCommand.java
@@ -31,8 +31,8 @@ public class DefaultTemplateCommand extends
AbstractCloudExplorerCommand {
@Override
public Object execute() throws Exception {
- final ComputeDefaultTemplate ComputeDefaultTemplate =
+ final ComputeDefaultTemplate computeDefaultTemplate =
new ComputeDefaultTemplate(getManagementContext(), allLocations,
location, autoConfirm);
- return ComputeDefaultTemplate.call();
+ return computeDefaultTemplate.call();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListContainersCommand.java
----------------------------------------------------------------------
diff --git
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListContainersCommand.java
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListContainersCommand.java
index 40ea1b8..77c0cfe 100644
---
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListContainersCommand.java
+++
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListContainersCommand.java
@@ -31,8 +31,8 @@ public class ListContainersCommand extends
AbstractCloudExplorerCommand {
@Override
public Object execute() throws Exception {
- final BlobstoreListContainers BlobstoreListContainers =
+ final BlobstoreListContainers blobstoreListContainers =
new BlobstoreListContainers(getManagementContext(), allLocations,
location, autoConfirm);
- return BlobstoreListContainers.call();
+ return blobstoreListContainers.call();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListImagesCommand.java
----------------------------------------------------------------------
diff --git
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListImagesCommand.java
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListImagesCommand.java
index 3ee5003..5fed15d 100644
---
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListImagesCommand.java
+++
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/ListImagesCommand.java
@@ -31,7 +31,7 @@ public class ListImagesCommand extends
AbstractCloudExplorerCommand {
@Override
public Object execute() throws Exception {
- final ListImages ListImages = new ListImages(getManagementContext(),
allLocations, location, autoConfirm);
- return ListImages.call();
+ final ListImages listImages = new ListImages(getManagementContext(),
allLocations, location, autoConfirm);
+ return listImages.call();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/TerminateInstancesCommand.java
----------------------------------------------------------------------
diff --git
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/TerminateInstancesCommand.java
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/TerminateInstancesCommand.java
index bdf00c0..d75969b 100644
---
a/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/TerminateInstancesCommand.java
+++
b/karaf/commands/src/main/java/org/apache/brooklyn/karaf/commands/cloud/explorer/TerminateInstancesCommand.java
@@ -40,8 +40,8 @@ public class TerminateInstancesCommand extends
AbstractCloudExplorerCommand {
@Override
public Object execute() throws Exception {
- final TerminateInstances TerminateInstances = new
TerminateInstances(getManagementContext(), allLocations,
+ final TerminateInstances terminateInstances = new
TerminateInstances(getManagementContext(), allLocations,
location, autoConfirm, instanceIds);
- return TerminateInstances.call();
+ return terminateInstances.call();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/531c2b57/launcher-common/pom.xml
----------------------------------------------------------------------
diff --git a/launcher-common/pom.xml b/launcher-common/pom.xml
index fe46c13..43c32b5 100644
--- a/launcher-common/pom.xml
+++ b/launcher-common/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
