From 51a73e76dc409ab1f09694ed9eb5ed2a970c7001 Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Tue, 2 Apr 2013 19:23:40 -0500 Subject: [PATCH] Fixed pluralization, Javadoc, Nullable, and static import stuff. --- .../v1/domain/CreateLoadBalancer.java | 6 ++--- .../v1/domain/Metadata.java | 10 ++++---- .../v1/domain/UpdateLoadBalancer.java | 23 ++++++++++--------- .../v1/domain/UpdateNode.java | 3 ++- .../v1/domain/internal/BaseLoadBalancer.java | 8 +++---- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java index cbeb319932..5ca02614be 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java @@ -168,7 +168,7 @@ public class CreateLoadBalancer extends BaseLoadBalancer addNodes) { - this.nodes = ImmutableSet. copyOf(checkNotNull(addNodes, "nodes")); + this.nodes = ImmutableSet. copyOf(checkNotNull(addNodes, "addNodes")); return this; } @@ -176,8 +176,8 @@ public class CreateLoadBalancer extends BaseLoadBalancer { - private final Map metadata = Maps.newHashMap(); - private final Map keyToId = Maps.newHashMap(); + private final Map metadata = newHashMap(); + private final Map keyToId = newHashMap(); public Metadata(Metadata metadata) { super(); @@ -58,6 +58,6 @@ public class Metadata extends ForwardingMap { } public Iterable getIds() { - return Sets.newHashSet(keyToId.values()); + return newHashSet(keyToId.values()); } } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java index bfee9c1a8b..a6152af62c 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java @@ -1,23 +1,24 @@ /** * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file + * contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. jclouds licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm; @@ -36,9 +37,9 @@ public class UpdateLoadBalancer { private final Algorithm algorithm; private final Integer timeout; private final Boolean halfClosed; - - protected UpdateLoadBalancer(String name, String protocol, Integer port, Algorithm algorithm, Integer timeout, - Boolean halfClosed) { + + protected UpdateLoadBalancer(@Nullable String name, @Nullable String protocol, @Nullable Integer port, + @Nullable Algorithm algorithm, @Nullable Integer timeout, @Nullable Boolean halfClosed) { this.name = name; this.protocol = protocol; this.port = port; @@ -154,7 +155,7 @@ public class UpdateLoadBalancer { this.halfClosed = halfClosed; return this; } - + public UpdateLoadBalancer build() { return new UpdateLoadBalancer(name, protocol, port, algorithm, timeout, halfClosed); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java index 3b1fbf1aa1..6b16df3ee5 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java @@ -18,6 +18,7 @@ */ package org.jclouds.rackspace.cloudloadbalancers.v1.domain; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Type; @@ -35,7 +36,7 @@ public class UpdateNode { private final Type type; private final Integer weight; - protected UpdateNode(Condition condition, Type type, Integer weight) { + protected UpdateNode(@Nullable Condition condition, @Nullable Type type, @Nullable Integer weight) { this.condition = condition; this.type = type; this.weight = weight; diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java index cfad3a20cc..90c6e5ec62 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java @@ -29,7 +29,7 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence; -import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; +import org.jclouds.rackspace.cloudloadbalancers.v1.features.ReportApi; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -261,7 +261,7 @@ public class BaseLoadBalancer, T extends BaseLoadBalancer< /** * Required. Protocol of the service which is being load balanced. * - * @see LoadBalancerApi#listProtocols() + * @see ReportApi#listProtocols() */ public Builder protocol(String protocol) { this.protocol = protocol; @@ -269,8 +269,8 @@ public class BaseLoadBalancer, T extends BaseLoadBalancer< } /** - * Required if the protocol being used is not in LoadBalancerApi#listProtocols() or the protocol is in - * LoadBalancerApi#listProtocols() but port=0. Port number for the service you are load balancing. + * Required if the protocol being used is not in {@link ReportApi#listProtocols()} or the protocol is in + * {@link ReportApi#listProtocols()} but port=0. Port number for the service you are load balancing. */ public Builder port(@Nullable Integer port) { this.port = port;