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:08 UTC

[05/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/Transaction.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Transaction.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Transaction.java
index 756646c..70f186d 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Transaction.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Transaction.java
@@ -25,169 +25,172 @@ import java.util.Date;
  */
 public class Transaction {
 
-    public static class Builder{
-        private double amount;
-        private long billingCycle;
-        private double end;
-        private String id;
-        private double initial;
-        private String reason;
-        private Date time;
-
-        public Builder amount(double amount){
-            this.amount = amount;
-            return this;
-        }
-
-        public Builder billingCycle(long billingCycle){
-            this.billingCycle = billingCycle;
-            return this;
-        }
-
-        public Builder end(double end){
-            this.end = end;
-            return this;
-        }
-        public Builder id(String id){
-            this.id = id;
-            return this;
-        }
-        public Builder initial(double initial){
-            this.initial = initial;
-            return this;
-        }
-
-        public Builder reason(String reason){
-            this.reason = reason;
-            return this;
-        }
-
-        public Builder time(Date time){
-            this.time = time;
-            return this;
-        }
-
-        public Transaction build(){
-            return new Transaction(amount, billingCycle, end, id, initial, reason, time);
-        }
-    }
-
-    private final double amount;
-    @Named("billing_cycle")
-    private final long billingCycle;
-    private final double end;
-    private final String id;
-    private final double initial;
-    private final String reason;
-    private final Date time;
-
-    @ConstructorProperties({
-            "amount", "billing_cycle", "end", "id", "initial", "reason", "time"
-    })
-    public Transaction(double amount, long billingCycle, double end, String id, double initial, String reason, Date time) {
-        this.amount = amount;
-        this.billingCycle = billingCycle;
-        this.end = end;
-        this.id = id;
-        this.initial = initial;
-        this.reason = reason;
-        this.time = time;
-    }
-
-    /**
-     * @return Amount of the operation, positive for debits, negative for credits
-     */
-    public double getAmount() {
-        return amount;
-    }
-
-    /**
-     * @return Billing cycle that generated this charge
-     */
-    public long getBillingCycle() {
-        return billingCycle;
-    }
-
-    /**
-     * @return Amount of money after the operation
-     */
-    public double getEnd() {
-        return end;
-    }
-
-    /**
-     * @return Unique id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @return Amount of money before the operation
-     */
-    public double getInitial() {
-        return initial;
-    }
-
-    /**
-     * @return Description of the operation
-     */
-    public String getReason() {
-        return reason;
-    }
-
-    /**
-     * @return date & time
-     */
-    public Date getTime() {
-        return time;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Transaction)) return false;
-
-        Transaction that = (Transaction) o;
-
-        if (Double.compare(that.amount, amount) != 0) return false;
-        if (billingCycle != that.billingCycle) return false;
-        if (Double.compare(that.end, end) != 0) return false;
-        if (Double.compare(that.initial, initial) != 0) return false;
-        if (id != null ? !id.equals(that.id) : that.id != null) return false;
-        if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
-        if (time != null ? !time.equals(that.time) : that.time != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result;
-        long temp;
-        temp = Double.doubleToLongBits(amount);
-        result = (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (int) (billingCycle ^ (billingCycle >>> 32));
-        temp = Double.doubleToLongBits(end);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (id != null ? id.hashCode() : 0);
-        temp = Double.doubleToLongBits(initial);
-        result = 31 * result + (int) (temp ^ (temp >>> 32));
-        result = 31 * result + (reason != null ? reason.hashCode() : 0);
-        result = 31 * result + (time != null ? time.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "amount=" + amount +
-                ", billingCycle=" + billingCycle +
-                ", end=" + end +
-                ", id='" + id + '\'' +
-                ", initial=" + initial +
-                ", reason='" + reason + '\'' +
-                ", time=" + time +
-                "]";
-    }
+   public static class Builder {
+      private double amount;
+      private long billingCycle;
+      private double end;
+      private String id;
+      private double initial;
+      private String reason;
+      private Date time;
+
+      public Builder amount(double amount) {
+         this.amount = amount;
+         return this;
+      }
+
+      public Builder billingCycle(long billingCycle) {
+         this.billingCycle = billingCycle;
+         return this;
+      }
+
+      public Builder end(double end) {
+         this.end = end;
+         return this;
+      }
+
+      public Builder id(String id) {
+         this.id = id;
+         return this;
+      }
+
+      public Builder initial(double initial) {
+         this.initial = initial;
+         return this;
+      }
+
+      public Builder reason(String reason) {
+         this.reason = reason;
+         return this;
+      }
+
+      public Builder time(Date time) {
+         this.time = time;
+         return this;
+      }
+
+      public Transaction build() {
+         return new Transaction(amount, billingCycle, end, id, initial, reason, time);
+      }
+   }
+
+   private final double amount;
+   @Named("billing_cycle")
+   private final long billingCycle;
+   private final double end;
+   private final String id;
+   private final double initial;
+   private final String reason;
+   private final Date time;
+
+   @ConstructorProperties({
+         "amount", "billing_cycle", "end", "id", "initial", "reason", "time"
+   })
+   public Transaction(double amount, long billingCycle, double end, String id, double initial, String reason
+         , Date time) {
+      this.amount = amount;
+      this.billingCycle = billingCycle;
+      this.end = end;
+      this.id = id;
+      this.initial = initial;
+      this.reason = reason;
+      this.time = time;
+   }
+
+   /**
+    * @return Amount of the operation, positive for debits, negative for credits
+    */
+   public double getAmount() {
+      return amount;
+   }
+
+   /**
+    * @return Billing cycle that generated this charge
+    */
+   public long getBillingCycle() {
+      return billingCycle;
+   }
+
+   /**
+    * @return Amount of money after the operation
+    */
+   public double getEnd() {
+      return end;
+   }
+
+   /**
+    * @return Unique id
+    */
+   public String getId() {
+      return id;
+   }
+
+   /**
+    * @return Amount of money before the operation
+    */
+   public double getInitial() {
+      return initial;
+   }
+
+   /**
+    * @return Description of the operation
+    */
+   public String getReason() {
+      return reason;
+   }
+
+   /**
+    * @return date & time
+    */
+   public Date getTime() {
+      return time;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Transaction)) return false;
+
+      Transaction that = (Transaction) o;
+
+      if (Double.compare(that.amount, amount) != 0) return false;
+      if (billingCycle != that.billingCycle) return false;
+      if (Double.compare(that.end, end) != 0) return false;
+      if (Double.compare(that.initial, initial) != 0) return false;
+      if (id != null ? !id.equals(that.id) : that.id != null) return false;
+      if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
+      if (time != null ? !time.equals(that.time) : that.time != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result;
+      long temp;
+      temp = Double.doubleToLongBits(amount);
+      result = (int) (temp ^ (temp >>> 32));
+      result = 31 * result + (int) (billingCycle ^ (billingCycle >>> 32));
+      temp = Double.doubleToLongBits(end);
+      result = 31 * result + (int) (temp ^ (temp >>> 32));
+      result = 31 * result + (id != null ? id.hashCode() : 0);
+      temp = Double.doubleToLongBits(initial);
+      result = 31 * result + (int) (temp ^ (temp >>> 32));
+      result = 31 * result + (reason != null ? reason.hashCode() : 0);
+      result = 31 * result + (time != null ? time.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "amount=" + amount +
+            ", billingCycle=" + billingCycle +
+            ", end=" + end +
+            ", id='" + id + '\'' +
+            ", initial=" + initial +
+            ", reason='" + reason + '\'' +
+            ", time=" + time +
+            "]";
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Usage.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Usage.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Usage.java
index 15d9b2b..b9850fb 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Usage.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/Usage.java
@@ -24,84 +24,84 @@ import java.math.BigInteger;
  */
 public class Usage {
 
-    public static class Builder{
-        private BigInteger burst;
-        private BigInteger subscribed;
-        private BigInteger using;
-
-        public Builder subscribed(BigInteger subscribed) {
-            this.subscribed = subscribed;
-            return this;
-        }
-
-        public Builder burst(BigInteger burst) {
-            this.burst = burst;
-            return this;
-        }
-
-        public Builder using(BigInteger using) {
-            this.using = using;
-            return this;
-        }
-
-        public Usage build(){
-            return new Usage(burst, subscribed, using);
-        }
-    }
-
-    private final BigInteger burst;
-    private final BigInteger subscribed;
-    private final BigInteger using;
-
-    @ConstructorProperties({
-            "burst", "subscribed", "using"
-    })
-    public Usage(BigInteger burst, BigInteger subscribed, BigInteger using) {
-        this.burst = burst;
-        this.subscribed = subscribed;
-        this.using = using;
-    }
-
-    public BigInteger getUsing() {
-        return using;
-    }
-
-    public BigInteger getBurst() {
-        return burst;
-    }
-
-    public BigInteger getSubscribed() {
-        return subscribed;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Usage)) return false;
-
-        Usage usage = (Usage) o;
-
-        if (burst != null ? !burst.equals(usage.burst) : usage.burst != null) return false;
-        if (subscribed != null ? !subscribed.equals(usage.subscribed) : usage.subscribed != null) return false;
-        if (using != null ? !using.equals(usage.using) : usage.using != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = burst != null ? burst.hashCode() : 0;
-        result = 31 * result + (subscribed != null ? subscribed.hashCode() : 0);
-        result = 31 * result + (using != null ? using.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "burst=" + burst +
-                ", subscribed=" + subscribed +
-                ", using=" + using +
-                "]";
-    }
+   public static class Builder {
+      private BigInteger burst;
+      private BigInteger subscribed;
+      private BigInteger using;
+
+      public Builder subscribed(BigInteger subscribed) {
+         this.subscribed = subscribed;
+         return this;
+      }
+
+      public Builder burst(BigInteger burst) {
+         this.burst = burst;
+         return this;
+      }
+
+      public Builder using(BigInteger using) {
+         this.using = using;
+         return this;
+      }
+
+      public Usage build() {
+         return new Usage(burst, subscribed, using);
+      }
+   }
+
+   private final BigInteger burst;
+   private final BigInteger subscribed;
+   private final BigInteger using;
+
+   @ConstructorProperties({
+         "burst", "subscribed", "using"
+   })
+   public Usage(BigInteger burst, BigInteger subscribed, BigInteger using) {
+      this.burst = burst;
+      this.subscribed = subscribed;
+      this.using = using;
+   }
+
+   public BigInteger getUsing() {
+      return using;
+   }
+
+   public BigInteger getBurst() {
+      return burst;
+   }
+
+   public BigInteger getSubscribed() {
+      return subscribed;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof Usage)) return false;
+
+      Usage usage = (Usage) o;
+
+      if (burst != null ? !burst.equals(usage.burst) : usage.burst != null) return false;
+      if (subscribed != null ? !subscribed.equals(usage.subscribed) : usage.subscribed != null) return false;
+      if (using != null ? !using.equals(usage.using) : usage.using != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result = burst != null ? burst.hashCode() : 0;
+      result = 31 * result + (subscribed != null ? subscribed.hashCode() : 0);
+      result = 31 * result + (using != null ? using.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "burst=" + burst +
+            ", subscribed=" + subscribed +
+            ", using=" + using +
+            "]";
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/VLANInfo.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/VLANInfo.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/VLANInfo.java
index 418937f..d0c67f4 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/VLANInfo.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/VLANInfo.java
@@ -29,220 +29,220 @@ import java.util.Map;
  * @author Vladimir Shevchenko
  */
 public class VLANInfo {
-    public static class Builder {
-        private Map<String, String> meta;
-        private String uuid;
-        private Owner owner;
-        private URI resourceUri;
-        private List<Server> servers;
-        private Subscription subscription;
-        private List<Tag> tags;
-
-        /**
-         * @param uuid VLAN UUID
-         * @return VLANInfo Builder
-         */
-        public Builder uuid(String uuid) {
-            this.uuid = uuid;
-            return this;
-        }
-
-        /**
-         * @param owner VLAN owner
-         * @return VLANInfo Builder
-         */
-        public Builder owner(Owner owner) {
-            this.owner = owner;
-            return this;
-        }
-
-        /**
-         * @param meta User defined meta information
-         * @return VLANInfo Builder
-         */
-        public Builder meta(Map<String, String> meta) {
-            this.meta = meta;
-            return this;
-        }
-
-        /**
-         * @param resourceUri Resource URI
-         * @return VLANInfo Builder
-         */
-        public Builder resourceUri(URI resourceUri) {
-            this.resourceUri = resourceUri;
-            return this;
-        }
-
-        /**
-         * @param servers Servers in this VLAN
-         * @return VLANInfo Builder
-         */
-        public Builder servers(List<Server> servers) {
-            this.servers = ImmutableList.copyOf(servers);
-            return this;
-        }
-
-        /**
-         * @param subscription Subscription related to this VLAN
-         * @return VLANInfo Builder
-         */
-        public Builder subscription(Subscription subscription) {
-            this.subscription = subscription;
-            return this;
-        }
-
-        /**
-         * @param tags Tags added to this VLAN
-         * @return VLANInfo Builder
-         */
-        public Builder tags(List<Tag> tags) {
-            this.tags = ImmutableList.copyOf(tags);
-            return this;
-        }
-
-        public VLANInfo build() {
-            return new VLANInfo(meta, uuid, owner, resourceUri, servers, subscription, tags);
-        }
-    }
-
-    private final Map<String, String> meta;
-    private final String uuid;
-    private final Owner owner;
-    @Named("resource_uri")
-    private final URI resourceUri;
-    private final List<Server> servers;
-    private final Subscription subscription;
-    private final List<Tag> tags;
-
-    @ConstructorProperties({
-            "meta", "uuid", "owner", "resource_uri", "servers", "subscription", "tags"
-    })
-    public VLANInfo(Map<String, String> meta, String uuid, Owner owner, URI resourceUri, List<Server> servers
-            , Subscription subscription, List<Tag> tags) {
-        this.meta = meta;
-        this.uuid = uuid;
-        this.owner = owner;
-        this.resourceUri = resourceUri;
-        this.servers = servers;
-        this.subscription = subscription;
-        this.tags = tags;
-    }
-
-    /**
-     * @return VLAN UUID
-     */
-    @Nullable
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * @return VLAN owner
-     */
-    public Owner getOwner() {
-        return owner;
-    }
-
-    /**
-     * @return User defined meta information
-     */
-    public Map<String, String> getMeta() {
-        return meta;
-    }
-
-    /**
-     * @return Resource URI
-     */
-    public URI getResourceUri() {
-        return resourceUri;
-    }
-
-    /**
-     * @return Servers in this VLAN
-     */
-    public List<Server> getServers() {
-        return servers;
-    }
-
-    /**
-     * @return Subscription related to this VLAN
-     */
-    public Subscription getSubscription() {
-        return subscription;
-    }
-
-    /**
-     * @return Tags added to this VLAN
-     */
-    public List<Tag> getTags() {
-        return tags;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof VLANInfo)) return false;
-
-        VLANInfo vlanInfo = (VLANInfo) o;
-
-        if (meta != null ? !meta.equals(vlanInfo.meta) : vlanInfo.meta != null) return false;
-        if (owner != null ? !owner.equals(vlanInfo.owner) : vlanInfo.owner != null) return false;
-        if (resourceUri != null ? !resourceUri.equals(vlanInfo.resourceUri) : vlanInfo.resourceUri != null)
-            return false;
-        if (servers != null ? !servers.equals(vlanInfo.servers) : vlanInfo.servers != null) return false;
-        if (subscription != null ? !subscription.equals(vlanInfo.subscription) : vlanInfo.subscription != null)
-            return false;
-        if (tags != null ? !tags.equals(vlanInfo.tags) : vlanInfo.tags != null) return false;
-        if (uuid != null ? !uuid.equals(vlanInfo.uuid) : vlanInfo.uuid != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = meta != null ? meta.hashCode() : 0;
-        result = 31 * result + (uuid != null ? uuid.hashCode() : 0);
-        result = 31 * result + (owner != null ? owner.hashCode() : 0);
-        result = 31 * result + (resourceUri != null ? resourceUri.hashCode() : 0);
-        result = 31 * result + (servers != null ? servers.hashCode() : 0);
-        result = 31 * result + (subscription != null ? subscription.hashCode() : 0);
-        result = 31 * result + (tags != null ? tags.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "[" +
-                "meta=" + meta +
-                ", uuid='" + uuid + '\'' +
-                ", owner=" + owner +
-                ", resourceUri=" + resourceUri +
-                ", servers=" + servers +
-                ", subscription=" + subscription +
-                ", tags=" + tags +
-                "]";
-    }
-
-    /**
-     * Creates VLAN NIC
-     *
-     * @param firewallPolicy
-     * @return server's NIC
-     */
-    public NIC toNIC(FirewallPolicy firewallPolicy){
-        return new NIC.Builder()
-                .vlan(new Builder().uuid(this.uuid).build())
-                .firewallPolicy(firewallPolicy)
-                .build();
-    }
-
-    /**
-     * Creates VLAN NIC
-     *
-     * @return server's NIC
-     */
-    public NIC toNIC(){
-        return toNIC(null);
-    }
+   public static class Builder {
+      private Map<String, String> meta;
+      private String uuid;
+      private Owner owner;
+      private URI resourceUri;
+      private List<Server> servers;
+      private Subscription subscription;
+      private List<Tag> tags;
+
+      /**
+       * @param uuid VLAN UUID
+       * @return VLANInfo Builder
+       */
+      public Builder uuid(String uuid) {
+         this.uuid = uuid;
+         return this;
+      }
+
+      /**
+       * @param owner VLAN owner
+       * @return VLANInfo Builder
+       */
+      public Builder owner(Owner owner) {
+         this.owner = owner;
+         return this;
+      }
+
+      /**
+       * @param meta User defined meta information
+       * @return VLANInfo Builder
+       */
+      public Builder meta(Map<String, String> meta) {
+         this.meta = meta;
+         return this;
+      }
+
+      /**
+       * @param resourceUri Resource URI
+       * @return VLANInfo Builder
+       */
+      public Builder resourceUri(URI resourceUri) {
+         this.resourceUri = resourceUri;
+         return this;
+      }
+
+      /**
+       * @param servers Servers in this VLAN
+       * @return VLANInfo Builder
+       */
+      public Builder servers(List<Server> servers) {
+         this.servers = ImmutableList.copyOf(servers);
+         return this;
+      }
+
+      /**
+       * @param subscription Subscription related to this VLAN
+       * @return VLANInfo Builder
+       */
+      public Builder subscription(Subscription subscription) {
+         this.subscription = subscription;
+         return this;
+      }
+
+      /**
+       * @param tags Tags added to this VLAN
+       * @return VLANInfo Builder
+       */
+      public Builder tags(List<Tag> tags) {
+         this.tags = ImmutableList.copyOf(tags);
+         return this;
+      }
+
+      public VLANInfo build() {
+         return new VLANInfo(meta, uuid, owner, resourceUri, servers, subscription, tags);
+      }
+   }
+
+   private final Map<String, String> meta;
+   private final String uuid;
+   private final Owner owner;
+   @Named("resource_uri")
+   private final URI resourceUri;
+   private final List<Server> servers;
+   private final Subscription subscription;
+   private final List<Tag> tags;
+
+   @ConstructorProperties({
+         "meta", "uuid", "owner", "resource_uri", "servers", "subscription", "tags"
+   })
+   public VLANInfo(Map<String, String> meta, String uuid, Owner owner, URI resourceUri, List<Server> servers
+         , Subscription subscription, List<Tag> tags) {
+      this.meta = meta;
+      this.uuid = uuid;
+      this.owner = owner;
+      this.resourceUri = resourceUri;
+      this.servers = servers;
+      this.subscription = subscription;
+      this.tags = tags;
+   }
+
+   /**
+    * @return VLAN UUID
+    */
+   @Nullable
+   public String getUuid() {
+      return uuid;
+   }
+
+   /**
+    * @return VLAN owner
+    */
+   public Owner getOwner() {
+      return owner;
+   }
+
+   /**
+    * @return User defined meta information
+    */
+   public Map<String, String> getMeta() {
+      return meta;
+   }
+
+   /**
+    * @return Resource URI
+    */
+   public URI getResourceUri() {
+      return resourceUri;
+   }
+
+   /**
+    * @return Servers in this VLAN
+    */
+   public List<Server> getServers() {
+      return servers;
+   }
+
+   /**
+    * @return Subscription related to this VLAN
+    */
+   public Subscription getSubscription() {
+      return subscription;
+   }
+
+   /**
+    * @return Tags added to this VLAN
+    */
+   public List<Tag> getTags() {
+      return tags;
+   }
+
+   @Override
+   public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof VLANInfo)) return false;
+
+      VLANInfo vlanInfo = (VLANInfo) o;
+
+      if (meta != null ? !meta.equals(vlanInfo.meta) : vlanInfo.meta != null) return false;
+      if (owner != null ? !owner.equals(vlanInfo.owner) : vlanInfo.owner != null) return false;
+      if (resourceUri != null ? !resourceUri.equals(vlanInfo.resourceUri) : vlanInfo.resourceUri != null)
+         return false;
+      if (servers != null ? !servers.equals(vlanInfo.servers) : vlanInfo.servers != null) return false;
+      if (subscription != null ? !subscription.equals(vlanInfo.subscription) : vlanInfo.subscription != null)
+         return false;
+      if (tags != null ? !tags.equals(vlanInfo.tags) : vlanInfo.tags != null) return false;
+      if (uuid != null ? !uuid.equals(vlanInfo.uuid) : vlanInfo.uuid != null) return false;
+
+      return true;
+   }
+
+   @Override
+   public int hashCode() {
+      int result = meta != null ? meta.hashCode() : 0;
+      result = 31 * result + (uuid != null ? uuid.hashCode() : 0);
+      result = 31 * result + (owner != null ? owner.hashCode() : 0);
+      result = 31 * result + (resourceUri != null ? resourceUri.hashCode() : 0);
+      result = 31 * result + (servers != null ? servers.hashCode() : 0);
+      result = 31 * result + (subscription != null ? subscription.hashCode() : 0);
+      result = 31 * result + (tags != null ? tags.hashCode() : 0);
+      return result;
+   }
+
+   @Override
+   public String toString() {
+      return "[" +
+            "meta=" + meta +
+            ", uuid='" + uuid + '\'' +
+            ", owner=" + owner +
+            ", resourceUri=" + resourceUri +
+            ", servers=" + servers +
+            ", subscription=" + subscription +
+            ", tags=" + tags +
+            "]";
+   }
+
+   /**
+    * Creates VLAN NIC
+    *
+    * @param firewallPolicy
+    * @return server's NIC
+    */
+   public NIC toNIC(FirewallPolicy firewallPolicy) {
+      return new NIC.Builder()
+            .vlan(new Builder().uuid(this.uuid).build())
+            .firewallPolicy(firewallPolicy)
+            .build();
+   }
+
+   /**
+    * Creates VLAN NIC
+    *
+    * @return server's NIC
+    */
+   public NIC toNIC() {
+      return toNIC(null);
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/CreateSubscriptionRequestToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/CreateSubscriptionRequestToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/CreateSubscriptionRequestToJson.java
index c26a8a7..35d04e9 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/CreateSubscriptionRequestToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/CreateSubscriptionRequestToJson.java
@@ -28,26 +28,26 @@ import javax.inject.Singleton;
  */
 @Singleton
 public class CreateSubscriptionRequestToJson implements Function<CreateSubscriptionRequest, JsonObject> {
-    @Override
-    public JsonObject apply(@Nullable CreateSubscriptionRequest input) {
-        if(input == null){
-            return null;
-        }
+   @Override
+   public JsonObject apply(@Nullable CreateSubscriptionRequest input) {
+      if (input == null) {
+         return null;
+      }
 
-        JsonObject createSubscriptionObject = new JsonObject();
+      JsonObject createSubscriptionObject = new JsonObject();
 
-        if(input.getAmount() != null){
-            createSubscriptionObject.addProperty("amount", input.getAmount());
-        }
+      if (input.getAmount() != null) {
+         createSubscriptionObject.addProperty("amount", input.getAmount());
+      }
 
-        if(input.getPeriod() != null){
-            createSubscriptionObject.addProperty("period", input.getPeriod());
-        }
+      if (input.getPeriod() != null) {
+         createSubscriptionObject.addProperty("period", input.getPeriod());
+      }
 
-        if(input.getResource() != null){
-            createSubscriptionObject.addProperty("resource", input.getResource().value());
-        }
+      if (input.getResource() != null) {
+         createSubscriptionObject.addProperty("resource", input.getResource().value());
+      }
 
-        return createSubscriptionObject;
-    }
+      return createSubscriptionObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java
index 710d606..21f7527 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/DriveToJson.java
@@ -29,35 +29,35 @@ import javax.inject.Singleton;
  */
 @Singleton
 public class DriveToJson implements Function<DriveInfo, JsonObject> {
-    @Override
-    public JsonObject apply(DriveInfo input) {
-        JsonObject driveObject = new JsonObject();
+   @Override
+   public JsonObject apply(DriveInfo input) {
+      JsonObject driveObject = new JsonObject();
 
-        if(input.getName() != null){
-            driveObject.addProperty("name", input.getName());
-        }
+      if (input.getName() != null) {
+         driveObject.addProperty("name", input.getName());
+      }
 
-        if(input.getSize() != null){
-            driveObject.addProperty("size", "" + input.getSize().toString());
-        }
+      if (input.getSize() != null) {
+         driveObject.addProperty("size", "" + input.getSize().toString());
+      }
 
-        if(input.getMedia() != null){
-            driveObject.addProperty("media", input.getMedia().toString());
-        }
+      if (input.getMedia() != null) {
+         driveObject.addProperty("media", input.getMedia().toString());
+      }
 
-        if(input.getAffinities() != null){
-            driveObject.add("affinities", new JsonParser().parse(new Gson().toJson(input.getAffinities())));
-        }
+      if (input.getAffinities() != null) {
+         driveObject.add("affinities", new JsonParser().parse(new Gson().toJson(input.getAffinities())));
+      }
 
-        if(input.getMeta() != null){
-            driveObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         driveObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        if(input.getTags() != null){
-            driveObject.add("tags", new JsonParser().parse(new Gson().toJson(input.getTags())));
-        }
+      if (input.getTags() != null) {
+         driveObject.add("tags", new JsonParser().parse(new Gson().toJson(input.getTags())));
+      }
 
-        driveObject.addProperty("allow_multimount", input.isAllowMultimount());
-        return driveObject;
-    }
+      driveObject.addProperty("allow_multimount", input.isAllowMultimount());
+      return driveObject;
+   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJson.java
index 41b00af..3a996ce 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJson.java
@@ -32,61 +32,61 @@ import javax.inject.Singleton;
  */
 @Singleton
 public class FirewallPolicyToJson implements Function<FirewallPolicy, JsonObject> {
-    @Override
-    public JsonObject apply(@Nullable FirewallPolicy input) {
-        JsonObject firewallObject = new JsonObject();
+   @Override
+   public JsonObject apply(@Nullable FirewallPolicy input) {
+      JsonObject firewallObject = new JsonObject();
 
-        if(input.getName() != null){
-            firewallObject.addProperty("name", input.getName());
-        }
+      if (input.getName() != null) {
+         firewallObject.addProperty("name", input.getName());
+      }
 
-        if(input.getMeta() != null){
-            firewallObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         firewallObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        if(input.getRules() != null){
-            JsonArray rulesArray = new JsonArray();
+      if (input.getRules() != null) {
+         JsonArray rulesArray = new JsonArray();
 
-            for(FirewallRule rule : input.getRules()){
-                JsonObject ruleObject = new JsonObject();
+         for (FirewallRule rule : input.getRules()) {
+            JsonObject ruleObject = new JsonObject();
 
-                if(rule.getAction() != null){
-                    ruleObject.addProperty("action", rule.getAction().value());
-                }
-
-                if(rule.getComment() != null){
-                    ruleObject.addProperty("comment", rule.getComment());
-                }
+            if (rule.getAction() != null) {
+               ruleObject.addProperty("action", rule.getAction().value());
+            }
 
-                if(rule.getDirection() != null){
-                    ruleObject.addProperty("direction", rule.getDirection().value());
-                }
+            if (rule.getComment() != null) {
+               ruleObject.addProperty("comment", rule.getComment());
+            }
 
-                if(rule.getDestinationIp() != null){
-                    ruleObject.addProperty("dst_ip", rule.getDestinationIp());
-                }
+            if (rule.getDirection() != null) {
+               ruleObject.addProperty("direction", rule.getDirection().value());
+            }
 
-                if(rule.getDestinationPort() != null){
-                    ruleObject.addProperty("dst_port", rule.getDestinationPort());
-                }
+            if (rule.getDestinationIp() != null) {
+               ruleObject.addProperty("dst_ip", rule.getDestinationIp());
+            }
 
-                if(rule.getIpProtocol() != null){
-                    ruleObject.addProperty("ip_proto", rule.getIpProtocol().toString());
-                }
+            if (rule.getDestinationPort() != null) {
+               ruleObject.addProperty("dst_port", rule.getDestinationPort());
+            }
 
-                if(rule.getSourceIp() != null){
-                    ruleObject.addProperty("src_ip", rule.getSourceIp());
-                }
+            if (rule.getIpProtocol() != null) {
+               ruleObject.addProperty("ip_proto", rule.getIpProtocol().toString());
+            }
 
-                if(rule.getSourcePort() != null){
-                    ruleObject.addProperty("src_port", rule.getSourcePort());
-                }
+            if (rule.getSourceIp() != null) {
+               ruleObject.addProperty("src_ip", rule.getSourceIp());
+            }
 
-                rulesArray.add(ruleObject);
+            if (rule.getSourcePort() != null) {
+               ruleObject.addProperty("src_port", rule.getSourcePort());
             }
 
-            firewallObject.add("rules", rulesArray);
-        }
-        return firewallObject;
-    }
+            rulesArray.add(ruleObject);
+         }
+
+         firewallObject.add("rules", rulesArray);
+      }
+      return firewallObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/IPInfoToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/IPInfoToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/IPInfoToJson.java
index 34507e4..e2cfef3 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/IPInfoToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/IPInfoToJson.java
@@ -29,19 +29,19 @@ import javax.inject.Singleton;
  * @author Vladimir Shevchenko
  */
 @Singleton
-public class IPInfoToJson implements Function<IPInfo, JsonObject>{
-    @Override
-    public JsonObject apply(@Nullable IPInfo input) {
-        if(input == null){
-            return null;
-        }
+public class IPInfoToJson implements Function<IPInfo, JsonObject> {
+   @Override
+   public JsonObject apply(@Nullable IPInfo input) {
+      if (input == null) {
+         return null;
+      }
 
-        JsonObject ipObject = new JsonObject();
+      JsonObject ipObject = new JsonObject();
 
-        if(input.getMeta() != null){
-            ipObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         ipObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        return ipObject;
-    }
+      return ipObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJson.java
index 88f235a..ab2bda2 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJson.java
@@ -30,26 +30,26 @@ import javax.inject.Singleton;
 @Singleton
 public class LibraryDriveToJson implements Function<LibraryDrive, JsonObject> {
 
-    private final DriveToJson infoJsonObjectFunction;
+   private final DriveToJson infoJsonObjectFunction;
 
-    @Inject
-    public LibraryDriveToJson(DriveToJson infoJsonObjectFunction) {
-        this.infoJsonObjectFunction = infoJsonObjectFunction;
-    }
+   @Inject
+   public LibraryDriveToJson(DriveToJson infoJsonObjectFunction) {
+      this.infoJsonObjectFunction = infoJsonObjectFunction;
+   }
 
-    @Override
-    public JsonObject apply(@Nullable LibraryDrive input) {
-        JsonObject libraryDriveObject = infoJsonObjectFunction.apply(input);
+   @Override
+   public JsonObject apply(@Nullable LibraryDrive input) {
+      JsonObject libraryDriveObject = infoJsonObjectFunction.apply(input);
 
-        if(libraryDriveObject == null){
-            libraryDriveObject = new JsonObject();
-        }
+      if (libraryDriveObject == null) {
+         libraryDriveObject = new JsonObject();
+      }
 
-        libraryDriveObject.addProperty("favourite", input.isFavorite());
+      libraryDriveObject.addProperty("favourite", input.isFavorite());
 
-        if(input.getDescription() != null){
-            libraryDriveObject.addProperty("description", input.getDescription());
-        }
-        return libraryDriveObject;
-    }
+      if (input.getDescription() != null) {
+         libraryDriveObject.addProperty("description", input.getDescription());
+      }
+      return libraryDriveObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJson.java
index c42911a..ed8a700 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJson.java
@@ -29,71 +29,71 @@ import javax.inject.Singleton;
  * @author Vladimir Shevchenko
  */
 @Singleton
-public class ProfileInfoToJson implements Function<ProfileInfo, JsonObject>{
-    @Override
-    public JsonObject apply(@Nullable ProfileInfo input) {
-        if(input == null){
-            return null;
-        }
+public class ProfileInfoToJson implements Function<ProfileInfo, JsonObject> {
+   @Override
+   public JsonObject apply(@Nullable ProfileInfo input) {
+      if (input == null) {
+         return null;
+      }
 
-        JsonObject profileJson = new JsonObject();
+      JsonObject profileJson = new JsonObject();
 
-        if(input.getAddress() != null){
-            profileJson.addProperty("address", input.getAddress());
-        }
+      if (input.getAddress() != null) {
+         profileJson.addProperty("address", input.getAddress());
+      }
 
-        if(input.getBankReference() != null){
-            profileJson.addProperty("bank_reference", input.getBankReference());
-        }
+      if (input.getBankReference() != null) {
+         profileJson.addProperty("bank_reference", input.getBankReference());
+      }
 
-        if(input.getCompany() != null){
-            profileJson.addProperty("company", input.getCompany());
-        }
+      if (input.getCompany() != null) {
+         profileJson.addProperty("company", input.getCompany());
+      }
 
-        if(input.getCountry() != null){
-            profileJson.addProperty("country", input.getCountry());
-        }
+      if (input.getCountry() != null) {
+         profileJson.addProperty("country", input.getCountry());
+      }
 
-        if(input.getEmail() != null){
-            profileJson.addProperty("email", input.getEmail());
-        }
+      if (input.getEmail() != null) {
+         profileJson.addProperty("email", input.getEmail());
+      }
 
-        if(input.getFirstName() != null){
-            profileJson.addProperty("first_name", input.getFirstName());
-        }
+      if (input.getFirstName() != null) {
+         profileJson.addProperty("first_name", input.getFirstName());
+      }
 
-        if(input.getLastName() != null){
-            profileJson.addProperty("last_name", input.getLastName());
-        }
+      if (input.getLastName() != null) {
+         profileJson.addProperty("last_name", input.getLastName());
+      }
 
-        if(input.getMeta() != null){
-            profileJson.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         profileJson.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        if(input.getMyNotes() != null){
-            profileJson.addProperty("my_notes", input.getMyNotes());
-        }
+      if (input.getMyNotes() != null) {
+         profileJson.addProperty("my_notes", input.getMyNotes());
+      }
 
-        if(input.getNickname() != null){
-            profileJson.addProperty("nickname", input.getNickname());
-        }
+      if (input.getNickname() != null) {
+         profileJson.addProperty("nickname", input.getNickname());
+      }
 
-        if(input.getPhone() != null){
-            profileJson.addProperty("phone", input.getPhone());
-        }
+      if (input.getPhone() != null) {
+         profileJson.addProperty("phone", input.getPhone());
+      }
 
-        if(input.getPostcode() != null){
-            profileJson.addProperty("postcode", input.getPostcode());
-        }
+      if (input.getPostcode() != null) {
+         profileJson.addProperty("postcode", input.getPostcode());
+      }
 
-        if(input.getTitle() != null){
-            profileJson.addProperty("title", input.getTitle());
-        }
+      if (input.getTitle() != null) {
+         profileJson.addProperty("title", input.getTitle());
+      }
 
-        if(input.getTown() != null){
-            profileJson.addProperty("town", input.getTown());
-        }
+      if (input.getTown() != null) {
+         profileJson.addProperty("town", input.getTown());
+      }
 
-        return profileJson;
-    }
+      return profileJson;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ServerInfoToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ServerInfoToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ServerInfoToJson.java
index c086326..07d57f7 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ServerInfoToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/ServerInfoToJson.java
@@ -33,113 +33,113 @@ import javax.inject.Singleton;
  */
 @Singleton
 public class ServerInfoToJson implements Function<ServerInfo, JsonObject> {
-    @Override
-    public JsonObject apply(ServerInfo input) {
-        JsonObject serverObject = new JsonObject();
-
-        if(input.getName() != null){
-            serverObject.addProperty("name", input.getName());
-        }
-
-        if(input.getCpu() > 0){
-            serverObject.addProperty("cpu", input.getCpu());
-        }
-
-        if(input.getMemory() != null){
-            serverObject.addProperty("mem", input.getMemory().toString());
-        }
-
-        if(input.getMeta() != null){
-            serverObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
-
-        if(input.getRequirements() != null){
-            serverObject.add("requirements", new JsonParser().parse(new Gson().toJson(input.getRequirements())));
-        }
-
-        if(input.getTags() != null){
-            serverObject.add("tags", new JsonParser().parse(new Gson().toJson(input.getTags())));
-        }
-
-        if(input.getVncPassword() != null){
-            serverObject.addProperty("vnc_password", input.getVncPassword());
-        }
-
-        if(input.getNics() != null){
-            JsonArray nics = new JsonArray();
-
-            for(NIC nic : input.getNics()){
-                JsonObject nicObject = new JsonObject();
-
-                if(nic.getFirewallPolicy() != null){
-                    nicObject.addProperty("firewall_policy", nic.getFirewallPolicy().getUuid());
-                }
-
-                if(nic.getVlan() != null){
-                    nicObject.addProperty("vlan", nic.getVlan().getUuid());
-                } else if(nic.getIpV4Configuration() != null){
-                    nicObject.add("ip_v4_conf", ipConfigurationToJsonObject(nic.getIpV4Configuration()));
-
-                    if(nic.getModel() != null){
-                        nicObject.addProperty("model", nic.getModel().value());
-                    }
-                    if(nic.getMac() != null){
-                        nicObject.addProperty("mac", nic.getMac());
-                    }
-                } else if(nic.getIpV6Configuration() != null){
-                    nicObject.add("ip_v6_conf", ipConfigurationToJsonObject(nic.getIpV6Configuration()));
-
-                    if(nic.getModel() != null){
-                        nicObject.addProperty("model", nic.getModel().value());
-                    }
-                    if(nic.getMac() != null){
-                        nicObject.addProperty("mac", nic.getMac());
-                    }
-                }
-
-                nics.add(nicObject);
+   @Override
+   public JsonObject apply(ServerInfo input) {
+      JsonObject serverObject = new JsonObject();
+
+      if (input.getName() != null) {
+         serverObject.addProperty("name", input.getName());
+      }
+
+      if (input.getCpu() > 0) {
+         serverObject.addProperty("cpu", input.getCpu());
+      }
+
+      if (input.getMemory() != null) {
+         serverObject.addProperty("mem", input.getMemory().toString());
+      }
+
+      if (input.getMeta() != null) {
+         serverObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
+
+      if (input.getRequirements() != null) {
+         serverObject.add("requirements", new JsonParser().parse(new Gson().toJson(input.getRequirements())));
+      }
+
+      if (input.getTags() != null) {
+         serverObject.add("tags", new JsonParser().parse(new Gson().toJson(input.getTags())));
+      }
+
+      if (input.getVncPassword() != null) {
+         serverObject.addProperty("vnc_password", input.getVncPassword());
+      }
+
+      if (input.getNics() != null) {
+         JsonArray nics = new JsonArray();
+
+         for (NIC nic : input.getNics()) {
+            JsonObject nicObject = new JsonObject();
+
+            if (nic.getFirewallPolicy() != null) {
+               nicObject.addProperty("firewall_policy", nic.getFirewallPolicy().getUuid());
             }
 
-            serverObject.add("nics", nics);
-        }
+            if (nic.getVlan() != null) {
+               nicObject.addProperty("vlan", nic.getVlan().getUuid());
+            } else if (nic.getIpV4Configuration() != null) {
+               nicObject.add("ip_v4_conf", ipConfigurationToJsonObject(nic.getIpV4Configuration()));
+
+               if (nic.getModel() != null) {
+                  nicObject.addProperty("model", nic.getModel().value());
+               }
+               if (nic.getMac() != null) {
+                  nicObject.addProperty("mac", nic.getMac());
+               }
+            } else if (nic.getIpV6Configuration() != null) {
+               nicObject.add("ip_v6_conf", ipConfigurationToJsonObject(nic.getIpV6Configuration()));
+
+               if (nic.getModel() != null) {
+                  nicObject.addProperty("model", nic.getModel().value());
+               }
+               if (nic.getMac() != null) {
+                  nicObject.addProperty("mac", nic.getMac());
+               }
+            }
 
-        if(input.getDrives() != null){
-            JsonArray serverDrives = new JsonArray();
+            nics.add(nicObject);
+         }
 
-            for(ServerDrive serverDrive : input.getDrives()){
-                JsonObject driveObject = new JsonObject();
-                driveObject.addProperty("boot_order", serverDrive.getBootOrder());
+         serverObject.add("nics", nics);
+      }
 
-                if(serverDrive.getDeviceChannel() != null){
-                    driveObject.addProperty("dev_channel", serverDrive.getDeviceChannel());
-                }
+      if (input.getDrives() != null) {
+         JsonArray serverDrives = new JsonArray();
 
-                if(serverDrive.getDeviceEmulationType() != null){
-                    driveObject.addProperty("device", serverDrive.getDeviceEmulationType().value());
-                }
+         for (ServerDrive serverDrive : input.getDrives()) {
+            JsonObject driveObject = new JsonObject();
+            driveObject.addProperty("boot_order", serverDrive.getBootOrder());
 
-                if(serverDrive.getDriveUuid() != null){
-                    driveObject.addProperty("drive", serverDrive.getDriveUuid());
-                } else if(serverDrive.getDrive() != null){
-                    driveObject.addProperty("drive", serverDrive.getDrive().getUuid());
-                }
+            if (serverDrive.getDeviceChannel() != null) {
+               driveObject.addProperty("dev_channel", serverDrive.getDeviceChannel());
+            }
 
-                serverDrives.add(driveObject);
+            if (serverDrive.getDeviceEmulationType() != null) {
+               driveObject.addProperty("device", serverDrive.getDeviceEmulationType().value());
             }
-            serverObject.add("drives", serverDrives);
-        }
-
-        return serverObject;
-    }
-
-    private JsonObject ipConfigurationToJsonObject(IPConfiguration ipConfiguration){
-        JsonObject ipConfObject = new JsonObject();
-        if(ipConfiguration.getConfigurationType() != null){
-            ipConfObject.addProperty("conf", ipConfiguration.getConfigurationType().value());
-        }
-        if(ipConfiguration.getIp() != null){
-            ipConfObject.addProperty("ip", ipConfiguration.getIp().getUuid());
-        }
-        return ipConfObject;
-    }
+
+            if (serverDrive.getDriveUuid() != null) {
+               driveObject.addProperty("drive", serverDrive.getDriveUuid());
+            } else if (serverDrive.getDrive() != null) {
+               driveObject.addProperty("drive", serverDrive.getDrive().getUuid());
+            }
+
+            serverDrives.add(driveObject);
+         }
+         serverObject.add("drives", serverDrives);
+      }
+
+      return serverObject;
+   }
+
+   private JsonObject ipConfigurationToJsonObject(IPConfiguration ipConfiguration) {
+      JsonObject ipConfObject = new JsonObject();
+      if (ipConfiguration.getConfigurationType() != null) {
+         ipConfObject.addProperty("conf", ipConfiguration.getConfigurationType().value());
+      }
+      if (ipConfiguration.getIp() != null) {
+         ipConfObject.addProperty("ip", ipConfiguration.getIp().getUuid());
+      }
+      return ipConfObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/TagToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/TagToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/TagToJson.java
index 6beb728..d02f29e 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/TagToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/TagToJson.java
@@ -33,28 +33,28 @@ import javax.inject.Singleton;
  */
 @Singleton
 public class TagToJson implements Function<Tag, JsonObject> {
-    @Override
-    public JsonObject apply(@Nullable Tag input) {
-        JsonObject jsonTag = new JsonObject();
+   @Override
+   public JsonObject apply(@Nullable Tag input) {
+      JsonObject jsonTag = new JsonObject();
 
-        if(input.getName() != null){
-            jsonTag.addProperty("name", input.getName());
-        }
+      if (input.getName() != null) {
+         jsonTag.addProperty("name", input.getName());
+      }
 
-        if(input.getMeta() != null){
-            jsonTag.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         jsonTag.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        if(input.getResources() != null && input.getResources().size() != 0){
-            JsonArray uuidsArray = new JsonArray();
+      if (input.getResources() != null && input.getResources().size() != 0) {
+         JsonArray uuidsArray = new JsonArray();
 
-            for(TagResource tagResource : input.getResources()){
-                uuidsArray.add(new JsonPrimitive(tagResource.getUuid()));
-            }
+         for (TagResource tagResource : input.getResources()) {
+            uuidsArray.add(new JsonPrimitive(tagResource.getUuid()));
+         }
 
-            jsonTag.add("resources", uuidsArray);
-        }
+         jsonTag.add("resources", uuidsArray);
+      }
 
-        return jsonTag;
-    }
+      return jsonTag;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/VLANInfoToJson.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/VLANInfoToJson.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/VLANInfoToJson.java
index 60d3d31..71eeedb 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/VLANInfoToJson.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/VLANInfoToJson.java
@@ -30,18 +30,18 @@ import org.jclouds.javax.annotation.Nullable;
 @Singleton
 public class VLANInfoToJson implements Function<VLANInfo, JsonObject> {
 
-    @Override
-    public JsonObject apply(@Nullable VLANInfo input) {
-        if(input == null){
-            return null;
-        }
+   @Override
+   public JsonObject apply(@Nullable VLANInfo input) {
+      if (input == null) {
+         return null;
+      }
 
-        JsonObject vlanObject = new JsonObject();
+      JsonObject vlanObject = new JsonObject();
 
-        if(input.getMeta() != null){
-            vlanObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
-        }
+      if (input.getMeta() != null) {
+         vlanObject.add("meta", new JsonParser().parse(new Gson().toJson(input.getMeta())));
+      }
 
-        return vlanObject;
-    }
+      return vlanObject;
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDiscounts.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDiscounts.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDiscounts.java
index 8085563..04b59cf 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDiscounts.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDiscounts.java
@@ -36,38 +36,38 @@ import java.util.List;
  * @author Vladimir Shevchenko
  */
 @Singleton
-public class ParseDiscounts extends ParseJson<ParseDiscounts.Discounts>{
-    static class Discounts extends PaginatedCollection<Discount> {
+public class ParseDiscounts extends ParseJson<ParseDiscounts.Discounts> {
+   static class Discounts extends PaginatedCollection<Discount> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public Discounts(Iterable<Discount> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public Discounts(Iterable<Discount> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseDiscounts(Json json) {
-        super(json, TypeLiteral.get(Discounts.class));
-    }
+   @Inject
+   public ParseDiscounts(Json json) {
+      super(json, TypeLiteral.get(Discounts.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<Discount, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<Discount, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<Discount>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<Discount>>() {
-                @Override
-                public IterableWithMarker<Discount> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listDiscounts(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<Discount>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<Discount>>() {
+            @Override
+            public IterableWithMarker<Discount> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listDiscounts(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDriveInfos.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDriveInfos.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDriveInfos.java
index 791d78c..20c3b7d 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDriveInfos.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDriveInfos.java
@@ -38,37 +38,37 @@ import java.util.List;
 @Singleton
 public class ParseDriveInfos extends ParseJson<ParseDriveInfos.DriveInfos> {
 
-    static class DriveInfos extends PaginatedCollection<DriveInfo>{
+   static class DriveInfos extends PaginatedCollection<DriveInfo> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public DriveInfos(Iterable<DriveInfo> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public DriveInfos(Iterable<DriveInfo> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseDriveInfos(Json json) {
-        super(json, TypeLiteral.get(DriveInfos.class));
-    }
+   @Inject
+   public ParseDriveInfos(Json json) {
+      super(json, TypeLiteral.get(DriveInfos.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<DriveInfo, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<DriveInfo, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<DriveInfo>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<DriveInfo>>() {
-                @Override
-                public IterableWithMarker<DriveInfo> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listDrivesInfo(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<DriveInfo>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<DriveInfo>>() {
+            @Override
+            public IterableWithMarker<DriveInfo> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listDrivesInfo(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDrives.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDrives.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDrives.java
index 0338a84..9475aa5 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDrives.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseDrives.java
@@ -37,37 +37,37 @@ import java.util.List;
  */
 @Singleton
 public class ParseDrives extends ParseJson<ParseDrives.Drives> {
-    static class Drives extends PaginatedCollection<Drive>{
+   static class Drives extends PaginatedCollection<Drive> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public Drives(Iterable<Drive> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public Drives(Iterable<Drive> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseDrives(Json json) {
-        super(json, TypeLiteral.get(Drives.class));
-    }
+   @Inject
+   public ParseDrives(Json json) {
+      super(json, TypeLiteral.get(Drives.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<Drive, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<Drive, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<Drive>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<Drive>>() {
-                @Override
-                public IterableWithMarker<Drive> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listDrives(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<Drive>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<Drive>>() {
+            @Override
+            public IterableWithMarker<Drive> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listDrives(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseFirewallPolicies.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseFirewallPolicies.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseFirewallPolicies.java
index f4d50bd..6080a97 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseFirewallPolicies.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseFirewallPolicies.java
@@ -36,59 +36,59 @@ import java.util.List;
  * @author Vladimir Shevchenko
  */
 @Singleton
-public class ParseFirewallPolicies extends ParseJson<ParseFirewallPolicies.FirewallPolicies>{
-    static class FirewallPolicies extends PaginatedCollection<FirewallPolicy>{
+public class ParseFirewallPolicies extends ParseJson<ParseFirewallPolicies.FirewallPolicies> {
+   static class FirewallPolicies extends PaginatedCollection<FirewallPolicy> {
 
-        @ConstructorProperties({"objects", "meta"})
-        FirewallPolicies(Iterable<FirewallPolicy> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      FirewallPolicies(Iterable<FirewallPolicy> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseFirewallPolicies(Json json) {
-        super(json, TypeLiteral.get(FirewallPolicies.class));
-    }
+   @Inject
+   public ParseFirewallPolicies(Json json) {
+      super(json, TypeLiteral.get(FirewallPolicies.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<FirewallPolicy, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<FirewallPolicy, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<FirewallPolicy>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<FirewallPolicy>>() {
-                @Override
-                public IterableWithMarker<FirewallPolicy> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listFirewallPolicies(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<FirewallPolicy>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<FirewallPolicy>>() {
+            @Override
+            public IterableWithMarker<FirewallPolicy> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listFirewallPolicies(paginationOptions);
+            }
+         };
+      }
+   }
 
-    public static class ToPagedIterableInfo extends ArgsToPagedIterable<FirewallPolicy, ToPagedIterable> {
+   public static class ToPagedIterableInfo extends ArgsToPagedIterable<FirewallPolicy, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterableInfo(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterableInfo(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<FirewallPolicy>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<FirewallPolicy>>() {
-                @Override
-                public IterableWithMarker<FirewallPolicy> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listFirewallPoliciesInfo(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<FirewallPolicy>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<FirewallPolicy>>() {
+            @Override
+            public IterableWithMarker<FirewallPolicy> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listFirewallPoliciesInfo(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPInfos.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPInfos.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPInfos.java
index 29f23c2..48c7712 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPInfos.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPInfos.java
@@ -36,38 +36,38 @@ import java.util.List;
  * @author Vladimir Shevchenko
  */
 @Singleton
-public class ParseIPInfos extends ParseJson<ParseIPInfos.IPInfos>{
-    static class IPInfos extends PaginatedCollection<IPInfo> {
+public class ParseIPInfos extends ParseJson<ParseIPInfos.IPInfos> {
+   static class IPInfos extends PaginatedCollection<IPInfo> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public IPInfos(Iterable<IPInfo> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public IPInfos(Iterable<IPInfo> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseIPInfos(Json json) {
-        super(json, TypeLiteral.get(IPInfos.class));
-    }
+   @Inject
+   public ParseIPInfos(Json json) {
+      super(json, TypeLiteral.get(IPInfos.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<IPInfo, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<IPInfo, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<IPInfo>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<IPInfo>>() {
-                @Override
-                public IterableWithMarker<IPInfo> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listIPInfo(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<IPInfo>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<IPInfo>>() {
+            @Override
+            public IterableWithMarker<IPInfo> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listIPInfo(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPs.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPs.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPs.java
index d8bf6b9..7fe045f 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPs.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseIPs.java
@@ -37,37 +37,37 @@ import java.util.List;
  */
 @Singleton
 public class ParseIPs extends ParseJson<ParseIPs.IPs> {
-    static class IPs extends PaginatedCollection<IP> {
+   static class IPs extends PaginatedCollection<IP> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public IPs(Iterable<IP> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public IPs(Iterable<IP> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseIPs(Json json) {
-        super(json, TypeLiteral.get(IPs.class));
-    }
+   @Inject
+   public ParseIPs(Json json) {
+      super(json, TypeLiteral.get(IPs.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<IP, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<IP, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<IP>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<IP>>() {
-                @Override
-                public IterableWithMarker<IP> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listIPs(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<IP>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<IP>>() {
+            @Override
+            public IterableWithMarker<IP> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listIPs(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLibraryDrives.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLibraryDrives.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLibraryDrives.java
index 457e855..91c89b3 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLibraryDrives.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLibraryDrives.java
@@ -37,37 +37,37 @@ import java.util.List;
  */
 @Singleton
 public class ParseLibraryDrives extends ParseJson<ParseLibraryDrives.LibraryDrives> {
-    static class LibraryDrives extends PaginatedCollection<LibraryDrive>{
+   static class LibraryDrives extends PaginatedCollection<LibraryDrive> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public LibraryDrives(Iterable<LibraryDrive> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public LibraryDrives(Iterable<LibraryDrive> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseLibraryDrives(Json json) {
-        super(json, TypeLiteral.get(LibraryDrives.class));
-    }
+   @Inject
+   public ParseLibraryDrives(Json json) {
+      super(json, TypeLiteral.get(LibraryDrives.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<LibraryDrive, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<LibraryDrive, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<LibraryDrive>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<LibraryDrive>>() {
-                @Override
-                public IterableWithMarker<LibraryDrive> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listLibraryDrives(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<LibraryDrive>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<LibraryDrive>>() {
+            @Override
+            public IterableWithMarker<LibraryDrive> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listLibraryDrives(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLicenses.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLicenses.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLicenses.java
index 0b9b6c6..7b8e107 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLicenses.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseLicenses.java
@@ -37,37 +37,37 @@ import java.util.List;
  */
 @Singleton
 public class ParseLicenses extends ParseJson<ParseLicenses.Licenses> {
-    static class Licenses extends PaginatedCollection<License> {
+   static class Licenses extends PaginatedCollection<License> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public Licenses(Iterable<License> objects, PaginationOptions meta) {
-            super(objects, meta);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public Licenses(Iterable<License> objects, PaginationOptions meta) {
+         super(objects, meta);
+      }
+   }
 
-    @Inject
-    public ParseLicenses(Json json) {
-        super(json, TypeLiteral.get(Licenses.class));
-    }
+   @Inject
+   public ParseLicenses(Json json) {
+      super(json, TypeLiteral.get(Licenses.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<License, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<License, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<License>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<License>>() {
-                @Override
-                public IterableWithMarker<License> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listLicenses(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<License>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<License>>() {
+            @Override
+            public IterableWithMarker<License> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listLicenses(paginationOptions);
+            }
+         };
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0d70c84a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java
index 7dca37c..cbc7a56 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/functions/internal/ParseServerInfos.java
@@ -38,37 +38,37 @@ import java.util.List;
 @Singleton
 public class ParseServerInfos extends ParseJson<ParseServerInfos.ServerInfos> {
 
-    static class ServerInfos extends PaginatedCollection<ServerInfo> {
+   static class ServerInfos extends PaginatedCollection<ServerInfo> {
 
-        @ConstructorProperties({"objects", "meta"})
-        public ServerInfos(Iterable<ServerInfo> objects, PaginationOptions paginationOptions) {
-            super(objects, paginationOptions);
-        }
-    }
+      @ConstructorProperties({"objects", "meta"})
+      public ServerInfos(Iterable<ServerInfo> objects, PaginationOptions paginationOptions) {
+         super(objects, paginationOptions);
+      }
+   }
 
-    @Inject
-    public ParseServerInfos(Json json) {
-        super(json, TypeLiteral.get(ServerInfos.class));
-    }
+   @Inject
+   public ParseServerInfos(Json json) {
+      super(json, TypeLiteral.get(ServerInfos.class));
+   }
 
-    public static class ToPagedIterable extends ArgsToPagedIterable<ServerInfo, ToPagedIterable> {
+   public static class ToPagedIterable extends ArgsToPagedIterable<ServerInfo, ToPagedIterable> {
 
-        private CloudSigma2Api api;
+      private CloudSigma2Api api;
 
-        @Inject
-        public ToPagedIterable(CloudSigma2Api api) {
-            this.api = api;
-        }
+      @Inject
+      public ToPagedIterable(CloudSigma2Api api) {
+         this.api = api;
+      }
 
-        @Override
-        protected Function<Object, IterableWithMarker<ServerInfo>> markerToNextForArgs(List<Object> args) {
-            return new Function<Object, IterableWithMarker<ServerInfo>>() {
-                @Override
-                public IterableWithMarker<ServerInfo> apply(Object input) {
-                    PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
-                    return api.listServersInfo(paginationOptions);
-                }
-            };
-        }
-    }
+      @Override
+      protected Function<Object, IterableWithMarker<ServerInfo>> markerToNextForArgs(List<Object> args) {
+         return new Function<Object, IterableWithMarker<ServerInfo>>() {
+            @Override
+            public IterableWithMarker<ServerInfo> apply(Object input) {
+               PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
+               return api.listServersInfo(paginationOptions);
+            }
+         };
+      }
+   }
 }
\ No newline at end of file