From 782cabcd6e70c62b9bc76ac76c5f003766a8ae3d Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Wed, 8 Jun 2016 13:07:22 +0200 Subject: [PATCH 1/6] Added LogDelivery --- .../poppy/v1/domain/CreateService.java | 35 +++++++-- .../poppy/v1/domain/LogDelivery.java | 76 +++++++++++++++++++ .../openstack/poppy/v1/domain/Service.java | 12 ++- 3 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java index e4c885a101..0d2a419f30 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java @@ -59,9 +59,15 @@ public abstract class CreateService { */ public abstract String getFlavorId(); + /** + * @see Builder#logDelivery(LogDelivery) + */ + public abstract LogDelivery getLogDelivery(); + public static Builder builder() { return new AutoValue_CreateService.Builder().caching(null).restrictions(null); } + public Builder toBuilder() { return builder() .name(getName()) @@ -69,19 +75,21 @@ public Builder toBuilder() { .origins(getOrigins()) .caching(getCaching()) .restrictions(getRestrictions()) - .flavorId(getFlavorId()); + .flavorId(getFlavorId()) + .logDelivery(getLogDelivery()); } - @SerializedNames({ "name", "domains", "origins", "caching", "restrictions", "flavor_id" }) + @SerializedNames({ "name", "domains", "origins", "caching", "restrictions", "flavor_id", "log_delivery" }) private static CreateService create(String name, List domains, List origins, List caching, - List restrictions, String flavorId) { + List restrictions, String flavorId, LogDelivery logDelivery) { return builder() .name(name) .domains(domains) .origins(origins) .caching(caching) .restrictions(restrictions) - .flavorId(flavorId).build(); + .flavorId(flavorId) + .logDelivery(logDelivery).build(); } public static final class Builder { @@ -91,6 +99,7 @@ public static final class Builder { private List caching; private List restrictions; private String flavorId; + private LogDelivery logDelivery; Builder() { } Builder(CreateService source) { @@ -100,6 +109,7 @@ public static final class Builder { caching(source.getCaching()); restrictions(source.getRestrictions()); flavorId(source.getFlavorId()); + logDelivery(source.getLogDelivery()); } /** @@ -164,6 +174,17 @@ public Builder flavorId(String flavorId) { return this; } + /** + * Required. + * + * @param logDelivery + * @return The CreateService builder. + */ + public Builder logDelivery(LogDelivery logDelivery) { + this.logDelivery = logDelivery; + return this; + } + public CreateService build() { String missing = ""; if (name == null) { @@ -178,6 +199,9 @@ public CreateService build() { if (flavorId == null) { missing += " flavorId"; } + if (logDelivery == null) { + missing += " logDelivery"; + } if (!missing.isEmpty()) { throw new IllegalStateException("Missing required properties:" + missing); } @@ -187,7 +211,8 @@ public CreateService build() { this.origins, this.caching == null ? null : ImmutableList.copyOf(this.caching), this.restrictions == null ? null : ImmutableList.copyOf(this.restrictions), - this.flavorId); + this.flavorId, + this.logDelivery); return result; } } diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java new file mode 100644 index 0000000000..3275bd562b --- /dev/null +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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 + * + * 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 specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.openstack.poppy.v1.domain; + +import org.jclouds.json.SerializedNames; + +import com.google.auto.value.AutoValue; + +/** + * Representation of an OpenStack Poppy Service Logging. + * + * @author agnello.staibano + */ +@AutoValue +public abstract class LogDelivery { + + /** + * @return Specifies the delivery logging status + */ + public abstract Boolean getEnabled(); + + @SerializedNames({ "enabled" }) + private static LogDelivery create(Boolean enabled) { + return builder().enabled(enabled).build(); + } + + public static Builder builder() { + return new AutoValue_LogDelivery.Builder(); + } + + public Builder toBuilder() { + return builder().enabled(getEnabled()); + } + + public static final class Builder { + private Boolean enabled; + + Builder() { + } + + Builder(LogDelivery source) { + enabled(source.getEnabled()); + } + + public LogDelivery.Builder enabled(Boolean enabled) { + this.enabled = enabled; + return this; + } + + public LogDelivery build() { + String missing = ""; + if (enabled == null) { + missing += " enabled"; + } + if (!missing.isEmpty()) { + throw new IllegalStateException("Missing required properties:" + missing); + } + LogDelivery result = new AutoValue_LogDelivery(this.enabled); + return result; + } + } +} diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/Service.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/Service.java index c42778c960..9c973ad73e 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/Service.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/Service.java @@ -85,11 +85,16 @@ public abstract class Service { */ public abstract Set getLinks(); + /** + * @return Specifies the delivery logging + */ + public abstract LogDelivery getLogDelivery(); + @SerializedNames({ "id", "name", "domains", "origins", "caching", "restrictions", "flavor_id", - "status", "errors", "links" }) + "status", "errors", "links", "log_delivery" }) private static Service create(String id, String name, List domains, List origins, List caching, List restrictions, - String flavorId, ServiceStatus status, List errors, Set links) { + String flavorId, ServiceStatus status, List errors, Set links, LogDelivery logDelivery) { return new AutoValue_Service( id, name, @@ -100,7 +105,8 @@ private static Service create(String id, String name, List domains, flavorId, status, errors != null ? ImmutableList.copyOf(errors) : null, - ImmutableSet.copyOf(links)); + ImmutableSet.copyOf(links), + logDelivery); } public UpdateService.Builder toUpdatableService() { From ce410f4ab5f8cb1c4c99ce7b0182919341c9b380 Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Wed, 8 Jun 2016 19:04:22 +0200 Subject: [PATCH 2/6] Added LogDelivery and updated tests --- .../jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java | 2 ++ .../jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java index 9abf2b3fd9..ee3ce6d67d 100644 --- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java +++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java @@ -27,6 +27,7 @@ import org.jclouds.openstack.poppy.v1.domain.Caching; import org.jclouds.openstack.poppy.v1.domain.CreateService; import org.jclouds.openstack.poppy.v1.domain.Domain; +import org.jclouds.openstack.poppy.v1.domain.LogDelivery; import org.jclouds.openstack.poppy.v1.domain.Origin; import org.jclouds.openstack.poppy.v1.domain.Restriction; import org.jclouds.openstack.poppy.v1.domain.RestrictionRule; @@ -74,6 +75,7 @@ public void testCreateUpdateAndDeleteService() { .build())).build())) .caching(ImmutableList.of(Caching.builder().name("default").ttl(3600).build())) .flavorId(flavorApi.list().first().get().getId()) + .logDelivery(LogDelivery.builder().enabled(Boolean.FALSE).build()) .build() ); diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java index f634386f62..68b5723916 100644 --- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java +++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java @@ -31,6 +31,7 @@ import org.jclouds.openstack.poppy.v1.domain.Caching; import org.jclouds.openstack.poppy.v1.domain.CreateService; import org.jclouds.openstack.poppy.v1.domain.Domain; +import org.jclouds.openstack.poppy.v1.domain.LogDelivery; import org.jclouds.openstack.poppy.v1.domain.Origin; import org.jclouds.openstack.poppy.v1.domain.Restriction; import org.jclouds.openstack.poppy.v1.domain.RestrictionRule; @@ -78,6 +79,7 @@ public void testCreateService() throws Exception { .caching(ImmutableList.of( Caching.builder().name("default").ttl(3600).build())) .flavorId("cdn") + .logDelivery(LogDelivery.builder().enabled(Boolean.FALSE).build()) .build(); URI uri = api.create(options); From 993aa263ce2ec590222d051fe0c186889c29638e Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Wed, 8 Jun 2016 19:11:51 +0200 Subject: [PATCH 3/6] Added LogDelivery and updated tests, removed @author --- .../java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java index 3275bd562b..8b67a4cda7 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java @@ -22,8 +22,6 @@ /** * Representation of an OpenStack Poppy Service Logging. - * - * @author agnello.staibano */ @AutoValue public abstract class LogDelivery { From 7fb867a408a73af5819b9ed5bdc9e27f6e4e5310 Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Wed, 8 Jun 2016 19:23:26 +0200 Subject: [PATCH 4/6] Added LogDelivery and updated tests, removed author --- .../src/test/resources/poppy_service_get_response.json | 4 ++++ .../resources/poppy_service_list_response_paged1.json | 8 ++++++++ .../resources/poppy_service_list_response_paged2.json | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/openstack-poppy/src/test/resources/poppy_service_get_response.json b/openstack-poppy/src/test/resources/poppy_service_get_response.json index 3e6ead9fcc..f8930530b7 100644 --- a/openstack-poppy/src/test/resources/poppy_service_get_response.json +++ b/openstack-poppy/src/test/resources/poppy_service_get_response.json @@ -53,6 +53,10 @@ } ], "flavor_id": "cdn", + "log_delivery": + { + "enabled": false + }, "status": "deployed", "errors": [], "links": [ diff --git a/openstack-poppy/src/test/resources/poppy_service_list_response_paged1.json b/openstack-poppy/src/test/resources/poppy_service_list_response_paged1.json index 44dcfca6e4..d1dcfe5c9c 100644 --- a/openstack-poppy/src/test/resources/poppy_service_list_response_paged1.json +++ b/openstack-poppy/src/test/resources/poppy_service_list_response_paged1.json @@ -63,6 +63,10 @@ } ], "flavor_id": "asia", + "log_delivery": + { + "enabled": false + }, "status": "deployed", "errors" : [], "links": [ @@ -115,6 +119,10 @@ "restrictions": [ ], "flavor_id": "europe", + "log_delivery": + { + "enabled": false + }, "status": "deployed", "links": [ { diff --git a/openstack-poppy/src/test/resources/poppy_service_list_response_paged2.json b/openstack-poppy/src/test/resources/poppy_service_list_response_paged2.json index 0edcbce1d4..bc580f389b 100644 --- a/openstack-poppy/src/test/resources/poppy_service_list_response_paged2.json +++ b/openstack-poppy/src/test/resources/poppy_service_list_response_paged2.json @@ -59,6 +59,10 @@ } ], "flavor_id": "asia", + "log_delivery": + { + "enabled": false + }, "status": "deployed", "errors" : [], "links": [ @@ -111,6 +115,10 @@ "restrictions": [ ], "flavor_id": "europe", + "log_delivery": + { + "enabled": false + }, "status": "deployed", "links": [ { From 7c9f2eed21802e0cc7d745ae6aeec273f4319dc8 Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Wed, 8 Jun 2016 19:31:37 +0200 Subject: [PATCH 5/6] Added LogDelivery and updated tests, removed author --- .../src/test/resources/poppy_service_create_request.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openstack-poppy/src/test/resources/poppy_service_create_request.json b/openstack-poppy/src/test/resources/poppy_service_create_request.json index f84c47a5c2..1f745ba142 100644 --- a/openstack-poppy/src/test/resources/poppy_service_create_request.json +++ b/openstack-poppy/src/test/resources/poppy_service_create_request.json @@ -32,5 +32,9 @@ "ttl": 3600 } ], - "flavor_id": "cdn" + "flavor_id": "cdn", + "log_delivery": + { + "enabled": false + } } From 2f1cc41a209b5f77925bad20212924d3b338acb2 Mon Sep 17 00:00:00 2001 From: Agnello Staibano Date: Sat, 18 Jun 2016 23:56:05 +0200 Subject: [PATCH 6/6] Changed type to primitive since not nullable --- .../openstack/poppy/v1/domain/LogDelivery.java | 15 ++++----------- .../poppy/v1/features/ServiceApiLiveTest.java | 2 +- .../poppy/v1/features/ServiceApiMockTest.java | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java index 8b67a4cda7..79a8b9685d 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/LogDelivery.java @@ -29,10 +29,10 @@ public abstract class LogDelivery { /** * @return Specifies the delivery logging status */ - public abstract Boolean getEnabled(); + public abstract boolean getEnabled(); @SerializedNames({ "enabled" }) - private static LogDelivery create(Boolean enabled) { + private static LogDelivery create(boolean enabled) { return builder().enabled(enabled).build(); } @@ -45,7 +45,7 @@ public Builder toBuilder() { } public static final class Builder { - private Boolean enabled; + private boolean enabled; Builder() { } @@ -54,19 +54,12 @@ public static final class Builder { enabled(source.getEnabled()); } - public LogDelivery.Builder enabled(Boolean enabled) { + public LogDelivery.Builder enabled(boolean enabled) { this.enabled = enabled; return this; } public LogDelivery build() { - String missing = ""; - if (enabled == null) { - missing += " enabled"; - } - if (!missing.isEmpty()) { - throw new IllegalStateException("Missing required properties:" + missing); - } LogDelivery result = new AutoValue_LogDelivery(this.enabled); return result; } diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java index ee3ce6d67d..0c75a80674 100644 --- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java +++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiLiveTest.java @@ -75,7 +75,7 @@ public void testCreateUpdateAndDeleteService() { .build())).build())) .caching(ImmutableList.of(Caching.builder().name("default").ttl(3600).build())) .flavorId(flavorApi.list().first().get().getId()) - .logDelivery(LogDelivery.builder().enabled(Boolean.FALSE).build()) + .logDelivery(LogDelivery.builder().enabled(false).build()) .build() ); diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java index 68b5723916..70d75ba240 100644 --- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java +++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java @@ -79,7 +79,7 @@ public void testCreateService() throws Exception { .caching(ImmutableList.of( Caching.builder().name("default").ttl(3600).build())) .flavorId("cdn") - .logDelivery(LogDelivery.builder().enabled(Boolean.FALSE).build()) + .logDelivery(LogDelivery.builder().enabled(false).build()) .build(); URI uri = api.create(options);