http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Plan.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Plan.java 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Plan.java
deleted file mode 100644
index 6863146..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Plan.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-
-/**
- * Plan
- */
-@AutoValue
-public abstract class Plan {
-   /**
-    * The publisher of the Plan
-    */
-   public abstract String publisher();
-   
-   /**
-    * The name of the Plan
-    */
-   public abstract String name();
-   
-   /**
-    * The product of the Plan
-    */
-   public abstract String product();
-   
-   @SerializedNames({"publisher", "name", "product"})
-   public static Plan create(final String publisher, final String name, final 
String product) {
-      return new AutoValue_Plan(publisher, name, product);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Probe.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Probe.java 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Probe.java
deleted file mode 100644
index e523984..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Probe.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class Probe {
-   @Nullable
-   public abstract String name();
-
-   @Nullable
-   public abstract String id();
-
-   @Nullable
-   public abstract ProbeProperties properties();
-
-   @Nullable
-   public abstract String etag();
-
-   @SerializedNames({ "name", "id", "properties", "etag" })
-   public static Probe create(final String name, final String id, final 
ProbeProperties properties, final String etag) {
-      return new AutoValue_Probe(name, id, properties, etag);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ProbeProperties.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ProbeProperties.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ProbeProperties.java
deleted file mode 100644
index 6fe273e..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ProbeProperties.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import org.jclouds.azurecompute.arm.util.GetEnumValue;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class ProbeProperties implements Provisionable {
-   public enum Protocol {
-      Tcp("Tcp"), Http("Http"), UNRECOGNIZED("Unrecognized");
-
-      private final String label;
-
-      private Protocol(final String label) {
-         this.label = label;
-      }
-
-      public static Protocol fromValue(final String text) {
-         return (Protocol) GetEnumValue.fromValueOrDefault(text, 
Protocol.UNRECOGNIZED);
-      }
-
-      @Override
-      public String toString() {
-         return label;
-      }
-   }
-
-   @Nullable
-   public abstract Protocol protocol();
-
-   public abstract int port();
-
-   @Nullable
-   public abstract String requestPath();
-
-   public abstract int intervalInSeconds();
-
-   public abstract int numberOfProbes();
-
-   @Nullable
-   public abstract String provisioningState();
-
-   @SerializedNames({ "protocol", "port", "requestPath", "intervalInSeconds", 
"numberOfProbes", "provisioningState" })
-   public static ProbeProperties create(final Protocol protocol, final int 
port, final String requestPath,
-         final int intervalInSeconds, final int numberOfProbes, final String 
provisioningState) {
-      return 
builder().protocol(protocol).port(port).requestPath(requestPath).intervalInSeconds(intervalInSeconds)
-            
.numberOfProbes(numberOfProbes).provisioningState(provisioningState).build();
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_ProbeProperties.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-
-      public abstract Builder protocol(Protocol protocol);
-
-      public abstract Builder port(int port);
-
-      public abstract Builder requestPath(String requestPath);
-
-      public abstract Builder intervalInSeconds(int intervalInSeconds);
-
-      public abstract Builder numberOfProbes(int numberOfProbes);
-
-      public abstract Builder provisioningState(String provisioningState);
-
-      public abstract ProbeProperties build();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Provisionable.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Provisionable.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Provisionable.java
deleted file mode 100644
index f400e93..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Provisionable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-public interface Provisionable {
-   
-   String provisioningState();
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddress.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddress.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddress.java
deleted file mode 100644
index 8d0cb2b..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddress.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableMap;
-
-@AutoValue
-public abstract class PublicIPAddress {
-
-   public abstract String name();
-   public abstract String id();
-   public abstract String etag();
-   public abstract String location();
-   @Nullable public abstract Map<String, String> tags();
-   public abstract PublicIPAddressProperties properties();
-
-   @SerializedNames({ "name", "id", "etag", "location", "tags", "properties" })
-   public static PublicIPAddress create(String name, String id, String etag, 
String location, Map<String, String> tags,
-         PublicIPAddressProperties properties) {
-      return 
builder().name(name).id(id).etag(etag).location(location).tags(tags).properties(properties).build();
-   }
-   
-   PublicIPAddress() {
-      
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_PublicIPAddress.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder name(String name);
-      public abstract Builder id(String id);
-      public abstract Builder etag(String etag);
-      public abstract Builder location(String location);
-      public abstract Builder tags(Map<String, String> tags);
-      public abstract Builder properties(PublicIPAddressProperties properties);
-      
-      abstract Map<String, String> tags();
-      abstract PublicIPAddress autoBuild();
-
-      public PublicIPAddress build() {
-         tags(tags() != null ? ImmutableMap.copyOf(tags()) : null);
-         return autoBuild();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddressProperties.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddressProperties.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddressProperties.java
deleted file mode 100644
index af7da0d..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/PublicIPAddressProperties.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-@AutoValue
-public abstract class PublicIPAddressProperties implements Provisionable {
-
-   @Nullable // needs to be nullable to create the payload for create request
-   public abstract String provisioningState();
-
-   @Nullable // only set in succeeded provisioningState for Static IP and for 
Dynamic when attached to a NIC
-   public abstract String ipAddress();
-
-   public abstract String publicIPAllocationMethod();
-
-   @Nullable
-   public abstract Integer idleTimeoutInMinutes();
-
-   @Nullable // only if attached to NIC
-   public abstract IdReference ipConfiguration();
-
-   @Nullable // only if DNS name is set
-   public abstract DnsSettings dnsSettings();
-
-   @SerializedNames({"provisioningState", "ipAddress", 
"publicIPAllocationMethod", "idleTimeoutInMinutes", "ipConfiguration", 
"dnsSettings"})
-   public static PublicIPAddressProperties create(final String 
provisioningState,
-                                                  final String ipAddress,
-                                                  final String 
publicIPAllocationMethod,
-                                                  final Integer 
idleTimeoutInMinutes,
-                                                  final IdReference 
ipConfiguration,
-                                                  final DnsSettings 
dnsSettings) {
-      return builder()
-              .provisioningState(provisioningState)
-              .ipAddress(ipAddress)
-              .publicIPAllocationMethod(publicIPAllocationMethod)
-              .idleTimeoutInMinutes(idleTimeoutInMinutes)
-              .ipConfiguration(ipConfiguration)
-              .dnsSettings(dnsSettings)
-              .publicIPAllocationMethod(publicIPAllocationMethod)
-              .dnsSettings(dnsSettings)
-              .build();
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_PublicIPAddressProperties.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder provisioningState(String provisioningState);
-
-      public abstract Builder ipAddress(String ipAddress);
-
-      public abstract Builder publicIPAllocationMethod(String 
publicIPAllocationMethod);
-
-      public abstract Builder idleTimeoutInMinutes(Integer 
idleTimeoutInMinutes);
-
-      public abstract Builder ipConfiguration(IdReference ipConfiguration);
-
-      public abstract Builder dnsSettings(DnsSettings dnsSettings);
-
-      public abstract PublicIPAddressProperties build();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Publisher.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Publisher.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Publisher.java
deleted file mode 100644
index 4f5c53f..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Publisher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-/**
- * Publisher
- */
-@AutoValue
-public abstract class Publisher {
-
-   /**
-    * The location of the publisher
-    */
-   @Nullable
-   public abstract String location();
-
-   /**
-    * The name of the publisher
-    */
-   @Nullable
-   public abstract String name();
-
-   /**
-    * The id of the publisher
-    */
-   @Nullable
-   public abstract String id();
-
-   @SerializedNames({"location", "name", "id"})
-   public static Publisher create(final String location, final String name, 
final String id) {
-
-      return new AutoValue_Publisher(location, name, id);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
deleted file mode 100644
index c65ae59..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Regions used in Azure.
- *
- * @see <a href="http://azure.microsoft.com/en-us/regions/";>this page</a>
- */
-public enum Region {
-
-   CENTRAL_US("Central US", "US-IA"),
-   EAST_US("East US", "US-VA"),
-   EAST_US_2("East US 2", "US-VA"),
-   US_GOV_IOWA("US Gov Iowa", "US-IA"),
-   US_GOV_VIRGINIA("US Gov Virginia", "US-VA"),
-   NORTH_CENTRAL_US("North Central US", "US-IL"),
-   SOUTH_CENTRAL_US("South Central US", "US-TX"),
-   WEST_CENTRAL_US("West Central US", "US-WY"),
-   WEST_US("West US", "US-CA"),
-   WEST_US_2("West US 2", "US-WA"),
-   NORTH_EUROPE("North Europe", "IE"),
-   UK_SOUTH("UK South", "GB-LND"),
-   UK_WEST("UK West", "GB-CRF"),
-   WEST_EUROPE("West Europe", "NL"),
-   EAST_ASIA("East Asia", "HK"),
-   SOUTH_EAST_ASIA("Southeast Asia", "SG"),
-   KOREA_CENTRAL("Korea Central", "KR-11"),
-   KOREA_SOUTH("Korea South", "KR-26"),
-   JAPAN_EAST("Japan East", "JP-11"),
-   JAPAN_WEST("Japan West", "JP-27"),
-   BRAZIL_SOUTH("Brazil South", "BR"),
-   AUSTRALIA_EAST("Australia East", "AU-NSW"),
-   AUSTRALIA_SOUTH_EAST("Australia Southeast", "AU-VIC"),
-   CENTRAL_INDIA("Central India", "IN-GA"),
-   SOUTH_INDIA("South India", "IN-TN"),
-   WEST_INDIA("West India", "IN-MH"),
-   CHINA_EAST("China East", "CN-SH"),
-   CHINA_NORTH("China North", "CN-BJ"),
-   CANADA_CENTRAL("Canada Central", "CA-ON"),
-   CANADA_EAST("Canada East", "CA-QC");
-
-   private final String name;
-
-   private final String iso3166Code;
-
-   Region(final String name, final String iso3166Code) {
-      this.name = name;
-      this.iso3166Code = iso3166Code;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public String iso3166Code() {
-      return iso3166Code;
-   }
-
-   public static Region byName(final String name) {
-      Preconditions.checkNotNull(name);
-
-      for (Region region : values()) {
-         if (name.equals(region.name)) {
-            return region;
-         }
-      }
-      return null;
-   }
-
-   public static Set<String> iso3166Codes() {
-      return ImmutableSet.copyOf(Iterables.transform(Arrays.asList(values()), 
new Function<Region, String>() {
-
-         @Override
-         public String apply(final Region region) {
-            return region.iso3166Code;
-         }
-      }));
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Resource.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Resource.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Resource.java
deleted file mode 100644
index f048234..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Resource.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableMap;
-
-@AutoValue
-public abstract class Resource {
-
-   @AutoValue
-   public abstract static class Identity {
-
-      public abstract String principalId();
-      public abstract String tenantId();
-      public abstract String type();
-
-      @SerializedNames({"principalId", "tenantId", "type" })
-      public static Identity create(String principalId, String tenantId, 
String type) {
-         return new AutoValue_Resource_Identity(principalId, tenantId, type);
-      }
-   }
-   
-   @AutoValue
-   public abstract static class ResourceProperties{
-      @Nullable
-      public abstract String provisioningState();
-
-      @SerializedNames({"provisioningState"})
-      public static ResourceProperties create(final String provisioningState) {
-         return new AutoValue_Resource_ResourceProperties(provisioningState);
-      }
-   }
-
-   public abstract String id();
-   public abstract String name();
-   public abstract String type();
-   public abstract String location();
-   @Nullable public abstract Map<String, String> tags();
-   @Nullable public abstract Identity identity();
-   @Nullable public abstract SKU sku();
-   @Nullable public abstract String managedBy();
-   @Nullable public abstract String kind();
-   @Nullable public abstract Plan plan();
-   @Nullable public abstract ResourceProperties properties();
-
-   @SerializedNames({"id", "name", "type", "location", "tags", "identity", 
"sku", "managedBy", "kind", "plan", "properties"})
-   public static Resource create(String id, String name, String type, String 
location, Map<String, String> tags, 
-                                 Identity identity, SKU sku, String managedBy, 
String kind, Plan plan, ResourceProperties properties) {
-      return new AutoValue_Resource(id, name, type, location, tags == null ? 
null : ImmutableMap.copyOf(tags), 
-              identity, sku, managedBy, kind, plan, properties);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceDefinition.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceDefinition.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceDefinition.java
deleted file mode 100644
index 1b51375..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceDefinition.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import java.util.List;
-import java.util.Map;
-
-@AutoValue
-public abstract class ResourceDefinition {
-
-    public abstract String name();
-
-    public abstract String type();
-
-    public abstract String location();
-
-    public abstract String apiVersion();
-
-    @Nullable
-    public abstract List<String> dependsOn();
-
-    @Nullable
-    public abstract Map<String, String> tags();
-
-    @Nullable
-    public abstract Object properties();
-
-    @SerializedNames({"name", "type", "location", "apiVersion", "dependsOn", 
"tags", "properties"})
-    public static ResourceDefinition create(final String name,
-                                            final String type,
-                                            final String location,
-                                            final String apiVersion,
-                                            final List<String> dependsOn,
-                                            final Map<String, String> tags,
-                                            final Object properties) {
-        ResourceDefinition.Builder builder = ResourceDefinition.builder()
-                .name(name)
-                .type(type)
-                .location(location)
-                .apiVersion(apiVersion)
-                .properties(properties);
-
-        builder.dependsOn(dependsOn == null ? null : 
ImmutableList.copyOf(dependsOn));
-
-        builder.tags(tags == null ? null : ImmutableMap.copyOf(tags));
-
-        return  builder.build();
-    }
-    
-    public abstract Builder toBuilder();
-
-    public static Builder builder() {
-        return new AutoValue_ResourceDefinition.Builder();
-    }
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-        public abstract Builder name(String name);
-
-        public abstract Builder type(String type);
-
-        public abstract Builder location(String location);
-
-        public abstract Builder apiVersion(String apiVersion);
-
-        public abstract Builder dependsOn(List<String> dependencies);
-
-        public abstract Builder tags(Map<String, String> tags);
-
-        public abstract Builder properties(Object properties);
-
-        abstract List<String>  dependsOn();
-        abstract Map<String, String>  tags();
-
-        abstract ResourceDefinition autoBuild();
-
-        public ResourceDefinition build() {
-            dependsOn(dependsOn() != null ? ImmutableList.copyOf(dependsOn()) 
: null);
-            tags(tags() != null ? ImmutableMap.copyOf(tags()) : null);
-            return autoBuild();
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java
deleted file mode 100644
index 51bea9e..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import java.util.Map;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-import com.google.common.collect.ImmutableMap;
-
-
-@AutoValue
-public abstract class ResourceGroup {
-
-   @AutoValue
-   public abstract static class ResourceGroupProperties implements 
Provisionable {
-      @Nullable
-      public abstract String provisioningState();
-
-      @SerializedNames({"provisioningState"})
-      public static ResourceGroupProperties create(final String 
provisioningState) {
-         return new 
AutoValue_ResourceGroup_ResourceGroupProperties(provisioningState);
-      }
-   }
-
-   public abstract String id();
-   public abstract String name();
-   public abstract String location();
-
-   @Nullable
-   public abstract Map<String, String> tags();
-   public abstract ResourceGroupProperties properties();
-
-   @SerializedNames({"id", "name", "location", "tags", "properties"})
-   public static ResourceGroup create(String id, String name, String location, 
Map<String, String> tags, ResourceGroupProperties properties) {
-      return new AutoValue_ResourceGroup(id, name, location, tags == null ? 
null : ImmutableMap.copyOf(tags), properties);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceProviderMetaData.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceProviderMetaData.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceProviderMetaData.java
deleted file mode 100644
index e919f02..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceProviderMetaData.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableList;
-
-import org.jclouds.json.SerializedNames;
-
-import java.util.List;
-
-@AutoValue
-public abstract class ResourceProviderMetaData {
-
-   public abstract String resourceType();
-
-   public abstract List<String> locations();
-
-   public abstract List<String> apiVersions();
-
-   @SerializedNames({"resourceType", "locations", "apiVersions"})
-   public static ResourceProviderMetaData create(final String resourceType, 
final List<String> locations, final List<String> apiVersions) {
-      ResourceProviderMetaData.Builder builder = 
ResourceProviderMetaData.builder()
-              .resourceType(resourceType)
-              .locations(locations == null ? ImmutableList.<String>of() : 
ImmutableList.copyOf(locations))
-              .apiVersions(apiVersions == null ? ImmutableList.<String>of() : 
ImmutableList.copyOf(apiVersions));
-
-      return builder.build();
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_ResourceProviderMetaData.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder resourceType(String resourceType);
-
-      public abstract Builder locations(List<String> locations);
-
-      public abstract Builder apiVersions(List<String> apiVersions);
-
-      abstract List<String> locations();
-
-      abstract List<String> apiVersions();
-
-      abstract ResourceProviderMetaData autoBuild();
-
-      public ResourceProviderMetaData build() {
-         locations(locations() != null ? ImmutableList.copyOf(locations()) : 
ImmutableList.<String>of());
-         apiVersions(apiVersions() != null ? 
ImmutableList.copyOf(apiVersions()) : ImmutableList.<String>of());
-         return autoBuild();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/SKU.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/SKU.java 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/SKU.java
deleted file mode 100644
index 6af4406..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/SKU.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class SKU {
-   @Nullable
-   public abstract String location();
-   @Nullable
-   public abstract String name();
-   @Nullable
-   public abstract String id();
-   @Nullable
-   public abstract String family();
-   
-   @SerializedNames({"location", "name", "id", "family"})
-   public static SKU create(final String location, final String name, final 
String id, final String family) {
-
-      return new AutoValue_SKU(location, name, id, family);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secret.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secret.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secret.java
deleted file mode 100644
index 789a71c..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secret.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.common.collect.ImmutableMap;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import java.util.Map;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class Secret {
-
-   @AutoValue
-   public abstract static class SecretAttributes {
-      @Nullable
-      public abstract Boolean enabled();
-
-      @Nullable
-      public abstract Integer created();
-
-      @Nullable
-      public abstract Integer expires();
-
-      @Nullable
-      public abstract Integer notBefore();
-
-      @Nullable
-      public abstract String recoveryLevel();
-
-      @Nullable
-      public abstract Integer updated();
-
-      @SerializedNames({"enabled", "created", "expires", "notBefore", 
"recoveryLevel", "updated"})
-      public static SecretAttributes create(final Boolean enabled,
-                                            final Integer created,
-                                            final Integer expires,
-                                            final Integer notBefore,
-                                            final String recoveryLevel,
-                                            final Integer updated) {
-         return new AutoValue_Secret_SecretAttributes(enabled, created, 
expires, notBefore, recoveryLevel, updated);
-      }
-
-      SecretAttributes() {
-      }
-   }
-
-   @AutoValue
-   public abstract static class DeletedSecretBundle {
-      @Nullable
-      public abstract SecretAttributes attributes();
-
-      @Nullable
-      public abstract String contentType();
-
-      @Nullable
-      public abstract String deletedDate();
-
-      @Nullable
-      public abstract String id();
-
-      @Nullable
-      public abstract String kid();
-
-      @Nullable
-      public abstract Boolean managed();
-
-      @Nullable
-      public abstract String recoveryId();
-
-      @Nullable
-      public abstract String scheduledPurgeDate();
-
-      @Nullable
-      public abstract Map<String, String> tags();
-
-      @Nullable
-      public abstract String value();
-
-      @SerializedNames({"attributes", "contentType", "deletedDate", "id", 
"kid", "managed", "recoveryId", "scheduledPurgeDate", "tags", "value"})
-      public static DeletedSecretBundle create(final SecretAttributes 
attributes,
-                                               final String contentType,
-                                               final String deletedDate,
-                                               final String id,
-                                               final String kid,
-                                               final Boolean managed,
-                                               final String recoveryId,
-                                               final String scheduledPurgeDate,
-                                               final Map<String, String> tags,
-                                               String value) {
-         return new AutoValue_Secret_DeletedSecretBundle(
-                 attributes, contentType, deletedDate,
-                 id, kid, managed, recoveryId, scheduledPurgeDate,
-                 tags != null ? ImmutableMap.copyOf(tags) : null,
-                 value);
-      }
-   }
-
-   @AutoValue
-   public abstract static class SecretBundle {
-      @Nullable
-      public abstract SecretAttributes attributes();
-
-      @Nullable
-      public abstract String contentType();
-
-      @Nullable
-      public abstract String id();
-
-      @Nullable
-      public abstract String kid();
-
-      @Nullable
-      public abstract Boolean managed();
-
-      @Nullable
-      public abstract Map<String, String> tags();
-
-      @Nullable
-      public abstract String value();
-
-      @SerializedNames({"attributes", "contentType", "id", "kid", "managed", 
"tags", "value"})
-      public static SecretBundle create(final SecretAttributes attributes,
-                                        final String contentType,
-                                        final String id,
-                                        final String kid,
-                                        final Boolean managed,
-                                        final Map<String, String> tags,
-                                        String value) {
-         return new AutoValue_Secret_SecretBundle(
-                 attributes, contentType, id,
-                 kid, managed,
-                 tags != null ? ImmutableMap.copyOf(tags) : null,
-                 value);
-      }
-   }
-
-   @Nullable
-   public abstract SecretAttributes attributes();
-
-   @Nullable
-   public abstract String contentType();
-
-   @Nullable
-   public abstract String id();
-
-   @Nullable
-   public abstract Boolean managed();
-
-   @Nullable
-   public abstract Map<String, String> tags();
-
-   @SerializedNames({"attributes", "contentType", "id", "managed", "tags"})
-   public static Secret create(final SecretAttributes attributes,
-                               final String contentType,
-                               final String id,
-                               final Boolean managed,
-                               final Map<String, String> tags) {
-      return new AutoValue_Secret(
-              attributes,
-              contentType,
-              id,
-              managed,
-              tags != null ? ImmutableMap.copyOf(tags) : null
-      );
-   }
-
-   Secret() {
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secrets.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secrets.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secrets.java
deleted file mode 100644
index 5fcf704..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Secrets.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import org.jclouds.json.SerializedNames;
-import java.util.List;
-
-/**
- * Group of certificates stored in one and the same KeyVault
- */
-@AutoValue
-public abstract class Secrets {
-
-    @AutoValue
-    public abstract static class SourceVault {
-
-        public abstract String id();
-
-        @SerializedNames({"id"})
-        public static SourceVault create(final String id) {
-            return new AutoValue_Secrets_SourceVault(id);
-        }
-    }
-
-    /**
-     * Name of the KeyVault which contains all the certificates
-     */
-    public abstract SourceVault sourceVault();
-
-    /**
-     * List of the certificates
-     */
-    public abstract List<VaultCertificate> vaultCertificates();
-
-    @SerializedNames({"sourceVault", "vaultCertificates"})
-    public static Secrets create(final SourceVault sourceVault, final 
List<VaultCertificate> vaultCertificates) {
-       return new AutoValue_Secrets(sourceVault, vaultCertificates);
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java
deleted file mode 100644
index 2faba3f..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ServicePrincipal.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableList;
-
-@AutoValue
-public abstract class ServicePrincipal {
-   
-   @Nullable public abstract String appId();
-   @Nullable public abstract Date deletionTimestamp();
-   @Nullable public abstract String displayName();
-   public abstract String objectId();
-   public abstract String objectType();
-   public abstract List<String> servicePrincipalNames();
-
-   @SerializedNames({ "appId", "deletionTimestamp", "displayName", "objectId", 
"objectType", "servicePrincipalNames" })
-   public static ServicePrincipal create(String appId, Date deletionTimestamp, 
String displayName, String objectId,
-         String objectType, List<String> servicePrincipalNames) {
-      List<String> servicePrincipals = servicePrincipalNames != null ? 
ImmutableList.copyOf(servicePrincipalNames)
-            : ImmutableList.<String> of();
-      return 
builder().appId(appId).deletionTimestamp(deletionTimestamp).displayName(displayName).objectId(objectId)
-            
.objectType(objectType).servicePrincipalNames(servicePrincipals).build();
-   }
-
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_ServicePrincipal.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      
-      public abstract Builder appId(String appId);
-      public abstract Builder deletionTimestamp(Date deletionTimestamp);
-      public abstract Builder displayName(String displayName);
-      public abstract Builder objectId(String objectId);
-      public abstract Builder objectType(String objectType);
-      public abstract Builder servicePrincipalNames(List<String> 
servicePrincipalNames);
-
-      public abstract ServicePrincipal build();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Status.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Status.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Status.java
deleted file mode 100644
index 780877b..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Status.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class Status {
-
-   @Nullable
-   public abstract String code();
-
-   @Nullable
-   public abstract String level();
-
-   @Nullable
-   public abstract String displayStatus();
-
-   @Nullable
-   public abstract String message();
-
-   @Nullable
-   public abstract Date time();
-
-   @SerializedNames({ "code", "level", "displayStatus", "message", "time" })
-   public static Status create(final String code, final String level, final 
String displayStatus, final String message,
-         final Date time) {
-      return new AutoValue_Status(code, level, displayStatus, message, time);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageAccountType.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageAccountType.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageAccountType.java
deleted file mode 100644
index 33e1109..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageAccountType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-public enum StorageAccountType {
-   /** Enum value Standard_LRS. */
-   STANDARD_LRS("Standard_LRS"),
-
-   /** Enum value Premium_LRS. */
-   PREMIUM_LRS("Premium_LRS");
-
-   /** The actual serialized value for a StorageAccountTypes instance. */
-   private String value;
-
-   StorageAccountType(String value) {
-      this.value = value;
-   }
-
-   public static StorageAccountType fromString(String value) {
-      StorageAccountType[] items = StorageAccountType.values();
-      for (StorageAccountType item : items) {
-         if (item.toString().equalsIgnoreCase(value)) {
-            return item;
-         }
-      }
-      return null;
-   }
-
-   @Override
-   public String toString() {
-      return this.value;
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageProfile.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageProfile.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageProfile.java
deleted file mode 100644
index a65ffd7..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageProfile.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableList;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-import java.util.List;
-
-@AutoValue
-public abstract class StorageProfile {
-
-   /**
-    * The image reference of the storage profile
-    */
-   @Nullable
-   public abstract ImageReference imageReference();
-
-   /**
-    * The image reference of the storage profile
-    */
-   public abstract OSDisk osDisk();
-
-   /**
-    * The list of the data disks of the storage profile
-    */
-   @Nullable
-   public abstract List<DataDisk> dataDisks();
-
-   @SerializedNames({"imageReference", "osDisk", "dataDisks"})
-   public static StorageProfile create(final ImageReference imageReference,
-                                       final OSDisk osDisk, final 
List<DataDisk> dataDisks) {
-      StorageProfile.Builder builder = StorageProfile.builder()
-              .imageReference(imageReference)
-              .osDisk(osDisk)
-              .dataDisks(dataDisks != null ? ImmutableList.copyOf(dataDisks) : 
null);
-
-      return builder.build();
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_StorageProfile.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder imageReference(ImageReference imageReference);
-
-      public abstract Builder osDisk(OSDisk osDisk);
-
-      public abstract Builder dataDisks(List<DataDisk> dataDisks);
-
-      abstract List<DataDisk> dataDisks();
-
-      abstract StorageProfile autoBuild();
-
-      public StorageProfile build() {
-         dataDisks(dataDisks() != null ? ImmutableList.copyOf(dataDisks()) : 
null);
-         return autoBuild();
-      }
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageService.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageService.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageService.java
deleted file mode 100644
index 0f5dbe5..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageService.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import java.util.Date;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-import org.jclouds.azurecompute.arm.util.GetEnumValue;
-
-@AutoValue
-public abstract class StorageService {
-
-   public enum AccountType {
-
-      Standard_LRS,
-      Standard_ZRS,
-      Standard_GRS,
-      Standard_RAGRS,
-      Premium_LRS,
-      UNRECOGNIZED;
-
-       public static AccountType fromValue(final String text) {
-           return (AccountType) GetEnumValue.fromValueOrDefault(text, 
AccountType.UNRECOGNIZED);
-       }
-   }
-
-   public enum RegionStatus {
-
-       Available,
-       Unavailable,
-       UNRECOGNIZED;
-
-       public static RegionStatus fromValue(final String text) {
-           return (RegionStatus) GetEnumValue.fromValueOrDefault(text, 
RegionStatus.UNRECOGNIZED);
-       }
-
-   }
-
-   public enum Status {
-
-       Creating,
-       Created,
-       Deleting,
-       Deleted,
-       Changing,
-       ResolvingDns,
-       Succeeded,
-       UNRECOGNIZED;
-
-       public static Status fromValue(final String text) {
-           return (Status) GetEnumValue.fromValueOrDefault(text, 
Status.UNRECOGNIZED);
-       }
-   }
-
-   @AutoValue
-   public abstract static class StorageServiceProperties {
-
-       /**
-        * Specifies whether the account supports locally-redundant storage, 
geo-redundant storage, zone-redundant
-        * storage, or read access geo-redundant storage.
-        */
-       public abstract AccountType accountType();
-
-       /**
-        * Specifies the time that the storage account was created.
-        */
-       @Nullable
-       public abstract Date creationTime();
-
-       /**
-        * Specifies the endpoints of the storage account.
-        */
-       @Nullable
-       public abstract Map<String, String> primaryEndpoints();
-
-       /**
-       * A primaryLocation for the storage account.
-       */
-      @Nullable
-      public abstract String primaryLocation();
-
-      /**
-       * provisioningState for the storage group
-       */
-      @Nullable
-      public abstract Status provisioningState();
-
-       /**
-        * Specifies the secondary endpoints of the storage account.
-        */
-       @Nullable
-       public abstract Map<String, String> secondaryEndpoints();
-
-      /**
-       * Secondary location for the storage group
-       */
-      @Nullable
-      public abstract String secondaryLocation();
-
-      /**
-       * The status of primary endpoints
-       */
-      @Nullable
-      public abstract RegionStatus statusOfPrimary();
-
-      /**
-       * The secondary status of the storage account.
-       */
-      @Nullable
-      public abstract RegionStatus statusOfSecondary();
-
-
-      @SerializedNames({"accountType", "creationTime", "primaryEndpoints",  
"primaryLocation",
-              "provisioningState", "secondaryEndpoints", "secondaryLocation", 
"statusOfPrimary", "statusOfSecondary"})
-      public static StorageServiceProperties create(final AccountType 
accountType, final Date creationTime,
-              final Map<String, String> primaryEndpoints, final String 
primaryLocation, final Status provisioningState,
-              final Map<String, String> secondaryEndpoints, final String 
secondaryLocation,
-              final RegionStatus statusOfPrimary, final RegionStatus 
statusOfSecondary) {
-
-         StorageServiceProperties.Builder builder = 
StorageServiceProperties.builder()
-                 .accountType(accountType)
-                 .creationTime(creationTime)
-                 .primaryLocation(primaryLocation)
-                 .provisioningState(provisioningState)
-                 .secondaryLocation(secondaryLocation)
-                 .statusOfPrimary(statusOfPrimary)
-                 .statusOfSecondary(statusOfSecondary);
-
-
-         builder.primaryEndpoints(primaryEndpoints != null ? 
ImmutableMap.copyOf(primaryEndpoints) : null);
-         builder.secondaryEndpoints(secondaryEndpoints != null ? 
ImmutableMap.copyOf(secondaryEndpoints) : null);
-
-         return  builder.build();
-      }
-      
-      public abstract Builder toBuilder();
-      
-      public static Builder builder() {
-         return new 
AutoValue_StorageService_StorageServiceProperties.Builder();
-      }
-
-      @AutoValue.Builder
-      public abstract static class Builder {
-         public abstract Builder accountType(AccountType accountType);
-         public abstract Builder creationTime(Date creationTime);
-         public abstract Builder primaryEndpoints(Map<String, String> 
primaryEndpoints);
-         public abstract Builder primaryLocation(String primaryLocation);
-         public abstract Builder provisioningState(Status provisioningState);
-         public abstract Builder secondaryEndpoints(Map<String, String> 
secondaryEndpoints);
-         public abstract Builder secondaryLocation(String secondaryLocation);
-         public abstract Builder statusOfPrimary(RegionStatus statusOfPrimary);
-         public abstract Builder statusOfSecondary(RegionStatus 
statusOfSecondary);
-
-         abstract Map<String, String>  primaryEndpoints();
-         abstract Map<String, String>  secondaryEndpoints();
-
-         abstract StorageServiceProperties autoBuild();
-
-         public StorageServiceProperties build() {
-            primaryEndpoints(primaryEndpoints() != null ? 
ImmutableMap.copyOf(primaryEndpoints()) : null);
-            secondaryEndpoints(secondaryEndpoints() != null ? 
ImmutableMap.copyOf(secondaryEndpoints()) : null);
-            return autoBuild();
-         }
-      }
-   }
-
-   /**
-    * Specifies the id of the storage account.
-    */
-   @Nullable
-   public abstract String id();
-
-   /**
-    * Specifies the name of the storage account. This name is the DNS prefix 
name and can be used to access blobs,
-    * queues, and tables in the storage account.
-    */
-   @Nullable
-   public abstract String name();
-
-   /**
-    * Specifies the location of the storage account.
-    */
-   public abstract String location();
-
-   /**
-    * Specifies the tags of the storage account.
-    */
-   @Nullable
-   public abstract Map<String, String> tags();
-
-   /**
-    * Specifies the type of the storage account.
-    */
-   @Nullable
-   public abstract String type();
-
-   /**
-    * Specifies the properties of the storage account.
-    */
-   public abstract StorageServiceProperties storageServiceProperties();
-
-
-   @SerializedNames({"id", "name", "location", "tags", "type", "properties"})
-   public static StorageService create(final String id,  final String name,  
final String location,
-                                       final Map<String, String> tags,  final 
String type,
-                                       final StorageServiceProperties 
storageServiceProperties) {
-      return new AutoValue_StorageService(id,  name,  location,  tags == null 
? null : ImmutableMap.copyOf(tags), type, storageServiceProperties);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceKeys.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceKeys.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceKeys.java
deleted file mode 100644
index 63cb70b..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceKeys.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import org.jclouds.json.SerializedNames;
-
-@AutoValue
-public abstract class StorageServiceKeys {
-
-   /**
-    * The primary access key for the storage account.
-    */
-   public abstract String key1();
-
-   /**
-    * The secondary access key for the storage account.
-    */
-   public abstract String key2();
-
-   @SerializedNames({"key1", "key2"})
-   public static StorageServiceKeys create(final String key1, final String 
key2) {
-      return new AutoValue_StorageServiceKeys(key1, key2);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceUpdateParams.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceUpdateParams.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceUpdateParams.java
deleted file mode 100644
index 692565c..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/StorageServiceUpdateParams.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import com.google.common.collect.ImmutableMap;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-import java.util.Map;
-
-@AutoValue
-public abstract class StorageServiceUpdateParams {
-
-   @AutoValue
-   public abstract static class StorageServiceUpdateProperties {
-
-       /**
-        * Specifies whether the account supports locally-redundant storage, 
geo-redundant storage, zone-redundant
-        * storage, or read access geo-redundant storage.
-        * Note: This implementation is for version 2015-10-01 and earlier.
-        * For version 2016-01-01 or later, refer to 
https://msdn.microsoft.com/en-us/library/mt163639.aspx
-        */
-       @Nullable
-       public abstract StorageService.AccountType accountType();
-
-
-      @SerializedNames({"accountType"})
-      public static StorageServiceUpdateProperties create(final 
StorageService.AccountType accountType) {
-
-         return new 
AutoValue_StorageServiceUpdateParams_StorageServiceUpdateProperties(accountType);
-      }
-   }
-
-   /**
-    * Specifies the tags of the storage account.
-    */
-   @Nullable
-   public abstract Map<String, String> tags();
-
-   /**
-    * Specifies the properties of the storage account.
-    */
-   public abstract StorageServiceUpdateProperties storageServiceProperties();
-
-
-   @SerializedNames({"tags", "properties"})
-   public static StorageServiceUpdateParams create(final Map<String, String> 
tags,
-                                                   final 
StorageServiceUpdateProperties storageServiceProperties) {
-      return new AutoValue_StorageServiceUpdateParams(tags == null ? null : 
ImmutableMap.copyOf(tags), storageServiceProperties);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Subnet.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Subnet.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Subnet.java
deleted file mode 100644
index 80460b8..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Subnet.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import static com.google.common.collect.ImmutableList.copyOf;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.google.common.collect.ImmutableList;
-
-import org.jclouds.javax.annotation.Nullable;
-import com.google.auto.value.AutoValue;
-import org.jclouds.json.SerializedNames;
-
-@AutoValue
-public abstract class Subnet {
-
-   private static final Pattern NETWORK_PATTERN = 
Pattern.compile("^.*/virtualNetworks/([^/]+)(/.*)?$");
-   
-   @AutoValue
-   public abstract static class IpConfiguration {
-
-      public abstract String id();
-
-      @SerializedNames({"id"})
-      public static IpConfiguration create(final String id) {
-         return new AutoValue_Subnet_IpConfiguration(id);
-      }
-      
-      IpConfiguration() {
-         
-      }
-   }
-
-   @AutoValue
-   public abstract static class SubnetProperties implements Provisionable {
-
-      @Nullable public abstract String provisioningState();
-      @Nullable public abstract String addressPrefix();
-      @Nullable public abstract List<IpConfiguration> ipConfigurations();
-
-      @SerializedNames({"provisioningState", "addressPrefix", 
"ipConfigurations"})
-      public static SubnetProperties create(final String provisioningState, 
final String addressPrefix, final List<IpConfiguration> ipConfigurations) {
-         return builder()
-                 .provisioningState(provisioningState)
-                 .addressPrefix(addressPrefix)
-                 .ipConfigurations(ipConfigurations != null ? 
copyOf(ipConfigurations) : null)
-                 .build();
-      }
-      
-      SubnetProperties() {
-         
-      }
-      
-      public abstract Builder toBuilder();
-
-      public static Builder builder() {
-         return new AutoValue_Subnet_SubnetProperties.Builder();
-      }
-
-      @AutoValue.Builder
-      public abstract static class Builder {
-         public abstract Builder provisioningState(String provisioningState);
-         public abstract Builder addressPrefix(String addressPrefix);
-         public abstract Builder ipConfigurations(List<IpConfiguration> 
ipConfigurations);
-
-         abstract List<IpConfiguration> ipConfigurations();
-         abstract SubnetProperties autoBuild();
-
-         public SubnetProperties build() {
-            ipConfigurations(ipConfigurations() != null ? 
ImmutableList.copyOf(ipConfigurations()) : null);
-            return autoBuild();
-         }
-      }
-   }
-
-   @Nullable public abstract String name();
-   @Nullable public abstract String id();
-   @Nullable public abstract String etag();
-   @Nullable public abstract SubnetProperties properties();
-   
-   @Nullable public String virtualNetwork() {
-      return extractVirtualNetwork(id());
-   }
-   
-   public static String extractVirtualNetwork(String id) {
-      if (id == null)
-         return null;
-      Matcher m = NETWORK_PATTERN.matcher(id);
-      m.matches();
-      return m.group(1);
-   }
-
-   @SerializedNames({"name", "id", "etag", "properties"})
-   public static Subnet create(final String name,
-                               final String id,
-                               final String etag,
-                               final SubnetProperties properties) {
-      return 
builder().name(name).id(id).etag(etag).properties(properties).build();
-   }
-   
-   Subnet() {
-      
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_Subnet.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder name(String name);
-      public abstract Builder id(String id);
-      public abstract Builder etag(String etag);
-      public abstract Builder properties(SubnetProperties properties);
-      public abstract Subnet build();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/TemplateParameterType.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/TemplateParameterType.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/TemplateParameterType.java
deleted file mode 100644
index d0ccc71..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/TemplateParameterType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.json.SerializedNames;
-
-// Simple helper class to serialize / deserialize id reference.
-
-@AutoValue
-public abstract class TemplateParameterType {
-   @Nullable
-   public abstract String type();
-
-   @SerializedNames({"type"})
-   public static TemplateParameterType create(final String type) {
-      return new AutoValue_TemplateParameterType(type);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VHD.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VHD.java 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VHD.java
deleted file mode 100644
index 7e6b387..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VHD.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-
-import org.jclouds.json.SerializedNames;
-
-@AutoValue
-public abstract class VHD {
-
-   /**
-    * The uri of the vhd.
-    */
-   public abstract String uri();
-
-   @SerializedNames({"uri"})
-   public static VHD create(final String uri) {
-      return builder().uri(uri).build();
-   }
-   
-   public abstract Builder toBuilder();
-
-   public static Builder builder() {
-      return new AutoValue_VHD.Builder();
-   }
-
-   @AutoValue.Builder
-   public abstract static class Builder {
-      public abstract Builder uri(String uri);
-
-      public abstract VHD build();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMDeployment.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMDeployment.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMDeployment.java
deleted file mode 100644
index 99edc5c..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMDeployment.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import java.util.List;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.auto.value.AutoValue;
-
-@AutoValue
-public abstract class VMDeployment {
-
-   public abstract String deploymentId();
-   
-   @Nullable
-   public abstract VirtualMachine virtualMachine();
-   
-   @Nullable
-   public abstract List<PublicIPAddress> ipAddressList();
-
-   @Nullable
-   public abstract List<NetworkInterfaceCard> networkInterfaceCards();
-
-   public static VMDeployment create(String deploymentId, VirtualMachine 
virtualMachine,
-                                     List<PublicIPAddress> ipAddressList,
-                                     List<NetworkInterfaceCard> 
networkInterfaceCards) {
-      return new AutoValue_VMDeployment(deploymentId, virtualMachine, 
ipAddressList, networkInterfaceCards);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ac03bac4/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMHardware.java
----------------------------------------------------------------------
diff --git 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMHardware.java
 
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMHardware.java
deleted file mode 100644
index e771903..0000000
--- 
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VMHardware.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.azurecompute.arm.domain;
-
-import com.google.auto.value.AutoValue;
-import org.jclouds.json.SerializedNames;
-
-/**
- * A VM Size that is available in a region for a given subscription.
- *
- * @see <a href="https://msdn.microsoft.com/en-us/library/azure/mt269440.aspx"; 
>api</a>
- */
-@AutoValue
-public abstract class VMHardware {
-
-   /**
-    * The name of the VM size.
-    */
-   public abstract String name();
-
-   /**
-    * The number of cores that are available in the VM size.
-    */
-   public abstract Integer numberOfCores();
-
-   /**
-    * Specifies the size in MB of the OS Disk.
-    */
-   public abstract Integer osDiskSizeInMB();
-
-   /**
-    * The size of the resource disk.
-    */
-   public abstract Integer resourceDiskSizeInMB();
-
-   /**
-    * Specifies the available RAM in MB.
-    */
-   public abstract Integer memoryInMB();
-
-   /**
-    * Specifies the maximum number of data disks that can be attached to the 
VM size.
-    */
-   public abstract Integer maxDataDiskCount();
-
-   /**
-    * Specifies the location of the HW resource
-    */
-   public abstract String location();
-
-   @SerializedNames({ "name", "numberOfCores", "osDiskSizeInMB", 
"resourceDiskSizeInMB", "memoryInMB", "maxDataDiskCount", "location"})
-   public static VMHardware create(String name, Integer numberOfCores, Integer 
osDiskSizeInMB, Integer resourceDiskSizeInMB, Integer memoryInMB, Integer 
maxDataDiskCount, String location) {
-
-      return new AutoValue_VMHardware(name, numberOfCores, osDiskSizeInMB, 
resourceDiskSizeInMB, memoryInMB, maxDataDiskCount, location);
-   }
-}


Reply via email to