You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/04/04 04:58:09 UTC
[1/3] git commit: Fixes checkstyle violations in neutron.
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/1.7.x de13c203b -> 3fa28287c
Fixes checkstyle violations in neutron.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/bacfdc94
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/bacfdc94
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/bacfdc94
Branch: refs/heads/1.7.x
Commit: bacfdc9470f65b7b893f81518ef151f55a42f70c
Parents: de13c20
Author: Zack Shoylev <za...@rackspace.com>
Authored: Thu Mar 27 18:24:05 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Apr 3 21:55:39 2014 -0500
----------------------------------------------------------------------
.../jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java | 2 +-
.../java/org/jclouds/openstack/neutron/v2_0/domain/Router.java | 2 +-
.../org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java | 2 +-
.../openstack/neutron/v2_0/options/CreateRouterOptions.java | 2 +-
.../openstack/neutron/v2_0/options/UpdateRouterOptions.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bacfdc94/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
index 884f270..67b2a17 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
@@ -73,7 +73,7 @@ public class ExternalGatewayInfo {
return new ConcreteBuilder().fromExternalGatewayInfo(this);
}
- public static abstract class Builder {
+ public abstract static class Builder {
protected abstract Builder self();
protected String networkId;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bacfdc94/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
index ca36a6e..084be1d 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
@@ -99,7 +99,7 @@ public class Router extends ReferenceWithName {
return new ConcreteBuilder().fromRouter(this);
}
- public static abstract class Builder<T extends Builder<T>> extends ReferenceWithName.Builder<T> {
+ public abstract static class Builder<T extends Builder<T>> extends ReferenceWithName.Builder<T> {
protected Boolean adminStateUp;
protected State state;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bacfdc94/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
index 2601445..271b22b 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
@@ -86,7 +86,7 @@ public class RouterInterface {
return new ConcreteBuilder().fromRouterInterface(this);
}
- public static abstract class Builder {
+ public abstract static class Builder {
protected abstract Builder self();
protected String subnetId;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bacfdc94/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
index 17f3f82..dbb114a 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
@@ -43,7 +43,7 @@ public class CreateRouterOptions implements MapBinder {
return new ConcreteBuilder().fromCreateRouterOptions(this);
}
- public static abstract class Builder<T extends Builder<T>> {
+ public abstract static class Builder<T extends Builder<T>> {
protected abstract T self();
protected String name;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bacfdc94/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
index 378296c..8ac41af 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
@@ -43,7 +43,7 @@ public class UpdateRouterOptions implements MapBinder {
return new ConcreteBuilder().fromUpdateRouterOptions(this);
}
- public static abstract class Builder<T extends Builder<T>> {
+ public abstract static class Builder<T extends Builder<T>> {
protected abstract T self();
protected String name;
[3/3] git commit: Missing 1.7.x checkstyle fixes
Posted by za...@apache.org.
Missing 1.7.x checkstyle fixes
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/3fa28287
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/3fa28287
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/3fa28287
Branch: refs/heads/1.7.x
Commit: 3fa28287c1273b3f1d978c6ad429e712e658726a
Parents: 76dbac8
Author: Zack Shoylev <za...@rackspace.com>
Authored: Thu Apr 3 17:48:35 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Apr 3 21:55:42 2014 -0500
----------------------------------------------------------------------
.../jclouds/openstack/swift/v1/features/ContainerApiMockTest.java | 2 --
.../rackspace/cloudfiles/v1/options/CreateContainerOptions.java | 2 --
.../rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java | 2 +-
.../rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/3fa28287/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
index a595686..bdbee64 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
@@ -26,14 +26,12 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_RE
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.util.Map;
import java.util.Map.Entry;
import org.jclouds.blobstore.ContainerNotFoundException;
-import org.jclouds.openstack.swift.v1.CopyObjectException;
import org.jclouds.openstack.swift.v1.SwiftApi;
import org.jclouds.openstack.swift.v1.domain.Container;
import org.jclouds.openstack.swift.v1.options.CreateContainerOptions;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/3fa28287/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/CreateContainerOptions.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/CreateContainerOptions.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/CreateContainerOptions.java
index 2a9a18d..6ccbe61 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/CreateContainerOptions.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/CreateContainerOptions.java
@@ -22,8 +22,6 @@ import static org.jclouds.openstack.swift.v1.reference.SwiftHeaders.CONTAINER_VE
import java.util.Map;
import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders;
-import org.jclouds.openstack.swift.v1.domain.Container;
-import org.jclouds.openstack.swift.v1.features.ContainerApi;
/**
* Options for creating a {@link Container}.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/3fa28287/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
index 3e450fd..f5db6b6 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
@@ -163,7 +163,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
}
}
- private static final void assertCDNContainerNotNull(CDNContainer container) {
+ private static void assertCDNContainerNotNull(CDNContainer container) {
assertNotNull(container);
assertNotNull(container.getName());
assertNotNull(container.getTtl());
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/3fa28287/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
index 18cd36c..2a6d859 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
@@ -402,7 +402,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
}
}
- private static final void assertCDNContainerNotNull(CDNContainer container) {
+ private static void assertCDNContainerNotNull(CDNContainer container) {
assertNotNull(container.getName());
assertNotNull(container.isEnabled());
assertNotNull(container.isLogRetentionEnabled());
[2/3] git commit: Fixes more checkstyle violations.
Posted by za...@apache.org.
Fixes more checkstyle violations.
Conflicts not merged from master.
Conflicts:
rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java
rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java
rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java
rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java
rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java
rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java
rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java
rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/76dbac8d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/76dbac8d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/76dbac8d
Branch: refs/heads/1.7.x
Commit: 76dbac8dad5d7aae2b13e2981f5ac855aa6eec12
Parents: bacfdc9
Author: Zack Shoylev <za...@rackspace.com>
Authored: Fri Mar 28 17:30:03 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Apr 3 21:55:40 2014 -0500
----------------------------------------------------------------------
.../java/org/jclouds/openstack/swift/v1/features/ObjectApi.java | 1 -
.../jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/76dbac8d/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
index 02c37bc..e56de7d 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
@@ -39,7 +39,6 @@ import org.jclouds.http.options.GetOptions;
import org.jclouds.io.Payload;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
-import org.jclouds.openstack.swift.v1.CopyObjectException;
import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindObjectMetadataToHeaders;
import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindRemoveObjectMetadataToHeaders;
import org.jclouds.openstack.swift.v1.binders.SetPayload;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/76dbac8d/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
index 33e824b..672481e 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
@@ -28,7 +28,6 @@ import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
/**
* Auto Scale ScalingPolicy. This class is used for requests.