You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/01/08 14:52:33 UTC
[12/50] [abbrv] jclouds git commit: Added ID to the LoadBalancer
entity
Added ID to the LoadBalancer entity
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3b9609f2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3b9609f2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3b9609f2
Branch: refs/heads/master
Commit: 3b9609f2d546b43a305d01c9517f69a5e50588ac
Parents: 3d27423
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Apr 25 12:44:13 2017 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Apr 26 00:13:02 2017 +0200
----------------------------------------------------------------------
.../azurecompute/arm/domain/LoadBalancer.java | 51 +++++++++++++-------
.../arm/features/LoadBalancerApiLiveTest.java | 10 ++--
.../arm/features/LoadBalancerApiMockTest.java | 9 +++-
3 files changed, 48 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3b9609f2/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java
index d313e36..6e3e748 100644
--- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java
+++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java
@@ -26,25 +26,42 @@ import com.google.common.collect.ImmutableMap;
@AutoValue
public abstract class LoadBalancer {
- @Nullable
- public abstract String name();
+
+ @Nullable public abstract String id();
+ @Nullable public abstract String name();
+ @Nullable public abstract String location();
+ @Nullable public abstract String etag();
+ @Nullable public abstract Map<String, String> tags();
+ @Nullable public abstract LoadBalancerProperties properties();
- @Nullable
- public abstract String location();
-
- @Nullable
- public abstract Map<String, String> tags();
-
- @Nullable
- public abstract LoadBalancerProperties properties();
+ @SerializedNames({ "id", "name", "location", "etag", "tags", "properties", })
+ public static LoadBalancer create(String id, final String name, final String location, final String etag,
+ final Map<String, String> tags, final LoadBalancerProperties properties) {
+ return builder().id(id).name(name).location(location).etag(etag).tags(tags).properties(properties).build();
+ }
+
+ public abstract Builder toBuilder();
- @Nullable
- public abstract String etag();
+ public static Builder builder() {
+ return new AutoValue_LoadBalancer.Builder();
+ }
+
+ @AutoValue.Builder
+ public abstract static class Builder {
+ public abstract Builder id(String id);
+ public abstract Builder name(String name);
+ public abstract Builder location(String location);
+ public abstract Builder etag(String etag);
+ public abstract Builder tags(Map<String, String> tags);
+ public abstract Builder properties(LoadBalancerProperties properties);
+
+ abstract Map<String, String> tags();
- @SerializedNames({ "name", "location", "tags", "properties", "etag" })
- public static LoadBalancer create(final String name, final String location, final Map<String, String> tags,
- final LoadBalancerProperties properties, final String etag) {
- return new AutoValue_LoadBalancer(name, location, tags == null ? null : ImmutableMap.copyOf(tags), properties,
- etag);
+ abstract LoadBalancer autoBuild();
+
+ public LoadBalancer build() {
+ tags(tags() != null ? ImmutableMap.copyOf(tags()) : null);
+ return autoBuild();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3b9609f2/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java
index d267912..c5b836b 100644
--- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java
+++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java
@@ -326,9 +326,13 @@ public class LoadBalancerApiLiveTest extends BaseComputeServiceContextLiveTest {
.builder().build();
FrontendIPConfigurations frontendIPConfigurations = FrontendIPConfigurations.create("ipConfigs", null,
frontendIPConfigurationsProperties, null);
- return LoadBalancer.create(lbName, locationName, null,
- LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
- .build(), null);
+ return LoadBalancer
+ .builder()
+ .name(lbName)
+ .location(locationName)
+ .properties(
+ LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
+ .build()).build();
}
private void assertResourceDeleted(final URI uri) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3b9609f2/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java
index 49e88db..45663ea 100644
--- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java
+++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java
@@ -149,7 +149,12 @@ public class LoadBalancerApiMockTest extends BaseAzureComputeApiMockTest {
.builder().build();
FrontendIPConfigurations frontendIPConfigurations = FrontendIPConfigurations.create("ipConfigs", null,
frontendIPConfigurationsProperties, null);
- return LoadBalancer.create(lbName, "westus", null, LoadBalancerProperties.builder()
- .frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations)).build(), null);
+ return LoadBalancer
+ .builder()
+ .name(lbName)
+ .location("westus")
+ .properties(
+ LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
+ .build()).build();
}
}