diff --git a/pom.xml b/pom.xml index eed8cd3..7bf63ce 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ maven-compiler-plugin 3.11.0 - 1.8 - 1.8 + 21 + 21 UTF-8 @@ -124,7 +124,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.30 provided diff --git a/src/main/java/eu/roboflax/cloudflare/CloudflareAccess.java b/src/main/java/eu/roboflax/cloudflare/CloudflareAccess.java index 48faa42..5e475b5 100644 --- a/src/main/java/eu/roboflax/cloudflare/CloudflareAccess.java +++ b/src/main/java/eu/roboflax/cloudflare/CloudflareAccess.java @@ -132,7 +132,6 @@ public ExecutorService getThreadPool() { return threadPool; } - public void close( long timeout, TimeUnit unit ) { getRestClient().close(); if ( threadPool != null ) diff --git a/src/main/java/eu/roboflax/cloudflare/CloudflareRequest.java b/src/main/java/eu/roboflax/cloudflare/CloudflareRequest.java index 0edbf9a..06e0c03 100644 --- a/src/main/java/eu/roboflax/cloudflare/CloudflareRequest.java +++ b/src/main/java/eu/roboflax/cloudflare/CloudflareRequest.java @@ -63,9 +63,9 @@ public class CloudflareRequest { * The http request still was successful. If you used a CloudflareCallback for this request then onFailure will be executed. * Otherwise if you have a CloudflareResponse object you can still use .getJson() to retrieve further information. */ - public static final String ERROR_CLOUDFLARE_FAILURE = "Cloudflare was unable to perform your request and couldn't determine the result of the requested/passed information. " + - "Maybe you built the request wrong or something different."; - + public static final String ERROR_CLOUDFLARE_FAILURE = """ + Cloudflare was unable to perform your request and couldn't determine the result of the requested/passed information. \ + Maybe you built the request wrong or something different."""; public CloudflareRequest( ) { } @@ -248,45 +248,39 @@ public CloudflareRequest pagination( Pagination pagination ) { } private HttpResponse sendRequest( ) { - switch ( checkNotNull( httpMethod, ERROR_INVALID_HTTP_METHOD ) ) { - case GET: - return cloudflareAccess.getRestClient() - .get( categoryPath() ) - .queryString( queryStrings ) - .asString(); - case POST: - return cloudflareAccess.getRestClient() - .post( categoryPath() ) - .queryString( queryStrings ) - .body( body.toString() ) - .asString(); - case DELETE: - return cloudflareAccess.getRestClient() - .delete( categoryPath() ) - .queryString( queryStrings ) - .body( body.toString() ) - .asString(); - case PUT: - return cloudflareAccess.getRestClient() - .put( categoryPath() ) - .queryString( queryStrings ) - .body( body.toString() ) - .asString(); - case PATCH: - return cloudflareAccess.getRestClient() - .patch( categoryPath() ) - .queryString( queryStrings ) - .body( body.toString() ) - .asString(); - default: - throw new IllegalStateException( "Should never happen because other http methods are blocked." ); - } + return switch (checkNotNull(httpMethod, ERROR_INVALID_HTTP_METHOD)) { + case GET -> cloudflareAccess.getRestClient() + .get(categoryPath()) + .queryString(queryStrings) + .asString(); + case POST -> cloudflareAccess.getRestClient() + .post(categoryPath()) + .queryString(queryStrings) + .body(body.toString()) + .asString(); + case DELETE -> cloudflareAccess.getRestClient() + .delete(categoryPath()) + .queryString(queryStrings) + .body(body.toString()) + .asString(); + case PUT -> cloudflareAccess.getRestClient() + .put(categoryPath()) + .queryString(queryStrings) + .body(body.toString()) + .asString(); + case PATCH -> cloudflareAccess.getRestClient() + .patch(categoryPath()) + .queryString(queryStrings) + .body(body.toString()) + .asString(); + default -> throw new IllegalStateException("Should never happen because other http methods are blocked."); + }; } private Pair, JsonObject> response( ) { if ( response == null ) { HttpResponse httpResponse = sendRequest(); - JsonElement parsed = new JsonParser().parse( httpResponse.getBody() ); + JsonElement parsed = new JsonParser().parse( httpResponse.body() ); // Check if parsing was successful, gson returns json null if failed if ( parsed.isJsonNull() ) throw new IllegalStateException( ERROR_PARSING_JSON ); diff --git a/src/main/java/eu/roboflax/cloudflare/configuration/CloudflareConfig.java b/src/main/java/eu/roboflax/cloudflare/configuration/CloudflareConfig.java index 626bd2b..337f64f 100644 --- a/src/main/java/eu/roboflax/cloudflare/configuration/CloudflareConfig.java +++ b/src/main/java/eu/roboflax/cloudflare/configuration/CloudflareConfig.java @@ -14,54 +14,44 @@ /** * Configuration for a {@link eu.roboflax.cloudflare.CloudflareAccess} object. */ -@Getter -@Setter -public class CloudflareConfig { - - private String xAuthKey; - private String xAuthEmail; - - private String xAuthToken; - - private ExecutorService threadPool; - private Integer maxThreads; - +public record CloudflareConfig( + @Getter String xAuthKey, + @Getter String xAuthEmail, + @Getter String xAuthToken, + @Getter ExecutorService threadPool, + @Getter Integer maxThreads +) { // // Key + Email auth // - public CloudflareConfig( String xAuthKey, String xAuthEmail ) { - this.xAuthKey = xAuthKey; - this.xAuthEmail = xAuthEmail; + public CloudflareConfig(String xAuthKey, String xAuthEmail) { + this(xAuthKey, xAuthEmail, null, null, null); } - public CloudflareConfig( String xAuthKey, String xAuthEmail, @Nullable Integer maxThreads ) { - this(xAuthKey, xAuthEmail); - this.maxThreads = maxThreads; + public CloudflareConfig(String xAuthKey, String xAuthEmail, @Nullable Integer maxThreads) { + this(xAuthKey, xAuthEmail, null, null, maxThreads); } - public CloudflareConfig( String xAuthKey, String xAuthEmail, @Nullable ExecutorService threadPool ) { - this(xAuthKey, xAuthEmail); - this.threadPool = threadPool; + public CloudflareConfig(String xAuthKey, String xAuthEmail, @Nullable ExecutorService threadPool) { + this(xAuthKey, xAuthEmail, null, threadPool, null); } // // Token auth // - public CloudflareConfig( String xAuthToken ) { - this.xAuthToken = xAuthToken; + public CloudflareConfig(String xAuthToken) { + this(null, null, xAuthToken, null, null); } - public CloudflareConfig( String xAuthToken, @Nullable Integer maxThreads ) { - this(xAuthToken); - this.maxThreads = maxThreads; + public CloudflareConfig(String xAuthToken, @Nullable Integer maxThreads) { + this(null, null, xAuthToken, null, maxThreads); } - public CloudflareConfig( String xAuthToken, @Nullable ExecutorService threadPool ) { - this(xAuthToken); - this.threadPool = threadPool; + public CloudflareConfig(String xAuthToken, @Nullable ExecutorService threadPool) { + this(null, null, xAuthToken, threadPool, null); } /** @@ -70,22 +60,26 @@ public CloudflareConfig( String xAuthToken, @Nullable ExecutorService threadPool * @return the new CloudflareAccess */ public CloudflareAccess createAccess() { - if ( this.xAuthToken != null ) { - if ( this.threadPool != null ) { - return new CloudflareAccess(this.xAuthToken, this.threadPool); + return switch (xAuthToken != null ? 1 : 2) { + case 1 -> { + if (this.threadPool != null) { + yield new CloudflareAccess(this.xAuthToken, this.threadPool); + } + if (this.maxThreads != null) { + yield new CloudflareAccess(this.xAuthToken, this.maxThreads); + } + yield new CloudflareAccess(this.xAuthToken); } - if ( this.maxThreads != null ) { - return new CloudflareAccess(this.xAuthToken, this.maxThreads); + case 2 -> { + if (this.threadPool != null) { + yield new CloudflareAccess(this.xAuthKey, this.xAuthEmail, this.threadPool); + } + if (this.maxThreads != null) { + yield new CloudflareAccess(this.xAuthKey, this.xAuthEmail, this.maxThreads); + } + yield new CloudflareAccess(this.xAuthKey, this.xAuthEmail); } - return new CloudflareAccess(this.xAuthToken); - } - if ( this.threadPool != null ) { - return new CloudflareAccess(this.xAuthKey, this.xAuthEmail, this.threadPool); - } - if ( this.maxThreads != null ) { - return new CloudflareAccess(this.xAuthKey, this.xAuthEmail, this.maxThreads); - } - return new CloudflareAccess(this.xAuthKey, this.xAuthEmail); + default -> throw new IllegalStateException(); + }; } } - diff --git a/src/main/java/eu/roboflax/cloudflare/constants/Category.java b/src/main/java/eu/roboflax/cloudflare/constants/Category.java index 26945cb..c922a6c 100644 --- a/src/main/java/eu/roboflax/cloudflare/constants/Category.java +++ b/src/main/java/eu/roboflax/cloudflare/constants/Category.java @@ -395,8 +395,8 @@ public enum Category { UPDATE_WORKER_ROUTE( PUT, "zones/{id-1}/workers/routes/{id-2}" ), DELETE_WORKER_ROUTE( DELETE, "zones/{id-1}/workers/routes/{id-2}" ); - private HttpMethod httpMethod; - private String additionalPath; + private final HttpMethod httpMethod; + private final String additionalPath; Category( HttpMethod httpMethod, String additionalPath ) { this.httpMethod = httpMethod; diff --git a/src/main/java/eu/roboflax/cloudflare/constants/Match.java b/src/main/java/eu/roboflax/cloudflare/constants/Match.java index 516ff2a..62ad721 100644 --- a/src/main/java/eu/roboflax/cloudflare/constants/Match.java +++ b/src/main/java/eu/roboflax/cloudflare/constants/Match.java @@ -6,5 +6,4 @@ public enum Match { ALL, ANY - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/Identifiable.java b/src/main/java/eu/roboflax/cloudflare/objects/Identifiable.java index 28ce345..cb620d3 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/Identifiable.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/Identifiable.java @@ -9,5 +9,5 @@ */ public interface Identifiable { - String getId( ); + String getId(); } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/ResultInfo.java b/src/main/java/eu/roboflax/cloudflare/objects/ResultInfo.java index 26a08d9..6786106 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/ResultInfo.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/ResultInfo.java @@ -27,11 +27,11 @@ public class ResultInfo { public Integer totalCount; @Override - public String toString( ) { - return new ToStringBuilder( this ) - .append( "page", page ) - .append( "perPage", perPage ) - .append( "count", count ) - .append( "totalCount", totalCount ).toString(); + public String toString() { + return new ToStringBuilder(this) + .append("page", page) + .append("perPage", perPage) + .append("count", count) + .append("totalCount", totalCount).toString(); } -} \ No newline at end of file +} diff --git a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/AccessRule.java b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/AccessRule.java index d082ac7..eb79c45 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/AccessRule.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/AccessRule.java @@ -46,8 +46,7 @@ public class AccessRule implements Identifiable { private String modifiedOn; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "notes", notes ).append( "allowedModes", allowedModes ).append( "Mode", mode ).append( "configuration", configuration ).append( "scope", scope ).append( "createdOn", createdOn ).append( "modifiedOn", modifiedOn ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("notes", notes).append("allowedModes", allowedModes).append("Mode", mode).append("configuration", configuration).append("scope", scope).append("createdOn", createdOn).append("modifiedOn", modifiedOn).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Configuration.java b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Configuration.java index baf45c0..852ac47 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Configuration.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Configuration.java @@ -25,8 +25,7 @@ public class Configuration { private String value; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "target", target ).append( "value", value ).toString(); + public String toString() { + return new ToStringBuilder(this).append("target", target).append("value", value).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Scope.java b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Scope.java index f51bbbe..3c72d04 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Scope.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/accessrule/Scope.java @@ -29,7 +29,7 @@ public class Scope implements Identifiable { private String type; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "email", email ).append( "type", type ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("email", email).append("type", type).toString(); } } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/CustomHostname.java b/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/CustomHostname.java index 1cf8e97..2996d6b 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/CustomHostname.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/CustomHostname.java @@ -2,11 +2,8 @@ import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; - import eu.roboflax.cloudflare.objects.Identifiable; - import java.util.Map; - import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/Type.java b/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/Type.java index e702fbd..69f9c9b 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/Type.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/crypto/customhostname/Type.java @@ -1,5 +1,5 @@ package eu.roboflax.cloudflare.objects.crypto.customhostname; public enum Type { - dv // domain validation + dv; // domain validation } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/dns/DNSRecord.java b/src/main/java/eu/roboflax/cloudflare/objects/dns/DNSRecord.java index 31250e4..f750d46 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/dns/DNSRecord.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/dns/DNSRecord.java @@ -58,20 +58,20 @@ public class DNSRecord implements Identifiable { private Meta meta; @Override - public String toString( ) { - return new ToStringBuilder( this ) - .append( "id", id ) - .append( "type", type ) - .append( "name", name ) - .append( "content", content ) - .append( "proxiable", proxiable ) - .append( "proxied", proxied ) - .append( "ttl", ttl ) - .append( "locked", locked ) - .append( "zoneId", zoneId ) - .append( "zoneName", zoneName ) - .append( "modifiedOn", modifiedOn ) - .append( "createdOn", createdOn ) - .append( "meta", meta ).toString(); + public String toString() { + return new ToStringBuilder(this) + .append("id", id) + .append("type", type) + .append("name", name) + .append("content", content) + .append("proxiable", proxiable) + .append("proxied", proxied) + .append("ttl", ttl) + .append("locked", locked) + .append("zoneId", zoneId) + .append("zoneName", zoneName) + .append("modifiedOn", modifiedOn) + .append("createdOn", createdOn) + .append("meta", meta).toString(); } } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/dns/Meta.java b/src/main/java/eu/roboflax/cloudflare/objects/dns/Meta.java index 72bbd96..eefea83 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/dns/Meta.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/dns/Meta.java @@ -21,10 +21,9 @@ public class Meta { private Boolean managedByApps; @Override - public String toString( ) { - return new ToStringBuilder( this ) - .append( "autoAdded", autoAdded ) - .append( "managedByApps", managedByApps ).toString(); + public String toString() { + return new ToStringBuilder(this) + .append("autoAdded", autoAdded) + .append("managedByApps", managedByApps).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/UserDetails.java b/src/main/java/eu/roboflax/cloudflare/objects/user/UserDetails.java index f7fa74f..18ba02a 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/UserDetails.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/UserDetails.java @@ -53,8 +53,19 @@ public class UserDetails implements Identifiable { private Boolean twoFactorAuthenticationEnabled; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "email", email ).append( "firstName", firstName ).append( "lastName", lastName ).append( "username", username ).append( "telephone", telephone ).append( "country", country ).append( "zipCode", zipCode ).append( "createdOn", createdOn ).append( "modifiedOn", modifiedOn ).append( "twoFactorAuthenticationEnabled", twoFactorAuthenticationEnabled ).toString(); + public String toString() { + return new ToStringBuilder(this) + .append("id", id) + .append("email", email) + .append("firstName", firstName) + .append("lastName", lastName) + .append("username", username) + .append("telephone", telephone) + .append("country", country) + .append("zipCode", zipCode) + .append("createdOn", createdOn) + .append("modifiedOn", modifiedOn) + .append("twoFactorAuthenticationEnabled", twoFactorAuthenticationEnabled) + .toString(); } - -} \ No newline at end of file +} diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/UserOrganization.java b/src/main/java/eu/roboflax/cloudflare/objects/user/UserOrganization.java index 1c3867f..d8397f2 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/UserOrganization.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/UserOrganization.java @@ -37,8 +37,13 @@ public class UserOrganization implements Identifiable { private List roles = null; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "name", name ).append( "Status", status ).append( "permissions", permissions ).append( "roles", roles ).toString(); + public String toString() { + return new ToStringBuilder(this) + .append("id", id) + .append("name", name) + .append("Status", status) + .append("permissions", permissions) + .append("roles", roles) + .toString(); } - -} \ No newline at end of file +} diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/billing/BillingProfile.java b/src/main/java/eu/roboflax/cloudflare/objects/user/billing/BillingProfile.java index 45e0e1c..7453cc5 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/billing/BillingProfile.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/billing/BillingProfile.java @@ -71,7 +71,7 @@ public class BillingProfile implements Identifiable { private String createdOn; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "firstName", firstName ).append( "lastName", lastName ).append( "address", address ).append( "address2", address2 ).append( "company", company ).append( "city", city ).append( "state", state ).append( "zipCode", zipcode ).append( "country", country ).append( "telephone", telephone ).append( "cardNumber", cardNumber ).append( "cardExpiryYear", cardExpiryYear ).append( "cardExpiryMonth", cardExpiryMonth ).append( "vat", vat ).append( "editedOn", editedOn ).append( "createdOn", createdOn ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("firstName", firstName).append("lastName", lastName).append("address", address).append("address2", address2).append("company", company).append("city", city).append("state", state).append("zipCode", zipcode).append("country", country).append("telephone", telephone).append("cardNumber", cardNumber).append("cardExpiryYear", cardExpiryYear).append("cardExpiryMonth", cardExpiryMonth).append("vat", vat).append("editedOn", editedOn).append("createdOn", createdOn).toString(); } } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/invite/Invite.java b/src/main/java/eu/roboflax/cloudflare/objects/user/invite/Invite.java index 7dc8f1a..7a92115 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/invite/Invite.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/invite/Invite.java @@ -52,8 +52,7 @@ public class Invite implements Identifiable { private String status; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "invitedMemberId", invitedMemberId ).append( "invitedMemberEmail", invitedMemberEmail ).append( "organizationId", organizationId ).append( "organizationName", organizationName ).append( "roles", roles ).append( "invitedBy", invitedBy ).append( "invitedOn", invitedOn ).append( "expiresOn", expiresOn ).append( "Status", status ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("invitedMemberId", invitedMemberId).append("invitedMemberEmail", invitedMemberEmail).append("organizationId", organizationId).append("organizationName", organizationName).append("roles", roles).append("invitedBy", invitedBy).append("invitedOn", invitedOn).append("expiresOn", expiresOn).append("Status", status).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/RatePlan.java b/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/RatePlan.java index 11aa8fe..316ae4d 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/RatePlan.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/RatePlan.java @@ -35,8 +35,7 @@ public class RatePlan implements Identifiable { private Boolean externallyManaged; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "publicName", publicName ).append( "currency", currency ).append( "scope", scope ).append( "externallyManaged", externallyManaged ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("publicName", publicName).append("currency", currency).append("scope", scope).append("externallyManaged", externallyManaged).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/Subscription.java b/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/Subscription.java index f8675d2..b33b880 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/Subscription.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/user/subscription/Subscription.java @@ -53,8 +53,7 @@ public class Subscription implements Identifiable { private String currentPeriodStart; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "state", state ).append( "price", price ).append( "currency", currency ).append( "componentValues", componentValues ).append( "zone", zone ).append( "Frequency", frequency ).append( "ratePlan", ratePlan ).append( "currentPeriodEnd", currentPeriodEnd ).append( "currentPeriodStart", currentPeriodStart ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("state", state).append("price", price).append("currency", currency).append("componentValues", componentValues).append("zone", zone).append("Frequency", frequency).append("ratePlan", ratePlan).append("currentPeriodEnd", currentPeriodEnd).append("currentPeriodStart", currentPeriodStart).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/zone/Owner.java b/src/main/java/eu/roboflax/cloudflare/objects/zone/Owner.java index 52efddc..5642236 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/zone/Owner.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/zone/Owner.java @@ -29,8 +29,7 @@ public class Owner implements Identifiable { private String ownerType; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "email", email ).append( "ownerType", ownerType ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("email", email).append("ownerType", ownerType).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/zone/PlanPending.java b/src/main/java/eu/roboflax/cloudflare/objects/zone/PlanPending.java index 8beee2b..bb68b9d 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/zone/PlanPending.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/zone/PlanPending.java @@ -45,7 +45,15 @@ public class PlanPending implements Identifiable { @Override public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "name", name ).append( "price", price ).append( "currency", currency ).append( "Frequency", frequency ).append( "legacyId", legacyId ).append( "isSubscribed", isSubscribed ).append( "canSubscribe", canSubscribe ).toString(); + return new ToStringBuilder( this ) + .append( "id", id ) + .append( "name", name ) + .append( "price", price ) + .append( "currency", currency ) + .append( "Frequency", frequency ) + .append( "legacyId", legacyId ) + .append( "isSubscribed", isSubscribed ) + .append( "canSubscribe", canSubscribe ) + .toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/zone/RatePlan.java b/src/main/java/eu/roboflax/cloudflare/objects/zone/RatePlan.java index 9ff1f05..3e66755 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/zone/RatePlan.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/zone/RatePlan.java @@ -40,8 +40,7 @@ public class RatePlan implements Identifiable { private List components = null; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "name", name ).append( "currency", currency ).append( "duration", duration ).append( "Frequency", frequency ).append( "components", components ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("name", name).append("currency", currency).append("duration", duration).append("Frequency", frequency).append("components", components).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/zone/Zone.java b/src/main/java/eu/roboflax/cloudflare/objects/zone/Zone.java index 7a29f1c..b6e60f7 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/zone/Zone.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/zone/Zone.java @@ -70,8 +70,7 @@ public class Zone implements Identifiable { private String type; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "name", name ).append( "developmentMode", developmentMode ).append( "originalNameServers", originalNameServers ).append( "originalRegistrar", originalRegistrar ).append( "originalDnshost", originalDnshost ).append( "createdOn", createdOn ).append( "modifiedOn", modifiedOn ).append( "nameServers", nameServers ).append( "owner", owner ).append( "permissions", permissions ).append( "plan", plan ).append( "planPending", planPending ).append( "Status", status ).append( "paused", paused ).append( "type", type ).toString(); + public String toString() { + return new ToStringBuilder(this).append("id", id).append("name", name).append("developmentMode", developmentMode).append("originalNameServers", originalNameServers).append("originalRegistrar", originalRegistrar).append("originalDnshost", originalDnshost).append("createdOn", createdOn).append("modifiedOn", modifiedOn).append("nameServers", nameServers).append("owner", owner).append("permissions", permissions).append("plan", plan).append("planPending", planPending).append("Status", status).append("paused", paused).append("type", type).toString(); } - } diff --git a/src/main/java/eu/roboflax/cloudflare/objects/zone/ZoneSetting.java b/src/main/java/eu/roboflax/cloudflare/objects/zone/ZoneSetting.java index 7ff6e00..3da5ad6 100644 --- a/src/main/java/eu/roboflax/cloudflare/objects/zone/ZoneSetting.java +++ b/src/main/java/eu/roboflax/cloudflare/objects/zone/ZoneSetting.java @@ -36,9 +36,7 @@ public class ZoneSetting implements Identifiable { private Map additional; @Override - public String toString( ) { - return new ToStringBuilder( this ).append( "id", id ).append( "modifiedOn", modifiedOn ).append( "editable", editable ).append( "value", value ).append( "additional", additional ).toString(); - + public String toString() { + return new ToStringBuilder(this).append("id", id).append("modifiedOn", modifiedOn).append("editable", editable).append("value", value).append("additional", additional).toString(); } - -} \ No newline at end of file +}