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 2013/11/14 12:23:10 UTC

[07/13] Fix code style of the cloudsigma2 provider.

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/PaginatedCollection.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/PaginatedCollection.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/PaginatedCollection.java
index ec4f718..6061240 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/PaginatedCollection.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/PaginatedCollection.java
@@ -27,32 +27,32 @@ import java.util.Iterator;
  */
 public class PaginatedCollection<T> extends IterableWithMarker<T> {
 
-    private Iterable<T> objects;
-    private PaginationOptions paginationOptions;
-
-    public PaginatedCollection(Iterable<T> objects, PaginationOptions paginationOptions) {
-        this.objects = objects;
-        this.paginationOptions = paginationOptions;
-    }
-
-    @Override
-    public Optional<Object> nextMarker() {
-        if(paginationOptions.getLimit() == 0){
-            return Optional.absent();
-        }
-
-        if(paginationOptions.getTotalCount() - paginationOptions.getOffset() > paginationOptions.getLimit()){
-            return Optional.of((Object) new PaginationOptions.Builder()
-                    .limit(paginationOptions.getLimit())
-                    .offset(paginationOptions.getOffset() + paginationOptions.getLimit())
-                    .build());
-        }
-
-        return Optional.absent();
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-        return objects.iterator();
-    }
+   private Iterable<T> objects;
+   private PaginationOptions paginationOptions;
+
+   public PaginatedCollection(Iterable<T> objects, PaginationOptions paginationOptions) {
+      this.objects = objects;
+      this.paginationOptions = paginationOptions;
+   }
+
+   @Override
+   public Optional<Object> nextMarker() {
+      if (paginationOptions.getLimit() == 0) {
+         return Optional.absent();
+      }
+
+      if (paginationOptions.getTotalCount() - paginationOptions.getOffset() > paginationOptions.getLimit()) {
+         return Optional.of((Object) new PaginationOptions.Builder()
+               .limit(paginationOptions.getLimit())
+               .offset(paginationOptions.getOffset() + paginationOptions.getLimit())
+               .build());
+      }
+
+      return Optional.absent();
+   }
+
+   @Override
+   public Iterator<T> iterator() {
+      return objects.iterator();
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Price.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Price.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Price.java
index 4a18f2e..4e19a21 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Price.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Price.java
@@ -24,197 +24,197 @@ import java.math.BigInteger;
  */
 public class Price {
 
-    public static class Builder{
-        private String currency;
-        private String id;
-        private Integer level;
-        private BigInteger multiplier;
-        private double price;
-        private SubscriptionResource resource;
-        private String unit;
-
-        /**
-         * @param currency The currency of the price
-         * Price Builder
-         */
-        public Builder currency(String currency) {
-            this.currency = currency;
-            return this;
-        }
-
-        /**
-         * @param id Unique identificator
-         * Price Builder
-         */
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        /**
-         * @param level The burst level the price applies to
-         * Price Builder
-         */
-        public Builder level(int level) {
-            this.level = level;
-            return this;
-        }
-
-        /**
-         * @param multiplier The multiplier applied to get the price of one unit per second, from the unit of the price
-         * Price Builder
-         */
-        public Builder multiplier(BigInteger multiplier) {
-            this.multiplier = multiplier;
-            return this;
-        }
-
-        /**
-         * @param price Price
-         * Price Builder
-         */
-        public Builder price(double price) {
-            this.price = price;
-            return this;
-        }
-
-        /**
-         * @param resource The resource the price applies to
-         * Price Builder
-         */
-        public Builder resource(SubscriptionResource resource) {
-            this.resource = resource;
-            return this;
-        }
-
-        /**
-         * @param unit The unit of the price
-         * Price Builder
-         */
-        public Builder unit(String unit) {
-            this.unit = unit;
-            return this;
-        }
-
-        public Price build(){
-            return new Price(currency, id, level, multiplier, price, resource, unit);
-        }
-    }
-
-    private final String currency;
-    private final String id;
-    private final Integer level;
-    private final BigInteger multiplier;
-    private final double price;
-    private final SubscriptionResource resource;
-    private final String unit;
-
-    @ConstructorProperties({
-            "currency", "id", "level", "multiplier", "price", "resource", "unit"
-    })
-    public Price(String currency, String id, Integer level, BigInteger multiplier, double price
-            , SubscriptionResource resource, String unit) {
-        this.currency = currency;
-        this.id = id;
-        this.level = level;
-        this.multiplier = multiplier;
-        this.price = price;
-        this.resource = resource;
-        this.unit = unit;
-    }
-
-    /**
-     * @return The currency of the price
-     */
-    public String getCurrency() {
-        return currency;
-    }
-
-    /**
-     * @return Unique identificator
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @return The burst level the price applies to
-     */
-    public Integer getLevel() {
-        return level;
-    }
-
-    /**
-     * @return The multiplier applied to get the price of one unit per second, from the unit of the price
-     */
-    public BigInteger getMultiplier() {
-        return multiplier;
-    }
-
-    /**
-     * @return Price
-     */
-    public double getPrice() {
-        return price;
-    }
-
-    /**
-     * @return The resource the price applies to
-     */
-    public SubscriptionResource getResource() {
-        return resource;
-    }
-
-    /**
-     * @return The unit of the price
-     */
-    public String getUnit() {
-        return unit;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Price)) return false;
-
-        Price price1 = (Price) o;
-
-        if (Double.compare(price1.price, price) != 0) return false;
-        if (currency != null ? !currency.equals(price1.currency) : price1.currency != null) return false;
-        if (id != null ? !id.equals(price1.id) : price1.id != null) return false;
-        if (level != null ? !level.equals(price1.level) : price1.level != null) return false;
-        if (multiplier != null ? !multiplier.equals(price1.multiplier) : price1.multiplier != null) return false;
-        if (resource != price1.resource) return false;
-        if (unit != null ? !unit.equals(price1.unit) : price1.unit != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result;
-        long temp;
-        result = currency != null ? currency.hashCode() : 0;
-        result = 31 * result + (id != null ? id.hashCode() : 0);
-        result = 31 * result + (level != null ? level.hashCode() : 0);
-        result = 31 * result + (multiplier != null ? multiplier.hashCode() : 0);
-        temp = Double.doubleToLongBits(price);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (resource != null ? resource.hashCode() : 0);
-        result = 31 * result + (unit != null ? unit.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "currency='" + currency + '\'' +
-                ", id='" + id + '\'' +
-                ", level=" + level +
-                ", multiplier=" + multiplier +
-                ", price='" + price + '\'' +
-                ", resource=" + resource +
-                ", unit='" + unit + '\'' +
-                "]";
-    }
+   public static class Builder {
+      private String currency;
+      private String id;
+      private Integer level;
+      private BigInteger multiplier;
+      private double price;
+      private SubscriptionResource resource;
+      private String unit;
+
+      /**
+       * @param currency The currency of the price
+       *                 Price Builder
+       */
+      public Builder currency(String currency) {
+         this.currency = currency;
+         return this;
+      }
+
+      /**
+       * @param id Unique identificator
+       *           Price Builder
+       */
+      public Builder id(String id) {
+         this.id = id;
+         return this;
+      }
+
+      /**
+       * @param level The burst level the price applies to
+       *              Price Builder
+       */
+      public Builder level(int level) {
+         this.level = level;
+         return this;
+      }
+
+      /**
+       * @param multiplier The multiplier applied to get the price of one unit per second, from the unit of the price
+       *                   Price Builder
+       */
+      public Builder multiplier(BigInteger multiplier) {
+         this.multiplier = multiplier;
+         return this;
+      }
+
+      /**
+       * @param price Price
+       *              Price Builder
+       */
+      public Builder price(double price) {
+         this.price = price;
+         return this;
+      }
+
+      /**
+       * @param resource The resource the price applies to
+       *                 Price Builder
+       */
+      public Builder resource(SubscriptionResource resource) {
+         this.resource = resource;
+         return this;
+      }
+
+      /**
+       * @param unit The unit of the price
+       *             Price Builder
+       */
+      public Builder unit(String unit) {
+         this.unit = unit;
+         return this;
+      }
+
+      public Price build() {
+         return new Price(currency, id, level, multiplier, price, resource, unit);
+      }
+   }
+
+   private final String currency;
+   private final String id;
+   private final Integer level;
+   private final BigInteger multiplier;
+   private final double price;
+   private final SubscriptionResource resource;
+   private final String unit;
+
+   @ConstructorProperties({
+         "currency", "id", "level", "multiplier", "price", "resource", "unit"
+   })
+   public Price(String currency, String id, Integer level, BigInteger multiplier, double price
+         , SubscriptionResource resource, String unit) {
+      this.currency = currency;
+      this.id = id;
+      this.level = level;
+      this.multiplier = multiplier;
+      this.price = price;
+      this.resource = resource;
+      this.unit = unit;
+   }
+
+   /**
+    * @return The currency of the price
+    */
+   public String getCurrency() {
+      return currency;
+   }
+
+   /**
+    * @return Unique identificator
+    */
+   public String getId() {
+      return id;
+   }
+
+   /**
+    * @return The burst level the price applies to
+    */
+   public Integer getLevel() {
+      return level;
+   }
+
+   /**
+    * @return The multiplier applied to get the price of one unit per second, from the unit of the price
+    */
+   public BigInteger getMultiplier() {
+      return multiplier;
+   }
+
+   /**
+    * @return Price
+    */
+   public double getPrice() {
+      return price;
+   }
+
+   /**
+    * @return The resource the price applies to
+    */
+   public SubscriptionResource getResource() {
+      return resource;
+   }
+
+   /**
+    * @return The unit of the price
+    */
+   public String getUnit() {
+      return unit;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Price)) return false;
+
+      Price price1 = (Price) o;
+
+      if (Double.compare(price1.price, price) != 0) return false;
+      if (currency != null ? !currency.equals(price1.currency) : price1.currency != null) return false;
+      if (id != null ? !id.equals(price1.id) : price1.id != null) return false;
+      if (level != null ? !level.equals(price1.level) : price1.level != null) return false;
+      if (multiplier != null ? !multiplier.equals(price1.multiplier) : price1.multiplier != null) return false;
+      if (resource != price1.resource) return false;
+      if (unit != null ? !unit.equals(price1.unit) : price1.unit != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result;
+      long temp;
+      result = currency != null ? currency.hashCode() : 0;
+      result = 31 * result + (id != null ? id.hashCode() : 0);
+      result = 31 * result + (level != null ? level.hashCode() : 0);
+      result = 31 * result + (multiplier != null ? multiplier.hashCode() : 0);
+      temp = Double.doubleToLongBits(price);
+      result = 31 * result + (int) (temp ^ (temp >>> 32));
+      result = 31 * result + (resource != null ? resource.hashCode() : 0);
+      result = 31 * result + (unit != null ? unit.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "currency='" + currency + '\'' +
+            ", id='" + id + '\'' +
+            ", level=" + level +
+            ", multiplier=" + multiplier +
+            ", price='" + price + '\'' +
+            ", resource=" + resource +
+            ", unit='" + unit + '\'' +
+            "]";
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Pricing.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Pricing.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Pricing.java
index b87a5ed..162f825 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Pricing.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Pricing.java
@@ -26,84 +26,84 @@ import java.util.List;
  */
 public class Pricing {
 
-    public static class Builder{
-        private BurstLevel current;
-        private BurstLevel next;
-        private List<Price> priceList;
-
-        public Builder current(BurstLevel current) {
-            this.current = current;
-            return this;
-        }
-
-        public Builder next(BurstLevel next) {
-            this.next = next;
-            return this;
-        }
-
-        public Builder priceList(List<Price> priceList) {
-            this.priceList = ImmutableList.copyOf(priceList);
-            return this;
-        }
-
-        public Pricing build(){
-            return new Pricing(current, next, priceList);
-        }
-    }
-
-    private final BurstLevel current;
-    private final BurstLevel next;
-    private final List<Price> priceList;
-
-    @ConstructorProperties({
-            "current", "next", "objects"
-    })
-    public Pricing(BurstLevel current, BurstLevel next, List<Price> priceList) {
-        this.current = current;
-        this.next = next;
-        this.priceList = priceList;
-    }
-
-    public BurstLevel getCurrent() {
-        return current;
-    }
-
-    public BurstLevel getNext() {
-        return next;
-    }
-
-    public List<Price> getPriceList() {
-        return priceList;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Pricing)) return false;
-
-        Pricing pricing = (Pricing) o;
-
-        if (current != null ? !current.equals(pricing.current) : pricing.current != null) return false;
-        if (next != null ? !next.equals(pricing.next) : pricing.next != null) return false;
-        if (priceList != null ? !priceList.equals(pricing.priceList) : pricing.priceList != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = current != null ? current.hashCode() : 0;
-        result = 31 * result + (next != null ? next.hashCode() : 0);
-        result = 31 * result + (priceList != null ? priceList.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "current=" + current +
-                ", next=" + next +
-                ", priceList=" + priceList +
-                "]";
-    }
+   public static class Builder {
+      private BurstLevel current;
+      private BurstLevel next;
+      private List<Price> priceList;
+
+      public Builder current(BurstLevel current) {
+         this.current = current;
+         return this;
+      }
+
+      public Builder next(BurstLevel next) {
+         this.next = next;
+         return this;
+      }
+
+      public Builder priceList(List<Price> priceList) {
+         this.priceList = ImmutableList.copyOf(priceList);
+         return this;
+      }
+
+      public Pricing build() {
+         return new Pricing(current, next, priceList);
+      }
+   }
+
+   private final BurstLevel current;
+   private final BurstLevel next;
+   private final List<Price> priceList;
+
+   @ConstructorProperties({
+         "current", "next", "objects"
+   })
+   public Pricing(BurstLevel current, BurstLevel next, List<Price> priceList) {
+      this.current = current;
+      this.next = next;
+      this.priceList = priceList;
+   }
+
+   public BurstLevel getCurrent() {
+      return current;
+   }
+
+   public BurstLevel getNext() {
+      return next;
+   }
+
+   public List<Price> getPriceList() {
+      return priceList;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Pricing)) return false;
+
+      Pricing pricing = (Pricing) o;
+
+      if (current != null ? !current.equals(pricing.current) : pricing.current != null) return false;
+      if (next != null ? !next.equals(pricing.next) : pricing.next != null) return false;
+      if (priceList != null ? !priceList.equals(pricing.priceList) : pricing.priceList != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result = current != null ? current.hashCode() : 0;
+      result = 31 * result + (next != null ? next.hashCode() : 0);
+      result = 31 * result + (priceList != null ? priceList.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "current=" + current +
+            ", next=" + next +
+            ", priceList=" + priceList +
+            "]";
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ProfileInfo.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ProfileInfo.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ProfileInfo.java
index 2a548de..9060ef2 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ProfileInfo.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ProfileInfo.java
@@ -26,493 +26,524 @@ import java.util.Map;
  */
 public class ProfileInfo {
 
-    public static class Builder {
-        private String address;
-        private boolean isApiHttpsOnly;
-        private String autotopupAmount;
-        private String autotopupThreshold;
-        private String bankReference;
-        private String company;
-        private String country;
-        private String currency;
-        private String email;
-        private String firstName;
-        private boolean hasAutotopup;
-        private boolean invoicing;
-        private boolean isKeyAuth;
-        private String language;
-        private String lastName;
-        private boolean isMailingListEnabled;
-        private Map<String, String> meta;
-        private String myNotes;
-        private String nickname;
-        private String phone;
-        private String postcode;
-        private String reseller;
-        private Date signupTime;
-        private String state;
-        private String taxName;
-        private double taxRate;
-        private String title;
-        private String town;
-        private String uuid;
-        private String vat;
-
-        public Builder uuid(String uuid) {
-            this.uuid = uuid;
-            return this;
-        }
-        public Builder address(String address) {
-            this.address = address;
-            return this;
-        }
-        public Builder isApiHttpsOnly(boolean isApiHttpsOnly) {
-            this.isApiHttpsOnly = isApiHttpsOnly;
-            return this;
-        }
-        public Builder autotopupAmount(String autotopupAmount) {
-            this.autotopupAmount = autotopupAmount;
-            return this;
-        }
-        public Builder autotopupThreshold(String autotopupThreshold) {
-            this.autotopupThreshold = autotopupThreshold;
-            return this;
-        }
-        public Builder bankReference(String bankReference) {
-            this.bankReference = bankReference;
-            return this;
-        }
-        public Builder company(String company) {
-            this.company = company;
-            return this;
-        }
-        public Builder country(String country) {
-            this.country = country;
-            return this;
-        }
-        public Builder currency(String currency) {
-            this.currency = currency;
-            return this;
-        }
-        public Builder email(String email) {
-            this.email = email;
-            return this;
-        }
-        public Builder firstName(String firstName) {
-            this.firstName = firstName;
-            return this;
-        }
-        public Builder hasAutotopup(boolean hasAutotopup) {
-            this.hasAutotopup = hasAutotopup;
-            return this;
-        }
-        public Builder invoicing(boolean invoicing) {
-            this.invoicing = invoicing;
-            return this;
-        }
-        public Builder isKeyAuth(boolean isKeyAuth) {
-            this.isKeyAuth = isKeyAuth;
-            return this;
-        }
-        public Builder language(String language) {
-            this.language = language;
-            return this;
-        }
-        public Builder lastName(String lastName) {
-            this.lastName = lastName;
-            return this;
-        }
-        public Builder isMailingListEnabled(boolean isMailingListEnabled) {
-            this.isMailingListEnabled = isMailingListEnabled;
-            return this;
-        }
-        public Builder meta(Map<String, String> meta) {
-            this.meta = meta;
-            return this;
-        }
-        public Builder myNotes(String myNotes) {
-            this.myNotes = myNotes;
-            return this;
-        }
-        public Builder nickname(String nickname) {
-            this.nickname = nickname;
-            return this;
-        }
-        public Builder phone(String phone) {
-            this.phone = phone;
-            return this;
-        }
-        public Builder postcode(String postcode) {
-            this.postcode = postcode;
-            return this;
-        }
-        public Builder reseller(String reseller) {
-            this.reseller = reseller;
-            return this;
-        }
-        public Builder signupTime(Date signupTime) {
-            this.signupTime = signupTime;
-            return this;
-        }
-        public Builder state(String state) {
-            this.state = state;
-            return this;
-        }
-        public Builder taxName(String taxName) {
-            this.taxName = taxName;
-            return this;
-        }
-        public Builder taxRate(double taxRate) {
-            this.taxRate = taxRate;
-            return this;
-        }
-        public Builder title(String title) {
-            this.title = title;
-            return this;
-        }
-        public Builder town(String town) {
-            this.town = town;
-            return this;
-        }
-        public Builder vat(String vat) {
-            this.vat = vat;
-            return this;
-        }
-
-        public ProfileInfo build() {
-            return new ProfileInfo(address, isApiHttpsOnly, autotopupAmount, autotopupThreshold, bankReference, company
-                    , country, currency, email, firstName, hasAutotopup, invoicing, isKeyAuth, language, lastName
-                    , isMailingListEnabled, meta, myNotes, nickname, phone , postcode, reseller, signupTime, state
-                    , taxName, taxRate, title, town, uuid, vat);
-        }
-
-    }
-
-    private final String address;
-    @Named("api_https_only")
-    private final boolean isApiHttpsOnly;
-    @Named("autotopup_amount")
-    private final String autotopupAmount;
-    @Named("autotopup_threshold")
-    private final String autotopupThreshold;
-    @Named("bank_reference")
-    private final String bankReference;
-    private final String company;
-    private final String country;
-    private final String currency;
-    private final String email;
-    @Named("first_name")
-    private final String firstName;
-    @Named("has_autotopup")
-    private final boolean hasAutotopup;
-    private final boolean invoicing;
-    @Named("key_auth")
-    private final boolean isKeyAuth;
-    private final String language;
-    @Named("last_name")
-    private final String lastName;
-    @Named("mailing_list")
-    private final boolean isMailingListEnabled;
-    private final Map<String, String> meta;
-    @Named("my_notes")
-    private final String myNotes;
-    private final String nickname;
-    private final String phone;
-    private final String postcode;
-    private final String reseller;
-    @Named("signup_time")
-    private final Date signupTime;
-    private final String state;
-    @Named("tax_name")
-    private final String taxName;
-    @Named("tax_rate")
-    private final double taxRate;
-    private final String title;
-    private final String town;
-    private final String uuid;
-    private final String vat;
-
-    @ConstructorProperties({
-            "address", "api_https_only", "autopopup_amount", "autopopup_threshold"
-            , "bank_reference", "company", "country", "currency", "email", "first_name"
-            , "has_autotopup", "invoicing", "key_auth", "language", "last_name"
-            , "mailing_list", "meta", "my_notes", "nickname", "phone"
-            , "postcode", "reseller", "signup_time", "state", "tax_name", "tax_rate"
-            , "title", "town", "uuid", "vat"
-    })
-    public ProfileInfo(String address, boolean apiHttpsOnly, String autotopupAmount, String autotopupThreshold
-            , String bankReference, String company, String country, String currency, String email, String firstName
-            , boolean hasAutotopup, boolean invoicing, boolean keyAuth, String language, String lastName
-            , boolean mailingListEnabled, Map<String, String> meta, String myNotes, String nickname, String phone
-            , String postcode, String reseller, Date signupTime, String state, String taxName, double taxRate
-            , String title, String town, String uuid, String vat) {
-        this.address = address;
-        isApiHttpsOnly = apiHttpsOnly;
-        this.autotopupAmount = autotopupAmount;
-        this.autotopupThreshold = autotopupThreshold;
-        this.bankReference = bankReference;
-        this.company = company;
-        this.country = country;
-        this.currency = currency;
-        this.email = email;
-        this.firstName = firstName;
-        this.hasAutotopup = hasAutotopup;
-        this.invoicing = invoicing;
-        isKeyAuth = keyAuth;
-        this.language = language;
-        this.lastName = lastName;
-        isMailingListEnabled = mailingListEnabled;
-        this.meta = meta;
-        this.myNotes = myNotes;
-        this.nickname = nickname;
-        this.phone = phone;
-        this.postcode = postcode;
-        this.reseller = reseller;
-        this.signupTime = signupTime;
-        this.state = state;
-        this.taxName = taxName;
-        this.taxRate = taxRate;
-        this.title = title;
-        this.town = town;
-        this.uuid = uuid;
-        this.vat = vat;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public boolean isApiHttpsOnly() {
-        return isApiHttpsOnly;
-    }
-
-    public String getAutotopupAmount() {
-        return autotopupAmount;
-    }
-
-    public String getAutotopupThreshold() {
-        return autotopupThreshold;
-    }
-
-    public String getBankReference() {
-        return bankReference;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public boolean isHasAutotopup() {
-        return hasAutotopup;
-    }
-
-    public boolean isInvoicing() {
-        return invoicing;
-    }
-
-    public boolean isKeyAuth() {
-        return isKeyAuth;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public boolean isMailingListEnabled() {
-        return isMailingListEnabled;
-    }
-
-    public Map<String, String> getMeta() {
-        return meta;
-    }
-
-    public String getMyNotes() {
-        return myNotes;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public String getPostcode() {
-        return postcode;
-    }
-
-    public String getReseller() {
-        return reseller;
-    }
-
-    public Date getSignupTime() {
-        return signupTime;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public String getTaxName() {
-        return taxName;
-    }
-
-    public double getTaxRate() {
-        return taxRate;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getTown() {
-        return town;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public String getVat() {
-        return vat;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ProfileInfo)) return false;
-
-        ProfileInfo that = (ProfileInfo) o;
-
-        if (hasAutotopup != that.hasAutotopup) return false;
-        if (invoicing != that.invoicing) return false;
-        if (isApiHttpsOnly != that.isApiHttpsOnly) return false;
-        if (isKeyAuth != that.isKeyAuth) return false;
-        if (isMailingListEnabled != that.isMailingListEnabled) return false;
-        if (Double.compare(that.taxRate, taxRate) != 0) return false;
-        if (address != null ? !address.equals(that.address) : that.address != null) return false;
-        if (autotopupAmount != null ? !autotopupAmount.equals(that.autotopupAmount) : that.autotopupAmount != null)
-            return false;
-        if (autotopupThreshold != null ? !autotopupThreshold.equals(that.autotopupThreshold) : that.autotopupThreshold != null)
-            return false;
-        if (bankReference != null ? !bankReference.equals(that.bankReference) : that.bankReference != null)
-            return false;
-        if (company != null ? !company.equals(that.company) : that.company != null) return false;
-        if (country != null ? !country.equals(that.country) : that.country != null) return false;
-        if (currency != null ? !currency.equals(that.currency) : that.currency != null) return false;
-        if (email != null ? !email.equals(that.email) : that.email != null) return false;
-        if (firstName != null ? !firstName.equals(that.firstName) : that.firstName != null) return false;
-        if (language != null ? !language.equals(that.language) : that.language != null) return false;
-        if (lastName != null ? !lastName.equals(that.lastName) : that.lastName != null) return false;
-        if (meta != null ? !meta.equals(that.meta) : that.meta != null) return false;
-        if (myNotes != null ? !myNotes.equals(that.myNotes) : that.myNotes != null) return false;
-        if (nickname != null ? !nickname.equals(that.nickname) : that.nickname != null) return false;
-        if (phone != null ? !phone.equals(that.phone) : that.phone != null) return false;
-        if (postcode != null ? !postcode.equals(that.postcode) : that.postcode != null) return false;
-        if (reseller != null ? !reseller.equals(that.reseller) : that.reseller != null) return false;
-        if (signupTime != null ? !signupTime.equals(that.signupTime) : that.signupTime != null) return false;
-        if (state != null ? !state.equals(that.state) : that.state != null) return false;
-        if (taxName != null ? !taxName.equals(that.taxName) : that.taxName != null) return false;
-        if (title != null ? !title.equals(that.title) : that.title != null) return false;
-        if (town != null ? !town.equals(that.town) : that.town != null) return false;
-        if (uuid != null ? !uuid.equals(that.uuid) : that.uuid != null) return false;
-        if (vat != null ? !vat.equals(that.vat) : that.vat != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result;
-        long temp;
-        result = address != null ? address.hashCode() : 0;
-        result = 31 * result + (isApiHttpsOnly ? 1 : 0);
-        result = 31 * result + (autotopupAmount != null ? autotopupAmount.hashCode() : 0);
-        result = 31 * result + (autotopupThreshold != null ? autotopupThreshold.hashCode() : 0);
-        result = 31 * result + (bankReference != null ? bankReference.hashCode() : 0);
-        result = 31 * result + (company != null ? company.hashCode() : 0);
-        result = 31 * result + (country != null ? country.hashCode() : 0);
-        result = 31 * result + (currency != null ? currency.hashCode() : 0);
-        result = 31 * result + (email != null ? email.hashCode() : 0);
-        result = 31 * result + (firstName != null ? firstName.hashCode() : 0);
-        result = 31 * result + (hasAutotopup ? 1 : 0);
-        result = 31 * result + (invoicing ? 1 : 0);
-        result = 31 * result + (isKeyAuth ? 1 : 0);
-        result = 31 * result + (language != null ? language.hashCode() : 0);
-        result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
-        result = 31 * result + (isMailingListEnabled ? 1 : 0);
-        result = 31 * result + (meta != null ? meta.hashCode() : 0);
-        result = 31 * result + (myNotes != null ? myNotes.hashCode() : 0);
-        result = 31 * result + (nickname != null ? nickname.hashCode() : 0);
-        result = 31 * result + (phone != null ? phone.hashCode() : 0);
-        result = 31 * result + (postcode != null ? postcode.hashCode() : 0);
-        result = 31 * result + (reseller != null ? reseller.hashCode() : 0);
-        result = 31 * result + (signupTime != null ? signupTime.hashCode() : 0);
-        result = 31 * result + (state != null ? state.hashCode() : 0);
-        result = 31 * result + (taxName != null ? taxName.hashCode() : 0);
-        temp = Double.doubleToLongBits(taxRate);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (title != null ? title.hashCode() : 0);
-        result = 31 * result + (town != null ? town.hashCode() : 0);
-        result = 31 * result + (uuid != null ? uuid.hashCode() : 0);
-        result = 31 * result + (vat != null ? vat.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "address='" + address + '\'' +
-                ", isApiHttpsOnly=" + isApiHttpsOnly +
-                ", autotopupAmount='" + autotopupAmount + '\'' +
-                ", autotopupThreshold='" + autotopupThreshold + '\'' +
-                ", bankReference='" + bankReference + '\'' +
-                ", company='" + company + '\'' +
-                ", country='" + country + '\'' +
-                ", currency='" + currency + '\'' +
-                ", email='" + email + '\'' +
-                ", firstName='" + firstName + '\'' +
-                ", hasAutotopup=" + hasAutotopup +
-                ", invoicing=" + invoicing +
-                ", isKeyAuth=" + isKeyAuth +
-                ", language='" + language + '\'' +
-                ", lastName='" + lastName + '\'' +
-                ", isMailingListEnabled=" + isMailingListEnabled +
-                ", meta=" + meta +
-                ", myNotes='" + myNotes + '\'' +
-                ", nickname='" + nickname + '\'' +
-                ", phone='" + phone + '\'' +
-                ", postcode='" + postcode + '\'' +
-                ", reseller='" + reseller + '\'' +
-                ", signupTime='" + signupTime + '\'' +
-                ", state='" + state + '\'' +
-                ", taxName='" + taxName + '\'' +
-                ", taxRate=" + taxRate +
-                ", title='" + title + '\'' +
-                ", town='" + town + '\'' +
-                ", uuid='" + uuid + '\'' +
-                ", vat='" + vat + '\'' +
-                "]";
-    }
+   public static class Builder {
+      private String address;
+      private boolean isApiHttpsOnly;
+      private String autotopupAmount;
+      private String autotopupThreshold;
+      private String bankReference;
+      private String company;
+      private String country;
+      private String currency;
+      private String email;
+      private String firstName;
+      private boolean hasAutotopup;
+      private boolean invoicing;
+      private boolean isKeyAuth;
+      private String language;
+      private String lastName;
+      private boolean isMailingListEnabled;
+      private Map<String, String> meta;
+      private String myNotes;
+      private String nickname;
+      private String phone;
+      private String postcode;
+      private String reseller;
+      private Date signupTime;
+      private String state;
+      private String taxName;
+      private double taxRate;
+      private String title;
+      private String town;
+      private String uuid;
+      private String vat;
+
+      public Builder uuid(String uuid) {
+         this.uuid = uuid;
+         return this;
+      }
+
+      public Builder address(String address) {
+         this.address = address;
+         return this;
+      }
+
+      public Builder isApiHttpsOnly(boolean isApiHttpsOnly) {
+         this.isApiHttpsOnly = isApiHttpsOnly;
+         return this;
+      }
+
+      public Builder autotopupAmount(String autotopupAmount) {
+         this.autotopupAmount = autotopupAmount;
+         return this;
+      }
+
+      public Builder autotopupThreshold(String autotopupThreshold) {
+         this.autotopupThreshold = autotopupThreshold;
+         return this;
+      }
+
+      public Builder bankReference(String bankReference) {
+         this.bankReference = bankReference;
+         return this;
+      }
+
+      public Builder company(String company) {
+         this.company = company;
+         return this;
+      }
+
+      public Builder country(String country) {
+         this.country = country;
+         return this;
+      }
+
+      public Builder currency(String currency) {
+         this.currency = currency;
+         return this;
+      }
+
+      public Builder email(String email) {
+         this.email = email;
+         return this;
+      }
+
+      public Builder firstName(String firstName) {
+         this.firstName = firstName;
+         return this;
+      }
+
+      public Builder hasAutotopup(boolean hasAutotopup) {
+         this.hasAutotopup = hasAutotopup;
+         return this;
+      }
+
+      public Builder invoicing(boolean invoicing) {
+         this.invoicing = invoicing;
+         return this;
+      }
+
+      public Builder isKeyAuth(boolean isKeyAuth) {
+         this.isKeyAuth = isKeyAuth;
+         return this;
+      }
+
+      public Builder language(String language) {
+         this.language = language;
+         return this;
+      }
+
+      public Builder lastName(String lastName) {
+         this.lastName = lastName;
+         return this;
+      }
+
+      public Builder isMailingListEnabled(boolean isMailingListEnabled) {
+         this.isMailingListEnabled = isMailingListEnabled;
+         return this;
+      }
+
+      public Builder meta(Map<String, String> meta) {
+         this.meta = meta;
+         return this;
+      }
+
+      public Builder myNotes(String myNotes) {
+         this.myNotes = myNotes;
+         return this;
+      }
+
+      public Builder nickname(String nickname) {
+         this.nickname = nickname;
+         return this;
+      }
+
+      public Builder phone(String phone) {
+         this.phone = phone;
+         return this;
+      }
+
+      public Builder postcode(String postcode) {
+         this.postcode = postcode;
+         return this;
+      }
+
+      public Builder reseller(String reseller) {
+         this.reseller = reseller;
+         return this;
+      }
+
+      public Builder signupTime(Date signupTime) {
+         this.signupTime = signupTime;
+         return this;
+      }
+
+      public Builder state(String state) {
+         this.state = state;
+         return this;
+      }
+
+      public Builder taxName(String taxName) {
+         this.taxName = taxName;
+         return this;
+      }
+
+      public Builder taxRate(double taxRate) {
+         this.taxRate = taxRate;
+         return this;
+      }
+
+      public Builder title(String title) {
+         this.title = title;
+         return this;
+      }
+
+      public Builder town(String town) {
+         this.town = town;
+         return this;
+      }
+
+      public Builder vat(String vat) {
+         this.vat = vat;
+         return this;
+      }
+
+      public ProfileInfo build() {
+         return new ProfileInfo(address, isApiHttpsOnly, autotopupAmount, autotopupThreshold, bankReference, company
+               , country, currency, email, firstName, hasAutotopup, invoicing, isKeyAuth, language, lastName
+               , isMailingListEnabled, meta, myNotes, nickname, phone, postcode, reseller, signupTime, state
+               , taxName, taxRate, title, town, uuid, vat);
+      }
+
+   }
+
+   private final String address;
+   @Named("api_https_only")
+   private final boolean isApiHttpsOnly;
+   @Named("autotopup_amount")
+   private final String autotopupAmount;
+   @Named("autotopup_threshold")
+   private final String autotopupThreshold;
+   @Named("bank_reference")
+   private final String bankReference;
+   private final String company;
+   private final String country;
+   private final String currency;
+   private final String email;
+   @Named("first_name")
+   private final String firstName;
+   @Named("has_autotopup")
+   private final boolean hasAutotopup;
+   private final boolean invoicing;
+   @Named("key_auth")
+   private final boolean isKeyAuth;
+   private final String language;
+   @Named("last_name")
+   private final String lastName;
+   @Named("mailing_list")
+   private final boolean isMailingListEnabled;
+   private final Map<String, String> meta;
+   @Named("my_notes")
+   private final String myNotes;
+   private final String nickname;
+   private final String phone;
+   private final String postcode;
+   private final String reseller;
+   @Named("signup_time")
+   private final Date signupTime;
+   private final String state;
+   @Named("tax_name")
+   private final String taxName;
+   @Named("tax_rate")
+   private final double taxRate;
+   private final String title;
+   private final String town;
+   private final String uuid;
+   private final String vat;
+
+   @ConstructorProperties({
+         "address", "api_https_only", "autopopup_amount", "autopopup_threshold"
+         , "bank_reference", "company", "country", "currency", "email", "first_name"
+         , "has_autotopup", "invoicing", "key_auth", "language", "last_name"
+         , "mailing_list", "meta", "my_notes", "nickname", "phone"
+         , "postcode", "reseller", "signup_time", "state", "tax_name", "tax_rate"
+         , "title", "town", "uuid", "vat"
+   })
+   public ProfileInfo(String address, boolean apiHttpsOnly, String autotopupAmount, String autotopupThreshold
+         , String bankReference, String company, String country, String currency, String email, String firstName
+         , boolean hasAutotopup, boolean invoicing, boolean keyAuth, String language, String lastName
+         , boolean mailingListEnabled, Map<String, String> meta, String myNotes, String nickname, String phone
+         , String postcode, String reseller, Date signupTime, String state, String taxName, double taxRate
+         , String title, String town, String uuid, String vat) {
+      this.address = address;
+      isApiHttpsOnly = apiHttpsOnly;
+      this.autotopupAmount = autotopupAmount;
+      this.autotopupThreshold = autotopupThreshold;
+      this.bankReference = bankReference;
+      this.company = company;
+      this.country = country;
+      this.currency = currency;
+      this.email = email;
+      this.firstName = firstName;
+      this.hasAutotopup = hasAutotopup;
+      this.invoicing = invoicing;
+      isKeyAuth = keyAuth;
+      this.language = language;
+      this.lastName = lastName;
+      isMailingListEnabled = mailingListEnabled;
+      this.meta = meta;
+      this.myNotes = myNotes;
+      this.nickname = nickname;
+      this.phone = phone;
+      this.postcode = postcode;
+      this.reseller = reseller;
+      this.signupTime = signupTime;
+      this.state = state;
+      this.taxName = taxName;
+      this.taxRate = taxRate;
+      this.title = title;
+      this.town = town;
+      this.uuid = uuid;
+      this.vat = vat;
+   }
+
+   public String getAddress() {
+      return address;
+   }
+
+   public boolean isApiHttpsOnly() {
+      return isApiHttpsOnly;
+   }
+
+   public String getAutotopupAmount() {
+      return autotopupAmount;
+   }
+
+   public String getAutotopupThreshold() {
+      return autotopupThreshold;
+   }
+
+   public String getBankReference() {
+      return bankReference;
+   }
+
+   public String getCompany() {
+      return company;
+   }
+
+   public String getCountry() {
+      return country;
+   }
+
+   public String getCurrency() {
+      return currency;
+   }
+
+   public String getEmail() {
+      return email;
+   }
+
+   public String getFirstName() {
+      return firstName;
+   }
+
+   public boolean isHasAutotopup() {
+      return hasAutotopup;
+   }
+
+   public boolean isInvoicing() {
+      return invoicing;
+   }
+
+   public boolean isKeyAuth() {
+      return isKeyAuth;
+   }
+
+   public String getLanguage() {
+      return language;
+   }
+
+   public String getLastName() {
+      return lastName;
+   }
+
+   public boolean isMailingListEnabled() {
+      return isMailingListEnabled;
+   }
+
+   public Map<String, String> getMeta() {
+      return meta;
+   }
+
+   public String getMyNotes() {
+      return myNotes;
+   }
+
+   public String getNickname() {
+      return nickname;
+   }
+
+   public String getPhone() {
+      return phone;
+   }
+
+   public String getPostcode() {
+      return postcode;
+   }
+
+   public String getReseller() {
+      return reseller;
+   }
+
+   public Date getSignupTime() {
+      return signupTime;
+   }
+
+   public String getState() {
+      return state;
+   }
+
+   public String getTaxName() {
+      return taxName;
+   }
+
+   public double getTaxRate() {
+      return taxRate;
+   }
+
+   public String getTitle() {
+      return title;
+   }
+
+   public String getTown() {
+      return town;
+   }
+
+   public String getUuid() {
+      return uuid;
+   }
+
+   public String getVat() {
+      return vat;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof ProfileInfo)) return false;
+
+      ProfileInfo that = (ProfileInfo) o;
+
+      if (hasAutotopup != that.hasAutotopup) return false;
+      if (invoicing != that.invoicing) return false;
+      if (isApiHttpsOnly != that.isApiHttpsOnly) return false;
+      if (isKeyAuth != that.isKeyAuth) return false;
+      if (isMailingListEnabled != that.isMailingListEnabled) return false;
+      if (Double.compare(that.taxRate, taxRate) != 0) return false;
+      if (address != null ? !address.equals(that.address) : that.address != null) return false;
+      if (autotopupAmount != null ? !autotopupAmount.equals(that.autotopupAmount) : that.autotopupAmount != null)
+         return false;
+      if (autotopupThreshold != null
+            ? !autotopupThreshold.equals(that.autotopupThreshold)
+            : that.autotopupThreshold != null)
+         return false;
+      if (bankReference != null ? !bankReference.equals(that.bankReference) : that.bankReference != null)
+         return false;
+      if (company != null ? !company.equals(that.company) : that.company != null) return false;
+      if (country != null ? !country.equals(that.country) : that.country != null) return false;
+      if (currency != null ? !currency.equals(that.currency) : that.currency != null) return false;
+      if (email != null ? !email.equals(that.email) : that.email != null) return false;
+      if (firstName != null ? !firstName.equals(that.firstName) : that.firstName != null) return false;
+      if (language != null ? !language.equals(that.language) : that.language != null) return false;
+      if (lastName != null ? !lastName.equals(that.lastName) : that.lastName != null) return false;
+      if (meta != null ? !meta.equals(that.meta) : that.meta != null) return false;
+      if (myNotes != null ? !myNotes.equals(that.myNotes) : that.myNotes != null) return false;
+      if (nickname != null ? !nickname.equals(that.nickname) : that.nickname != null) return false;
+      if (phone != null ? !phone.equals(that.phone) : that.phone != null) return false;
+      if (postcode != null ? !postcode.equals(that.postcode) : that.postcode != null) return false;
+      if (reseller != null ? !reseller.equals(that.reseller) : that.reseller != null) return false;
+      if (signupTime != null ? !signupTime.equals(that.signupTime) : that.signupTime != null) return false;
+      if (state != null ? !state.equals(that.state) : that.state != null) return false;
+      if (taxName != null ? !taxName.equals(that.taxName) : that.taxName != null) return false;
+      if (title != null ? !title.equals(that.title) : that.title != null) return false;
+      if (town != null ? !town.equals(that.town) : that.town != null) return false;
+      if (uuid != null ? !uuid.equals(that.uuid) : that.uuid != null) return false;
+      if (vat != null ? !vat.equals(that.vat) : that.vat != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result;
+      long temp;
+      result = address != null ? address.hashCode() : 0;
+      result = 31 * result + (isApiHttpsOnly ? 1 : 0);
+      result = 31 * result + (autotopupAmount != null ? autotopupAmount.hashCode() : 0);
+      result = 31 * result + (autotopupThreshold != null ? autotopupThreshold.hashCode() : 0);
+      result = 31 * result + (bankReference != null ? bankReference.hashCode() : 0);
+      result = 31 * result + (company != null ? company.hashCode() : 0);
+      result = 31 * result + (country != null ? country.hashCode() : 0);
+      result = 31 * result + (currency != null ? currency.hashCode() : 0);
+      result = 31 * result + (email != null ? email.hashCode() : 0);
+      result = 31 * result + (firstName != null ? firstName.hashCode() : 0);
+      result = 31 * result + (hasAutotopup ? 1 : 0);
+      result = 31 * result + (invoicing ? 1 : 0);
+      result = 31 * result + (isKeyAuth ? 1 : 0);
+      result = 31 * result + (language != null ? language.hashCode() : 0);
+      result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
+      result = 31 * result + (isMailingListEnabled ? 1 : 0);
+      result = 31 * result + (meta != null ? meta.hashCode() : 0);
+      result = 31 * result + (myNotes != null ? myNotes.hashCode() : 0);
+      result = 31 * result + (nickname != null ? nickname.hashCode() : 0);
+      result = 31 * result + (phone != null ? phone.hashCode() : 0);
+      result = 31 * result + (postcode != null ? postcode.hashCode() : 0);
+      result = 31 * result + (reseller != null ? reseller.hashCode() : 0);
+      result = 31 * result + (signupTime != null ? signupTime.hashCode() : 0);
+      result = 31 * result + (state != null ? state.hashCode() : 0);
+      result = 31 * result + (taxName != null ? taxName.hashCode() : 0);
+      temp = Double.doubleToLongBits(taxRate);
+      result = 31 * result + (int) (temp ^ (temp >>> 32));
+      result = 31 * result + (title != null ? title.hashCode() : 0);
+      result = 31 * result + (town != null ? town.hashCode() : 0);
+      result = 31 * result + (uuid != null ? uuid.hashCode() : 0);
+      result = 31 * result + (vat != null ? vat.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "address='" + address + '\'' +
+            ", isApiHttpsOnly=" + isApiHttpsOnly +
+            ", autotopupAmount='" + autotopupAmount + '\'' +
+            ", autotopupThreshold='" + autotopupThreshold + '\'' +
+            ", bankReference='" + bankReference + '\'' +
+            ", company='" + company + '\'' +
+            ", country='" + country + '\'' +
+            ", currency='" + currency + '\'' +
+            ", email='" + email + '\'' +
+            ", firstName='" + firstName + '\'' +
+            ", hasAutotopup=" + hasAutotopup +
+            ", invoicing=" + invoicing +
+            ", isKeyAuth=" + isKeyAuth +
+            ", language='" + language + '\'' +
+            ", lastName='" + lastName + '\'' +
+            ", isMailingListEnabled=" + isMailingListEnabled +
+            ", meta=" + meta +
+            ", myNotes='" + myNotes + '\'' +
+            ", nickname='" + nickname + '\'' +
+            ", phone='" + phone + '\'' +
+            ", postcode='" + postcode + '\'' +
+            ", reseller='" + reseller + '\'' +
+            ", signupTime='" + signupTime + '\'' +
+            ", state='" + state + '\'' +
+            ", taxName='" + taxName + '\'' +
+            ", taxRate=" + taxRate +
+            ", title='" + title + '\'' +
+            ", town='" + town + '\'' +
+            ", uuid='" + uuid + '\'' +
+            ", vat='" + vat + '\'' +
+            "]";
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Server.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Server.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Server.java
index f9878fe..8c9f901 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Server.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Server.java
@@ -26,139 +26,148 @@ import java.net.URI;
  */
 public class Server extends Item {
 
-    public static class Builder extends Item.Builder {
-        protected Owner owner;
-        protected ServerStatus status;
-        protected ServerRuntime runtime;
-
-        /**
-         * @param owner server's owner.
-         * @return Server Builder
-         */
-        public Builder owner(Owner owner) {
-            this.owner = owner;
-            return this;
-        }
-
-        /**
-         * @param status Status of the guest.
-         * @return Server Builder
-         */
-        public Builder status(ServerStatus status) {
-            this.status = status;
-            return this;
-        }
-
-        /**
-         * @param runtime Runtime information of the guest
-         * @return Server Builder
-         */
-        public Builder runtime(ServerRuntime runtime) {
-            this.runtime = runtime;
-            return this;
-        }
-
-        /**
-         * {@inheritDoc}
-         * @return Server Builder
-         */
-        @Override
-        public Builder uuid(String uuid) {
-            return Builder.class.cast(super.uuid(uuid));
-        }
-
-        /**
-         * {@inheritDoc}
-         * @return Server Builder
-         */
-        @Override
-        public Builder name(String name) {
-            return Builder.class.cast(super.name(name));
-        }
-
-        /**
-         * {@inheritDoc}
-         * @return Server Builder
-         */
-        @Override
-        public Builder resourceUri(URI resourceUri) {
-            return Builder.class.cast(super.resourceUri(resourceUri));
-        }
-
-        public Server build() {
-            return new Server(uuid, name, resourceUri, owner, status, runtime);
-        }
-
-        public static Builder fromServer(Server in) {
-            return new Builder().uuid(in.getUuid()).name(in.getName()).resourceUri(in.getResourceUri()).owner(in.getOwner()).status(in.getStatus())
-                    .runtime(in.getRuntime());
-        }
-    }
-
-    protected final Owner owner;
-    protected final ServerStatus status;
-    protected final ServerRuntime runtime;
-
-    @ConstructorProperties({
-            "uuid", "name", "resource_uri", "owner", "status", "runtime"
-    })
-    public Server(@Nullable String uuid, String name, URI resourceUri, Owner owner, ServerStatus status, ServerRuntime runtime) {
-        super(uuid, name, resourceUri);
-        this.owner = owner;
-        this.status = status;
-        this.runtime = runtime;
-    }
-
-    /**
-     * @return server's owner.
-     */
-    public Owner getOwner() {
-        return owner;
-    }
-
-    /**
-     * @return Status of the guest.
-     */
-    public ServerStatus getStatus() {
-        return status;
-    }
-
-    /**
-     * @return Runtime information of the guest
-     */
-    public ServerRuntime getRuntime() {
-        return runtime;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Server)) return false;
-        if (!super.equals(o)) return false;
-
-        Server server = (Server) o;
-
-        if (owner != null ? !owner.equals(server.owner) : server.owner != null) return false;
-        if (runtime != null ? !runtime.equals(server.runtime) : server.runtime != null) return false;
-        if (status != server.status) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (owner != null ? owner.hashCode() : 0);
-        result = 31 * result + (status != null ? status.hashCode() : 0);
-        result = 31 * result + (runtime != null ? runtime.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[uuid=" + uuid + ", name=" + name + ", resourceUri=" + resourceUri + ", owner=" + owner
-                + ", status=" + status + ", runtime=" + runtime + "]";
-    }
+   public static class Builder extends Item.Builder {
+      protected Owner owner;
+      protected ServerStatus status;
+      protected ServerRuntime runtime;
+
+      /**
+       * @param owner server's owner.
+       * @return Server Builder
+       */
+      public Builder owner(Owner owner) {
+         this.owner = owner;
+         return this;
+      }
+
+      /**
+       * @param status Status of the guest.
+       * @return Server Builder
+       */
+      public Builder status(ServerStatus status) {
+         this.status = status;
+         return this;
+      }
+
+      /**
+       * @param runtime Runtime information of the guest
+       * @return Server Builder
+       */
+      public Builder runtime(ServerRuntime runtime) {
+         this.runtime = runtime;
+         return this;
+      }
+
+      /**
+       * {@inheritDoc}
+       *
+       * @return Server Builder
+       */
+      @Override
+      public Builder uuid(String uuid) {
+         return Builder.class.cast(super.uuid(uuid));
+      }
+
+      /**
+       * {@inheritDoc}
+       *
+       * @return Server Builder
+       */
+      @Override
+      public Builder name(String name) {
+         return Builder.class.cast(super.name(name));
+      }
+
+      /**
+       * {@inheritDoc}
+       *
+       * @return Server Builder
+       */
+      @Override
+      public Builder resourceUri(URI resourceUri) {
+         return Builder.class.cast(super.resourceUri(resourceUri));
+      }
+
+      public Server build() {
+         return new Server(uuid, name, resourceUri, owner, status, runtime);
+      }
+
+      public static Builder fromServer(Server in) {
+         return new Builder()
+               .uuid(in.getUuid())
+               .name(in.getName())
+               .resourceUri(in.getResourceUri())
+               .owner(in.getOwner())
+               .status(in.getStatus())
+               .runtime(in.getRuntime());
+      }
+   }
+
+   protected final Owner owner;
+   protected final ServerStatus status;
+   protected final ServerRuntime runtime;
+
+   @ConstructorProperties({
+         "uuid", "name", "resource_uri", "owner", "status", "runtime"
+   })
+   public Server(@Nullable String uuid, String name, URI resourceUri, Owner owner, ServerStatus status
+         , ServerRuntime runtime) {
+      super(uuid, name, resourceUri);
+      this.owner = owner;
+      this.status = status;
+      this.runtime = runtime;
+   }
+
+   /**
+    * @return server's owner.
+    */
+   public Owner getOwner() {
+      return owner;
+   }
+
+   /**
+    * @return Status of the guest.
+    */
+   public ServerStatus getStatus() {
+      return status;
+   }
+
+   /**
+    * @return Runtime information of the guest
+    */
+   public ServerRuntime getRuntime() {
+      return runtime;
+   }
+
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Server)) return false;
+      if (!super.equals(o)) return false;
+
+      Server server = (Server) o;
+
+      if (owner != null ? !owner.equals(server.owner) : server.owner != null) return false;
+      if (runtime != null ? !runtime.equals(server.runtime) : server.runtime != null) return false;
+      if (status != server.status) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result = super.hashCode();
+      result = 31 * result + (owner != null ? owner.hashCode() : 0);
+      result = 31 * result + (status != null ? status.hashCode() : 0);
+      result = 31 * result + (runtime != null ? runtime.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[uuid=" + uuid + ", name=" + name + ", resourceUri=" + resourceUri + ", owner=" + owner
+            + ", status=" + status + ", runtime=" + runtime + "]";
+   }
 
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java
index 7375ede..d1bee88 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java
@@ -24,47 +24,47 @@ import java.util.List;
  */
 public class ServerAvailabilityGroup {
 
-    private final List<String> uuids;
+   private final List<String> uuids;
 
-    public ServerAvailabilityGroup(List<String> uuids) {
-        this.uuids = uuids;
-    }
+   public ServerAvailabilityGroup(List<String> uuids) {
+      this.uuids = uuids;
+   }
 
-    public List<String> getUuids() {
-        return uuids;
-    }
+   public List<String> getUuids() {
+      return uuids;
+   }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ServerAvailabilityGroup)) return false;
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof ServerAvailabilityGroup)) return false;
 
-        ServerAvailabilityGroup that = (ServerAvailabilityGroup) o;
+      ServerAvailabilityGroup that = (ServerAvailabilityGroup) o;
 
-        if (uuids != null ? !uuids.equals(that.uuids) : that.uuids != null) return false;
+      if (uuids != null ? !uuids.equals(that.uuids) : that.uuids != null) return false;
 
-        return true;
-    }
+      return true;
+   }
 
-    @Override
-    public int hashCode() {
-        return uuids != null ? uuids.hashCode() : 0;
-    }
+   @Override
+   public int hashCode() {
+      return uuids != null ? uuids.hashCode() : 0;
+   }
 
-    @Override
-    public String toString() {
-        String returnString = "";
+   @Override
+   public String toString() {
+      String returnString = "";
 
-        Iterator iterator = uuids.iterator();
+      Iterator iterator = uuids.iterator();
 
-        while (iterator.hasNext()){
-            returnString += iterator.next();
+      while (iterator.hasNext()) {
+         returnString += iterator.next();
 
-            if(iterator.hasNext()){
-                returnString += ",";
-            }
-        }
+         if (iterator.hasNext()) {
+            returnString += ",";
+         }
+      }
 
-        return returnString;
-    }
+      return returnString;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerDrive.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerDrive.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerDrive.java
index 9d5cbb0..1785b8a 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerDrive.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerDrive.java
@@ -24,148 +24,141 @@ import java.beans.ConstructorProperties;
  */
 public class ServerDrive {
 
-    public static class Builder{
-        private int bootOrder;
-        private String deviceChannel;
-        private DeviceEmulationType deviceEmulationType;
-        private Drive drive;
-
-        public Builder bootOrder(int bootOrder){
-            this.bootOrder = bootOrder;
-            return this;
-        }
-
-        public Builder deviceChannel(String deviceChannel){
-            this.deviceChannel = deviceChannel;
-            return this;
-        }
-
-        public Builder deviceEmulationType(DeviceEmulationType deviceEmulationType){
-            this.deviceEmulationType = deviceEmulationType;
-            return this;
-        }
-
-        public Builder drive(Drive drive){
-            this.drive = drive;
-            return this;
-        }
-
-        public ServerDrive build(){
-            return new ServerDrive(bootOrder, deviceChannel, deviceEmulationType, drive);
-        }
-    }
-
-    @Named("boot_order")
-    private final int bootOrder;
-    @Named("dev_channel")
-    private final String deviceChannel;
-    @Named("device")
-    private final DeviceEmulationType deviceEmulationType;
-    @Named("drive")
-    private final Drive drive;
-    private final String driveUuid;
-
-    /**
-     *
-     * @param bootOrder drive boot order
-     * @param deviceChannel device channel in format {controller:unit} ex. 0:1, 0:2, etc.
-     * @param deviceEmulationType device emulation type
-     * @param drive drive to attach. UUID Required.
-     */
-    @ConstructorProperties({
-            "boot_order", "dev_channel", "device", "drive"
-    })
-    public ServerDrive(int bootOrder, String deviceChannel, DeviceEmulationType deviceEmulationType, Drive drive) {
-        this.bootOrder = bootOrder;
-        this.deviceChannel = deviceChannel;
-        this.deviceEmulationType = deviceEmulationType;
-        this.drive = drive;
-        this.driveUuid = drive.getUuid();
-    }
-
-    /**
-     *
-     * @param bootOrder drive boot order
-     * @param deviceChannel device channel in format {controller:unit} ex. 0:1, 0:2, etc.
-     * @param deviceEmulationType device emulation type
-     * @param driveUuid drive uuid.
-     */
-    public ServerDrive(int bootOrder, String deviceChannel, DeviceEmulationType deviceEmulationType, String driveUuid) {
-        this.bootOrder = bootOrder;
-        this.deviceChannel = deviceChannel;
-        this.deviceEmulationType = deviceEmulationType;
-        this.driveUuid = driveUuid;
-        this.drive = null;
-    }
-
-    /**
-     *
-     * @return drive boot order
-     */
-    public int getBootOrder() {
-        return bootOrder;
-    }
-
-    /**
-     *
-     * @return device channel in format {controller:unit} ex. 0:1, 0:2, etc.
-     */
-    public String getDeviceChannel() {
-        return deviceChannel;
-    }
-
-    /**
-     *
-     * @return device emulation type
-     */
-    public DeviceEmulationType getDeviceEmulationType() {
-        return deviceEmulationType;
-    }
-
-    /**
-     *
-     * @return drive
-     */
-    public Drive getDrive() {
-        return drive;
-    }
-
-    /**
-     *
-     * @return drive uuid
-     */
-    public String getDriveUuid() {
-        return driveUuid;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ServerDrive)) return false;
-
-        ServerDrive that = (ServerDrive) o;
-
-        if (bootOrder != that.bootOrder) return false;
-        if (deviceChannel != null ? !deviceChannel.equals(that.deviceChannel) : that.deviceChannel != null)
-            return false;
-        if (deviceEmulationType != that.deviceEmulationType) return false;
-        if (drive != null ? !drive.equals(that.drive) : that.drive != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = bootOrder;
-        result = 31 * result + (deviceChannel != null ? deviceChannel.hashCode() : 0);
-        result = 31 * result + (deviceEmulationType != null ? deviceEmulationType.hashCode() : 0);
-        result = 31 * result + (drive != null ? drive.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[bootOrder=" + bootOrder + ", deviceChannel=" + deviceChannel + ", deviceEmulationType=" + deviceEmulationType
-                + ", drive=" + drive + "]";
-    }
+   public static class Builder {
+      private int bootOrder;
+      private String deviceChannel;
+      private DeviceEmulationType deviceEmulationType;
+      private Drive drive;
+
+      public Builder bootOrder(int bootOrder) {
+         this.bootOrder = bootOrder;
+         return this;
+      }
+
+      public Builder deviceChannel(String deviceChannel) {
+         this.deviceChannel = deviceChannel;
+         return this;
+      }
+
+      public Builder deviceEmulationType(DeviceEmulationType deviceEmulationType) {
+         this.deviceEmulationType = deviceEmulationType;
+         return this;
+      }
+
+      public Builder drive(Drive drive) {
+         this.drive = drive;
+         return this;
+      }
+
+      public ServerDrive build() {
+         return new ServerDrive(bootOrder, deviceChannel, deviceEmulationType, drive);
+      }
+   }
+
+   @Named("boot_order")
+   private final int bootOrder;
+   @Named("dev_channel")
+   private final String deviceChannel;
+   @Named("device")
+   private final DeviceEmulationType deviceEmulationType;
+   @Named("drive")
+   private final Drive drive;
+   private final String driveUuid;
+
+   /**
+    * @param bootOrder           drive boot order
+    * @param deviceChannel       device channel in format {controller:unit} ex. 0:1, 0:2, etc.
+    * @param deviceEmulationType device emulation type
+    * @param drive               drive to attach. UUID Required.
+    */
+   @ConstructorProperties({
+         "boot_order", "dev_channel", "device", "drive"
+   })
+   public ServerDrive(int bootOrder, String deviceChannel, DeviceEmulationType deviceEmulationType, Drive drive) {
+      this.bootOrder = bootOrder;
+      this.deviceChannel = deviceChannel;
+      this.deviceEmulationType = deviceEmulationType;
+      this.drive = drive;
+      this.driveUuid = drive.getUuid();
+   }
+
+   /**
+    * @param bootOrder           drive boot order
+    * @param deviceChannel       device channel in format {controller:unit} ex. 0:1, 0:2, etc.
+    * @param deviceEmulationType device emulation type
+    * @param driveUuid           drive uuid.
+    */
+   public ServerDrive(int bootOrder, String deviceChannel, DeviceEmulationType deviceEmulationType, String driveUuid) {
+      this.bootOrder = bootOrder;
+      this.deviceChannel = deviceChannel;
+      this.deviceEmulationType = deviceEmulationType;
+      this.driveUuid = driveUuid;
+      this.drive = null;
+   }
+
+   /**
+    * @return drive boot order
+    */
+   public int getBootOrder() {
+      return bootOrder;
+   }
+
+   /**
+    * @return device channel in format {controller:unit} ex. 0:1, 0:2, etc.
+    */
+   public String getDeviceChannel() {
+      return deviceChannel;
+   }
+
+   /**
+    * @return device emulation type
+    */
+   public DeviceEmulationType getDeviceEmulationType() {
+      return deviceEmulationType;
+   }
+
+   /**
+    * @return drive
+    */
+   public Drive getDrive() {
+      return drive;
+   }
+
+   /**
+    * @return drive uuid
+    */
+   public String getDriveUuid() {
+      return driveUuid;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof ServerDrive)) return false;
+
+      ServerDrive that = (ServerDrive) o;
+
+      if (bootOrder != that.bootOrder) return false;
+      if (deviceChannel != null ? !deviceChannel.equals(that.deviceChannel) : that.deviceChannel != null)
+         return false;
+      if (deviceEmulationType != that.deviceEmulationType) return false;
+      if (drive != null ? !drive.equals(that.drive) : that.drive != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result = bootOrder;
+      result = 31 * result + (deviceChannel != null ? deviceChannel.hashCode() : 0);
+      result = 31 * result + (deviceEmulationType != null ? deviceEmulationType.hashCode() : 0);
+      result = 31 * result + (drive != null ? drive.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[bootOrder=" + bootOrder + ", deviceChannel=" + deviceChannel
+            + ", deviceEmulationType=" + deviceEmulationType + ", drive=" + drive + "]";
+   }
 }