diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/pom.xml b/sdk/iothub/mgmt-v2018_12_01_preview/pom.xml index 8e6c0352b4f9..c5da19abb0b1 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/pom.xml +++ b/sdk/iothub/mgmt-v2018_12_01_preview/pom.xml @@ -11,10 +11,10 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml - azure-mgmt-iothub + azure-mgmt-devices 1.0.0-beta jar Microsoft Azure SDK for Devices Management @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateDescription.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateDescription.java index 7d668ea49f6b..457a775ebd51 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateDescription.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateDescription.java @@ -16,12 +16,12 @@ import com.microsoft.azure.arm.model.Appliable; import com.microsoft.azure.arm.model.Creatable; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; /** * Type representing CertificateDescription. */ -public interface CertificateDescription extends HasInner, Indexable, Refreshable, Updatable, HasManager { +public interface CertificateDescription extends HasInner, Indexable, Refreshable, Updatable, HasManager { /** * @return the etag value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateListDescription.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateListDescription.java index 83b2304db75e..104b3cf3f0da 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateListDescription.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateListDescription.java @@ -10,7 +10,7 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.CertificateListDescriptionInner; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.CertificateDescriptionInner; import java.util.List; @@ -18,7 +18,7 @@ /** * Type representing CertificateListDescription. */ -public interface CertificateListDescription extends HasInner, HasManager { +public interface CertificateListDescription extends HasInner, HasManager { /** * @return the value value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateWithNonceDescription.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateWithNonceDescription.java index ebce5dbc99ab..3cef4881b63b 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateWithNonceDescription.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/CertificateWithNonceDescription.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.CertificateWithNonceDescriptionInner; /** * Type representing CertificateWithNonceDescription. */ -public interface CertificateWithNonceDescription extends HasInner, HasManager { +public interface CertificateWithNonceDescription extends HasInner, HasManager { /** * @return the etag value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EndpointHealthData.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EndpointHealthData.java index 2550550f19c9..d33faf87bb01 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EndpointHealthData.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EndpointHealthData.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.EndpointHealthDataInner; /** * Type representing EndpointHealthData. */ -public interface EndpointHealthData extends HasInner, HasManager { +public interface EndpointHealthData extends HasInner, HasManager { /** * @return the endpointId value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EventHubConsumerGroupInfo.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EventHubConsumerGroupInfo.java index 755a6091f77b..4800e390653c 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EventHubConsumerGroupInfo.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/EventHubConsumerGroupInfo.java @@ -16,13 +16,13 @@ import com.microsoft.azure.arm.model.Appliable; import com.microsoft.azure.arm.model.Creatable; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import java.util.Map; /** * Type representing EventHubConsumerGroupInfo. */ -public interface EventHubConsumerGroupInfo extends HasInner, Indexable, Refreshable, Updatable, HasManager { +public interface EventHubConsumerGroupInfo extends HasInner, Indexable, Refreshable, Updatable, HasManager { /** * @return the etag value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubDescription.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubDescription.java index 410062f474f8..cbc67e262c68 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubDescription.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubDescription.java @@ -17,13 +17,13 @@ import com.microsoft.azure.arm.model.Appliable; import com.microsoft.azure.arm.model.Creatable; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IotHubDescriptionInner; /** * Type representing IotHubDescription. */ -public interface IotHubDescription extends HasInner, Resource, GroupableResourceCore, HasResourceGroup, Refreshable, Updatable, HasManager { +public interface IotHubDescription extends HasInner, Resource, GroupableResourceCore, HasResourceGroup, Refreshable, Updatable, HasManager { /** * @return the etag value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubNameAvailabilityInfo.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubNameAvailabilityInfo.java index eb4a7c4588f1..aa38652136c4 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubNameAvailabilityInfo.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubNameAvailabilityInfo.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IotHubNameAvailabilityInfoInner; /** * Type representing IotHubNameAvailabilityInfo. */ -public interface IotHubNameAvailabilityInfo extends HasInner, HasManager { +public interface IotHubNameAvailabilityInfo extends HasInner, HasManager { /** * @return the message value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubQuotaMetricInfo.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubQuotaMetricInfo.java index ca0b72cfddad..f1d531151855 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubQuotaMetricInfo.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubQuotaMetricInfo.java @@ -11,12 +11,12 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IotHubQuotaMetricInfoInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; /** * Type representing IotHubQuotaMetricInfo. */ -public interface IotHubQuotaMetricInfo extends HasInner, HasManager { +public interface IotHubQuotaMetricInfo extends HasInner, HasManager { /** * @return the currentValue value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubSkuDescription.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubSkuDescription.java index 261df5c9ed63..2c59210ea04e 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubSkuDescription.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/IotHubSkuDescription.java @@ -11,12 +11,12 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IotHubSkuDescriptionInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; /** * Type representing IotHubSkuDescription. */ -public interface IotHubSkuDescription extends HasInner, HasManager { +public interface IotHubSkuDescription extends HasInner, HasManager { /** * @return the capacity value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/JobResponse.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/JobResponse.java index 411c29b65754..446528e2034a 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/JobResponse.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/JobResponse.java @@ -11,14 +11,14 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.JobResponseInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.rest.DateTimeRfc1123; import org.joda.time.DateTime; /** * Type representing JobResponse. */ -public interface JobResponse extends HasInner, HasManager { +public interface JobResponse extends HasInner, HasManager { /** * @return the endTimeUtc value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/Operation.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/Operation.java index c1363762e42d..6e80d96b8230 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/Operation.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/Operation.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.OperationInner; /** * Type representing Operation. */ -public interface Operation extends HasInner, HasManager { +public interface Operation extends HasInner, HasManager { /** * @return the display value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/RegistryStatistics.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/RegistryStatistics.java index d1a4a7e4c2eb..ebd5c85ef538 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/RegistryStatistics.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/RegistryStatistics.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.RegistryStatisticsInner; /** * Type representing RegistryStatistics. */ -public interface RegistryStatistics extends HasInner, HasManager { +public interface RegistryStatistics extends HasInner, HasManager { /** * @return the disabledDeviceCount value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/SharedAccessSignatureAuthorizationRule.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/SharedAccessSignatureAuthorizationRule.java index b31b4ef35b3a..043d531bbda0 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/SharedAccessSignatureAuthorizationRule.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/SharedAccessSignatureAuthorizationRule.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.SharedAccessSignatureAuthorizationRuleInner; /** * Type representing SharedAccessSignatureAuthorizationRule. */ -public interface SharedAccessSignatureAuthorizationRule extends HasInner, HasManager { +public interface SharedAccessSignatureAuthorizationRule extends HasInner, HasManager { /** * @return the keyName value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestAllRoutesResult.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestAllRoutesResult.java index 18e438766918..fb9d6dcb8ea9 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestAllRoutesResult.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestAllRoutesResult.java @@ -10,14 +10,14 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.TestAllRoutesResultInner; import java.util.List; /** * Type representing TestAllRoutesResult. */ -public interface TestAllRoutesResult extends HasInner, HasManager { +public interface TestAllRoutesResult extends HasInner, HasManager { /** * @return the routes value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestRouteResult.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestRouteResult.java index 94109188aa6c..58d217832d50 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestRouteResult.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/TestRouteResult.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.TestRouteResultInner; /** * Type representing TestRouteResult. */ -public interface TestRouteResult extends HasInner, HasManager { +public interface TestRouteResult extends HasInner, HasManager { /** * @return the details value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/UserSubscriptionQuota.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/UserSubscriptionQuota.java index 3092ce4a3cfe..e6da8445c465 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/UserSubscriptionQuota.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/UserSubscriptionQuota.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.IoTHubManager; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.DevicesManager; import com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation.UserSubscriptionQuotaInner; /** * Type representing UserSubscriptionQuota. */ -public interface UserSubscriptionQuota extends HasInner, HasManager { +public interface UserSubscriptionQuota extends HasInner, HasManager { /** * @return the currentValue value. */ diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateDescriptionImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateDescriptionImpl.java index 043a30bf6a6e..e785f25f22da 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateDescriptionImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateDescriptionImpl.java @@ -14,7 +14,7 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.CertificateProperties; class CertificateDescriptionImpl extends CreatableUpdatableImpl implements CertificateDescription, CertificateDescription.Definition, CertificateDescription.Update { - private final IoTHubManager manager; + private final DevicesManager manager; private String resourceGroupName; private String resourceName; private String certificateName; @@ -23,7 +23,7 @@ class CertificateDescriptionImpl extends CreatableUpdatableImpl implements CertificateListDescription { - private final IoTHubManager manager; - CertificateListDescriptionImpl(CertificateListDescriptionInner inner, IoTHubManager manager) { + private final DevicesManager manager; + CertificateListDescriptionImpl(CertificateListDescriptionInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateWithNonceDescriptionImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateWithNonceDescriptionImpl.java index 1b1b7b6c6de6..9cee873ca6d2 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateWithNonceDescriptionImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificateWithNonceDescriptionImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.CertificatePropertiesWithNonce; class CertificateWithNonceDescriptionImpl extends WrapperImpl implements CertificateWithNonceDescription { - private final IoTHubManager manager; - CertificateWithNonceDescriptionImpl(CertificateWithNonceDescriptionInner inner, IoTHubManager manager) { + private final DevicesManager manager; + CertificateWithNonceDescriptionImpl(CertificateWithNonceDescriptionInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesImpl.java index 8fc35fc20fbf..a980dd7892a7 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesImpl.java @@ -19,14 +19,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.CertificateDescription; class CertificatesImpl extends WrapperImpl implements Certificates { - private final IoTHubManager manager; + private final DevicesManager manager; - CertificatesImpl(IoTHubManager manager) { + CertificatesImpl(DevicesManager manager) { super(manager.inner().certificates()); this.manager = manager; } - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } @@ -83,10 +83,14 @@ public CertificateDescription call(CertificateDescriptionInner inner) { public Observable getAsync(String resourceGroupName, String resourceName, String certificateName) { CertificatesInner client = this.inner(); return client.getAsync(resourceGroupName, resourceName, certificateName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public CertificateDescription call(CertificateDescriptionInner inner) { - return wrapModel(inner); + public Observable call(CertificateDescriptionInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((CertificateDescription)wrapModel(inner)); + } } }); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesInner.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesInner.java index f30709099914..fb97c5db0656 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesInner.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/CertificatesInner.java @@ -12,7 +12,7 @@ import com.google.common.reflect.TypeToken; import com.microsoft.azure.management.iothub.v2018_12_01_preview.CertificateBodyDescription; import com.microsoft.azure.management.iothub.v2018_12_01_preview.CertificateVerificationDescription; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsException; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsInnerException; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceFuture; import com.microsoft.rest.ServiceResponse; @@ -90,7 +90,7 @@ interface CertificatesService { * @param resourceGroupName The name of the resource group that contains the IoT hub. * @param resourceName The name of the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the CertificateListDescriptionInner object if successful. */ @@ -166,10 +166,10 @@ public Observable> call(Respons }); } - private ServiceResponse listByIotHubDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse listByIotHubDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -181,7 +181,7 @@ private ServiceResponse listByIotHubDelegate(Re * @param resourceName The name of the IoT hub. * @param certificateName The name of the certificate * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the CertificateDescriptionInner object if successful. */ @@ -263,10 +263,10 @@ public Observable> call(Response getDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -278,7 +278,7 @@ private ServiceResponse getDelegate(Response> call(Response> call(Response createOrUpdateDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse createOrUpdateDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(201, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -481,7 +481,7 @@ private ServiceResponse createOrUpdateDelegate(Resp * @param certificateName The name of the certificate * @param ifMatch ETag of the Certificate. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent */ public void delete(String resourceGroupName, String resourceName, String certificateName, String ifMatch) { @@ -568,11 +568,11 @@ public Observable> call(Response response) { }); } - private ServiceResponse deleteDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse deleteDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(204, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -585,7 +585,7 @@ private ServiceResponse deleteDelegate(Response response) th * @param certificateName The name of the certificate * @param ifMatch ETag of the Certificate. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the CertificateWithNonceDescriptionInner object if successful. */ @@ -673,10 +673,10 @@ public Observable> call(Re }); } - private ServiceResponse generateVerificationCodeDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse generateVerificationCodeDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -689,7 +689,7 @@ private ServiceResponse generateVerificati * @param certificateName The name of the certificate * @param ifMatch ETag of the Certificate. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the CertificateDescriptionInner object if successful. */ @@ -790,7 +790,7 @@ public Observable> call(Response> call(Response verifyDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse verifyDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/DevicesManager.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/DevicesManager.java new file mode 100644 index 000000000000..c7852ea133b9 --- /dev/null +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/DevicesManager.java @@ -0,0 +1,135 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation; + +import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.AzureResponseBuilder; +import com.microsoft.azure.credentials.AzureTokenCredentials; +import com.microsoft.azure.management.apigeneration.Beta; +import com.microsoft.azure.management.apigeneration.Beta.SinceVersion; +import com.microsoft.azure.arm.resources.AzureConfigurable; +import com.microsoft.azure.serializer.AzureJacksonAdapter; +import com.microsoft.rest.RestClient; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.Operations; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.IotHubResources; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.ResourceProviderCommons; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.Certificates; +import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl; +import com.microsoft.azure.arm.resources.implementation.ManagerCore; + +/** + * Entry point to Azure Devices resource management. + */ +public final class DevicesManager extends ManagerCore { + private Operations operations; + private IotHubResources iotHubResources; + private ResourceProviderCommons resourceProviderCommons; + private Certificates certificates; + /** + * Get a Configurable instance that can be used to create DevicesManager with optional configuration. + * + * @return the instance allowing configurations + */ + public static Configurable configure() { + return new DevicesManager.ConfigurableImpl(); + } + /** + * Creates an instance of DevicesManager that exposes Devices resource management API entry points. + * + * @param credentials the credentials to use + * @param subscriptionId the subscription UUID + * @return the DevicesManager + */ + public static DevicesManager authenticate(AzureTokenCredentials credentials, String subscriptionId) { + return new DevicesManager(new RestClient.Builder() + .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER) + .withCredentials(credentials) + .withSerializerAdapter(new AzureJacksonAdapter()) + .withResponseBuilderFactory(new AzureResponseBuilder.Factory()) + .build(), subscriptionId); + } + /** + * Creates an instance of DevicesManager that exposes Devices resource management API entry points. + * + * @param restClient the RestClient to be used for API calls. + * @param subscriptionId the subscription UUID + * @return the DevicesManager + */ + public static DevicesManager authenticate(RestClient restClient, String subscriptionId) { + return new DevicesManager(restClient, subscriptionId); + } + /** + * The interface allowing configurations to be set. + */ + public interface Configurable extends AzureConfigurable { + /** + * Creates an instance of DevicesManager that exposes Devices management API entry points. + * + * @param credentials the credentials to use + * @param subscriptionId the subscription UUID + * @return the interface exposing Devices management API entry points that work across subscriptions + */ + DevicesManager authenticate(AzureTokenCredentials credentials, String subscriptionId); + } + + /** + * @return Entry point to manage Operations. + */ + public Operations operations() { + if (this.operations == null) { + this.operations = new OperationsImpl(this); + } + return this.operations; + } + + /** + * @return Entry point to manage IotHubResources. + */ + public IotHubResources iotHubResources() { + if (this.iotHubResources == null) { + this.iotHubResources = new IotHubResourcesImpl(this); + } + return this.iotHubResources; + } + + /** + * @return Entry point to manage ResourceProviderCommons. + */ + public ResourceProviderCommons resourceProviderCommons() { + if (this.resourceProviderCommons == null) { + this.resourceProviderCommons = new ResourceProviderCommonsImpl(this); + } + return this.resourceProviderCommons; + } + + /** + * @return Entry point to manage Certificates. + */ + public Certificates certificates() { + if (this.certificates == null) { + this.certificates = new CertificatesImpl(this); + } + return this.certificates; + } + + /** + * The implementation for Configurable interface. + */ + private static final class ConfigurableImpl extends AzureConfigurableCoreImpl implements Configurable { + public DevicesManager authenticate(AzureTokenCredentials credentials, String subscriptionId) { + return DevicesManager.authenticate(buildRestClient(credentials), subscriptionId); + } + } + private DevicesManager(RestClient restClient, String subscriptionId) { + super( + restClient, + subscriptionId, + new IotHubClientImpl(restClient).withSubscriptionId(subscriptionId)); + } +} diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EndpointHealthDataImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EndpointHealthDataImpl.java index 69cc6132cb04..9937827d7a62 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EndpointHealthDataImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EndpointHealthDataImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.EndpointHealthStatus; class EndpointHealthDataImpl extends WrapperImpl implements EndpointHealthData { - private final IoTHubManager manager; - EndpointHealthDataImpl(EndpointHealthDataInner inner, IoTHubManager manager) { + private final DevicesManager manager; + EndpointHealthDataImpl(EndpointHealthDataInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInner.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInner.java new file mode 100644 index 000000000000..737a70fb649c --- /dev/null +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInner.java @@ -0,0 +1,77 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Error details. + */ +public class ErrorDetailsInner { + /** + * The error code. + */ + @JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY) + private String code; + + /** + * The HTTP status code. + */ + @JsonProperty(value = "httpStatusCode", access = JsonProperty.Access.WRITE_ONLY) + private String httpStatusCode; + + /** + * The error message. + */ + @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY) + private String message; + + /** + * The error details. + */ + @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY) + private String details; + + /** + * Get the error code. + * + * @return the code value + */ + public String code() { + return this.code; + } + + /** + * Get the HTTP status code. + * + * @return the httpStatusCode value + */ + public String httpStatusCode() { + return this.httpStatusCode; + } + + /** + * Get the error message. + * + * @return the message value + */ + public String message() { + return this.message; + } + + /** + * Get the error details. + * + * @return the details value + */ + public String details() { + return this.details; + } + +} diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInnerException.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInnerException.java new file mode 100644 index 000000000000..356919dc9117 --- /dev/null +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ErrorDetailsInnerException.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.iothub.v2018_12_01_preview.implementation; + +import com.microsoft.rest.RestException; +import okhttp3.ResponseBody; +import retrofit2.Response; + +/** + * Exception thrown for an invalid response with ErrorDetailsInner information. + */ +public class ErrorDetailsInnerException extends RestException { + /** + * Initializes a new instance of the ErrorDetailsInnerException class. + * + * @param message the exception message or the response content if a message is not available + * @param response the HTTP response + */ + public ErrorDetailsInnerException(final String message, final Response response) { + super(message, response); + } + + /** + * Initializes a new instance of the ErrorDetailsInnerException class. + * + * @param message the exception message or the response content if a message is not available + * @param response the HTTP response + * @param body the deserialized response body + */ + public ErrorDetailsInnerException(final String message, final Response response, final ErrorDetailsInner body) { + super(message, response, body); + } + + @Override + public ErrorDetailsInner body() { + return (ErrorDetailsInner) super.body(); + } +} diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EventHubConsumerGroupInfoImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EventHubConsumerGroupInfoImpl.java index d071bae2ea4b..4ab808f43b14 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EventHubConsumerGroupInfoImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/EventHubConsumerGroupInfoImpl.java @@ -14,13 +14,13 @@ import java.util.Map; class EventHubConsumerGroupInfoImpl extends CreatableUpdatableImpl implements EventHubConsumerGroupInfo, EventHubConsumerGroupInfo.Definition, EventHubConsumerGroupInfo.Update { - private final IoTHubManager manager; + private final DevicesManager manager; private String resourceGroupName; private String resourceName; private String eventHubEndpointName; private String name; - EventHubConsumerGroupInfoImpl(String name, IoTHubManager manager) { + EventHubConsumerGroupInfoImpl(String name, DevicesManager manager) { super(name, new EventHubConsumerGroupInfoInner()); this.manager = manager; // Set resource name @@ -28,7 +28,7 @@ class EventHubConsumerGroupInfoImpl extends CreatableUpdatableImpl implements IotHubDescription, IotHubDescription.Definition, IotHubDescription.Update { +class IotHubDescriptionImpl extends GroupableResourceCoreImpl implements IotHubDescription, IotHubDescription.Definition, IotHubDescription.Update { private String cifMatch; private String uifMatch; - IotHubDescriptionImpl(String name, IotHubDescriptionInner inner, IoTHubManager manager) { + IotHubDescriptionImpl(String name, IotHubDescriptionInner inner, DevicesManager manager) { super(name, inner, manager); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubNameAvailabilityInfoImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubNameAvailabilityInfoImpl.java index e6e065653ab8..21088652d66d 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubNameAvailabilityInfoImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubNameAvailabilityInfoImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.IotHubNameUnavailabilityReason; class IotHubNameAvailabilityInfoImpl extends WrapperImpl implements IotHubNameAvailabilityInfo { - private final IoTHubManager manager; - IotHubNameAvailabilityInfoImpl(IotHubNameAvailabilityInfoInner inner, IoTHubManager manager) { + private final DevicesManager manager; + IotHubNameAvailabilityInfoImpl(IotHubNameAvailabilityInfoInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubQuotaMetricInfoImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubQuotaMetricInfoImpl.java index 7133d9ab5854..f43b25f7490d 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubQuotaMetricInfoImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubQuotaMetricInfoImpl.java @@ -13,15 +13,15 @@ import rx.Observable; class IotHubQuotaMetricInfoImpl extends WrapperImpl implements IotHubQuotaMetricInfo { - private final IoTHubManager manager; + private final DevicesManager manager; - IotHubQuotaMetricInfoImpl(IotHubQuotaMetricInfoInner inner, IoTHubManager manager) { + IotHubQuotaMetricInfoImpl(IotHubQuotaMetricInfoInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesImpl.java index e9e17e4f9bcb..90b729bd118c 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesImpl.java @@ -32,14 +32,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.TestRouteInput; class IotHubResourcesImpl extends WrapperImpl implements IotHubResources { - private final IoTHubManager manager; + private final DevicesManager manager; - IotHubResourcesImpl(IoTHubManager manager) { + IotHubResourcesImpl(DevicesManager manager) { super(manager.inner().iotHubResources()); this.manager = manager; } - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } @@ -105,10 +105,14 @@ private Observable getJobResponseInnerUsingIotHubResourcesInne @Override public Observable getByResourceGroupAsync(String resourceGroupName, String name) { - return this.getIotHubDescriptionInnerUsingIotHubResourcesInnerAsync(resourceGroupName, name).map(new Func1 () { + return this.getIotHubDescriptionInnerUsingIotHubResourcesInnerAsync(resourceGroupName, name).flatMap(new Func1> () { @Override - public IotHubDescription call(IotHubDescriptionInner inner) { - return wrapIotHubDescriptionModel(inner); + public Observable call(IotHubDescriptionInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((IotHubDescription)wrapIotHubDescriptionModel(inner)); + } } }); } @@ -260,10 +264,14 @@ public IotHubSkuDescription call(IotHubSkuDescriptionInner inner) { public Observable getEventHubConsumerGroupAsync(String resourceGroupName, String resourceName, String eventHubEndpointName, String name) { IotHubResourcesInner client = this.inner(); return client.getEventHubConsumerGroupAsync(resourceGroupName, resourceName, eventHubEndpointName, name) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public EventHubConsumerGroupInfo call(EventHubConsumerGroupInfoInner inner) { - return wrapEventHubConsumerGroupInfoModel(inner); + public Observable call(EventHubConsumerGroupInfoInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((EventHubConsumerGroupInfo)wrapEventHubConsumerGroupInfoModel(inner)); + } } }); } @@ -296,10 +304,14 @@ public Completable deleteEventHubConsumerGroupAsync(String resourceGroupName, St public Observable getJobAsync(String resourceGroupName, String resourceName, String jobId) { IotHubResourcesInner client = this.inner(); return client.getJobAsync(resourceGroupName, resourceName, jobId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public JobResponse call(JobResponseInner inner) { - return wrapJobResponseModel(inner); + public Observable call(JobResponseInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((JobResponse)wrapJobResponseModel(inner)); + } } }); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesInner.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesInner.java index fd989cc678fb..3ea1ebbedc51 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesInner.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubResourcesInner.java @@ -16,8 +16,7 @@ import com.microsoft.azure.AzureServiceFuture; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetails; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsException; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsInnerException; import com.microsoft.azure.management.iothub.v2018_12_01_preview.ExportDevicesRequest; import com.microsoft.azure.management.iothub.v2018_12_01_preview.ImportDevicesRequest; import com.microsoft.azure.management.iothub.v2018_12_01_preview.OperationInputs; @@ -220,7 +219,7 @@ interface IotHubResourcesService { * @param resourceGroupName The name of the resource group that contains the IoT hub. * @param resourceName The name of the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the IotHubDescriptionInner object if successful. */ @@ -296,10 +295,10 @@ public Observable> call(Response getByResourceGroupDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getByResourceGroupDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -311,7 +310,7 @@ private ServiceResponse getByResourceGroupDelegate(Respo * @param resourceName The name of the IoT hub. * @param iotHubDescription The IoT hub metadata and security metadata. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the IotHubDescriptionInner object if successful. */ @@ -393,7 +392,7 @@ public Observable> createOrUpdateWithSer * @param iotHubDescription The IoT hub metadata and security metadata. * @param ifMatch ETag of the IoT Hub. Do not specify for creating a brand new IoT Hub. Required to update an existing IoT Hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the IotHubDescriptionInner object if successful. */ @@ -477,7 +476,7 @@ public Observable> createOrUpdateWithSer * @param resourceName The name of the IoT hub. * @param iotHubDescription The IoT hub metadata and security metadata. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the IotHubDescriptionInner object if successful. */ @@ -570,7 +569,7 @@ public Observable> call(Response> call(Response beginCreateOrUpdateDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse beginCreateOrUpdateDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(201, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1009,7 +1008,7 @@ private ServiceResponse beginUpdateDelegate(Response> deleteWithServiceResponseAsync(String * @param resourceGroupName The name of the resource group that contains the IoT hub. * @param resourceName The name of the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the Object object if successful. */ @@ -1158,13 +1157,13 @@ public Observable> call(Response response) }); } - private ServiceResponse beginDeleteDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse beginDeleteDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .register(202, new TypeToken() { }.getType()) .register(204, new TypeToken() { }.getType()) - .register(404, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .register(404, new TypeToken() { }.getType()) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1173,7 +1172,7 @@ private ServiceResponse beginDeleteDelegate(Response respo * Get all the IoT hubs in a subscription. * * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubDescriptionInner> object if successful. */ @@ -1273,10 +1272,10 @@ public Observable>> call(Response> listDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1286,7 +1285,7 @@ private ServiceResponse> listDelegate(Response< * * @param resourceGroupName The name of the resource group that contains the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubDescriptionInner> object if successful. */ @@ -1393,10 +1392,10 @@ public Observable>> call(Response> listByResourceGroupDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listByResourceGroupDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1407,7 +1406,7 @@ private ServiceResponse> listByResourceGroupDel * @param resourceGroupName The name of the resource group that contains the IoT hub. * @param resourceName The name of the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the RegistryStatisticsInner object if successful. */ @@ -1483,10 +1482,10 @@ public Observable> call(Response getStatsDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getStatsDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1497,7 +1496,7 @@ private ServiceResponse getStatsDelegate(Response>> call(Respons }); } - private ServiceResponse> getValidSkusDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getValidSkusDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1626,7 +1625,7 @@ private ServiceResponse> getValidSkusDelegat * @param resourceName The name of the IoT hub. * @param eventHubEndpointName The name of the Event Hub-compatible endpoint. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<EventHubConsumerGroupInfoInner> object if successful. */ @@ -1747,10 +1746,10 @@ public Observable>> call(Re }); } - private ServiceResponse> listEventHubConsumerGroupsDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listEventHubConsumerGroupsDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1763,7 +1762,7 @@ private ServiceResponse> listEventHubCo * @param eventHubEndpointName The name of the Event Hub-compatible endpoint in the IoT hub. * @param name The name of the consumer group to retrieve. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the EventHubConsumerGroupInfoInner object if successful. */ @@ -1851,10 +1850,10 @@ public Observable> call(Response }); } - private ServiceResponse getEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1867,7 +1866,7 @@ private ServiceResponse getEventHubConsumerGroup * @param eventHubEndpointName The name of the Event Hub-compatible endpoint in the IoT hub. * @param name The name of the consumer group to add. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the EventHubConsumerGroupInfoInner object if successful. */ @@ -1955,10 +1954,10 @@ public Observable> call(Response }); } - private ServiceResponse createEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse createEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -1971,7 +1970,7 @@ private ServiceResponse createEventHubConsumerGr * @param eventHubEndpointName The name of the Event Hub-compatible endpoint in the IoT hub. * @param name The name of the consumer group to delete. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent */ public void deleteEventHubConsumerGroup(String resourceGroupName, String resourceName, String eventHubEndpointName, String name) { @@ -2058,10 +2057,10 @@ public Observable> call(Response response) { }); } - private ServiceResponse deleteEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse deleteEventHubConsumerGroupDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2072,7 +2071,7 @@ private ServiceResponse deleteEventHubConsumerGroupDelegate(Response>> call(Response> listJobsDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listJobsDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2201,7 +2200,7 @@ private ServiceResponse> listJobsDelegate(Response> call(Response }); } - private ServiceResponse getJobDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getJobDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2297,7 +2296,7 @@ private ServiceResponse getJobDelegate(Response * @param resourceGroupName The name of the resource group that contains the IoT hub. * @param resourceName The name of the IoT hub. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubQuotaMetricInfoInner> object if successful. */ @@ -2411,10 +2410,10 @@ public Observable>> call(Respon }); } - private ServiceResponse> getQuotaMetricsDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getQuotaMetricsDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2425,7 +2424,7 @@ private ServiceResponse> getQuotaMetricsDel * @param resourceGroupName the String value * @param iotHubName the String value * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<EndpointHealthDataInner> object if successful. */ @@ -2539,10 +2538,10 @@ public Observable>> call(Response< }); } - private ServiceResponse> getEndpointHealthDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getEndpointHealthDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2552,7 +2551,7 @@ private ServiceResponse> getEndpointHealthDele * * @param name The name of the IoT hub to check. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the IotHubNameAvailabilityInfoInner object if successful. */ @@ -2624,10 +2623,10 @@ public Observable> call(Respons }); } - private ServiceResponse checkNameAvailabilityDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse checkNameAvailabilityDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2639,7 +2638,7 @@ private ServiceResponse checkNameAvailabilityDe * @param resourceGroupName resource group which Iot Hub belongs to * @param input Input for testing all routes * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the TestAllRoutesResultInner object if successful. */ @@ -2722,10 +2721,10 @@ public Observable> call(Response testAllRoutesDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse testAllRoutesDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2737,7 +2736,7 @@ private ServiceResponse testAllRoutesDelegate(Response * @param resourceGroupName resource group which Iot Hub belongs to * @param input Route that needs to be tested * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the TestRouteResultInner object if successful. */ @@ -2820,10 +2819,10 @@ public Observable> call(Response testRouteDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse testRouteDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2834,7 +2833,7 @@ private ServiceResponse testRouteDelegate(Response> listKeysDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listKeysDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -2963,7 +2962,7 @@ private ServiceResponse> l * @param resourceName The name of the IoT hub. * @param keyName The name of the shared access policy. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the SharedAccessSignatureAuthorizationRuleInner object if successful. */ @@ -3045,10 +3044,10 @@ public Observable> }); } - private ServiceResponse getKeysForKeyNameDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse getKeysForKeyNameDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3060,7 +3059,7 @@ private ServiceResponse getKeysForK * @param resourceName The name of the IoT hub. * @param exportDevicesParameters The parameters that specify the export devices operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the JobResponseInner object if successful. */ @@ -3143,10 +3142,10 @@ public Observable> call(Response }); } - private ServiceResponse exportDevicesDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse exportDevicesDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3158,7 +3157,7 @@ private ServiceResponse exportDevicesDelegate(Response> call(Response }); } - private ServiceResponse importDevicesDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) + private ServiceResponse importDevicesDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3254,7 +3253,7 @@ private ServiceResponse importDevicesDelegate(Response>> call(Response> listNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3370,7 +3369,7 @@ private ServiceResponse> listNextDelegate(Respo * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubDescriptionInner> object if successful. */ @@ -3473,10 +3472,10 @@ public Observable>> call(Response> listByResourceGroupNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listByResourceGroupNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3486,7 +3485,7 @@ private ServiceResponse> listByResourceGroupNex * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubSkuDescriptionInner> object if successful. */ @@ -3589,10 +3588,10 @@ public Observable>> call(Respons }); } - private ServiceResponse> getValidSkusNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getValidSkusNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3602,7 +3601,7 @@ private ServiceResponse> getValidSkusNextDel * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<EventHubConsumerGroupInfoInner> object if successful. */ @@ -3705,10 +3704,10 @@ public Observable>> call(Re }); } - private ServiceResponse> listEventHubConsumerGroupsNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listEventHubConsumerGroupsNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3718,7 +3717,7 @@ private ServiceResponse> listEventHubCo * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<JobResponseInner> object if successful. */ @@ -3821,10 +3820,10 @@ public Observable>> call(Response> listJobsNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listJobsNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3834,7 +3833,7 @@ private ServiceResponse> listJobsNextDelegate(Respons * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<IotHubQuotaMetricInfoInner> object if successful. */ @@ -3937,10 +3936,10 @@ public Observable>> call(Respon }); } - private ServiceResponse> getQuotaMetricsNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getQuotaMetricsNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -3950,7 +3949,7 @@ private ServiceResponse> getQuotaMetricsNex * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<EndpointHealthDataInner> object if successful. */ @@ -4053,10 +4052,10 @@ public Observable>> call(Response< }); } - private ServiceResponse> getEndpointHealthNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> getEndpointHealthNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -4066,7 +4065,7 @@ private ServiceResponse> getEndpointHealthNext * * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<SharedAccessSignatureAuthorizationRuleInner> object if successful. */ @@ -4169,10 +4168,10 @@ public Observable> listKeysNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listKeysNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubSkuDescriptionImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubSkuDescriptionImpl.java index 61d7b4bdf91e..64e55d787379 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubSkuDescriptionImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/IotHubSkuDescriptionImpl.java @@ -15,15 +15,15 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.IotHubSkuInfo; class IotHubSkuDescriptionImpl extends WrapperImpl implements IotHubSkuDescription { - private final IoTHubManager manager; + private final DevicesManager manager; - IotHubSkuDescriptionImpl(IotHubSkuDescriptionInner inner, IoTHubManager manager) { + IotHubSkuDescriptionImpl(IotHubSkuDescriptionInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/JobResponseImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/JobResponseImpl.java index aaca310ae15f..46ac15e57583 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/JobResponseImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/JobResponseImpl.java @@ -17,18 +17,18 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.JobType; class JobResponseImpl extends WrapperImpl implements JobResponse { - private final IoTHubManager manager; + private final DevicesManager manager; private String resourceGroupName; private String resourceName; private String jobId; - JobResponseImpl(JobResponseInner inner, IoTHubManager manager) { + JobResponseImpl(JobResponseInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationImpl.java index f399075f7045..22878ffd964b 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.OperationDisplay; class OperationImpl extends WrapperImpl implements Operation { - private final IoTHubManager manager; - OperationImpl(OperationInner inner, IoTHubManager manager) { + private final DevicesManager manager; + OperationImpl(OperationInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsImpl.java index 0b3471277c46..fbb5e818d5bb 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsImpl.java @@ -17,14 +17,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.Operation; class OperationsImpl extends WrapperImpl implements Operations { - private final IoTHubManager manager; + private final DevicesManager manager; - OperationsImpl(IoTHubManager manager) { + OperationsImpl(DevicesManager manager) { super(manager.inner().operations()); this.manager = manager; } - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsInner.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsInner.java index 9285c7f9a6e6..e2dd28f2c839 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsInner.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/OperationsInner.java @@ -12,7 +12,7 @@ import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceFuture; import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsException; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsInnerException; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceFuture; @@ -69,7 +69,7 @@ interface OperationsService { * Lists all of the available IoT Hub REST API operations. * * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws ErrorDetailsException thrown if the request is rejected by server + * @throws ErrorDetailsInnerException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<OperationInner> object if successful. */ @@ -162,10 +162,10 @@ public Observable>> call(Response> listDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } @@ -174,7 +174,7 @@ private ServiceResponse> listDelegate(Response>> call(Response> listNextDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listNextDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/RegistryStatisticsImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/RegistryStatisticsImpl.java index d63064f4b309..b8575c41b876 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/RegistryStatisticsImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/RegistryStatisticsImpl.java @@ -12,14 +12,14 @@ import com.microsoft.azure.arm.model.implementation.WrapperImpl; class RegistryStatisticsImpl extends WrapperImpl implements RegistryStatistics { - private final IoTHubManager manager; - RegistryStatisticsImpl(RegistryStatisticsInner inner, IoTHubManager manager) { + private final DevicesManager manager; + RegistryStatisticsImpl(RegistryStatisticsInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsImpl.java index e9dba856b4e6..0d0ad91062f8 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsImpl.java @@ -17,14 +17,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.UserSubscriptionQuota; class ResourceProviderCommonsImpl extends WrapperImpl implements ResourceProviderCommons { - private final IoTHubManager manager; + private final DevicesManager manager; - ResourceProviderCommonsImpl(IoTHubManager manager) { + ResourceProviderCommonsImpl(DevicesManager manager) { super(manager.inner().resourceProviderCommons()); this.manager = manager; } - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsInner.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsInner.java index dde6ae7c2b3e..74d882497dee 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsInner.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/ResourceProviderCommonsInner.java @@ -10,7 +10,7 @@ import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; -import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsException; +import com.microsoft.azure.management.iothub.v2018_12_01_preview.ErrorDetailsInnerException; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCallback; @@ -138,10 +138,10 @@ public Observable>> call(Respon }); } - private ServiceResponse> listDelegate(Response response) throws ErrorDetailsException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., ErrorDetailsException>newInstance(this.client.serializerAdapter()) + private ServiceResponse> listDelegate(Response response) throws ErrorDetailsInnerException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., ErrorDetailsInnerException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) - .registerError(ErrorDetailsException.class) + .registerError(ErrorDetailsInnerException.class) .build(response); } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/SharedAccessSignatureAuthorizationRuleImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/SharedAccessSignatureAuthorizationRuleImpl.java index 360d5324fbe7..6932d1053e17 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/SharedAccessSignatureAuthorizationRuleImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/SharedAccessSignatureAuthorizationRuleImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.AccessRights; class SharedAccessSignatureAuthorizationRuleImpl extends WrapperImpl implements SharedAccessSignatureAuthorizationRule { - private final IoTHubManager manager; - SharedAccessSignatureAuthorizationRuleImpl(SharedAccessSignatureAuthorizationRuleInner inner, IoTHubManager manager) { + private final DevicesManager manager; + SharedAccessSignatureAuthorizationRuleImpl(SharedAccessSignatureAuthorizationRuleInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestAllRoutesResultImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestAllRoutesResultImpl.java index beac155cbc0a..4ce955444e43 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestAllRoutesResultImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestAllRoutesResultImpl.java @@ -14,14 +14,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.MatchedRoute; class TestAllRoutesResultImpl extends WrapperImpl implements TestAllRoutesResult { - private final IoTHubManager manager; - TestAllRoutesResultImpl(TestAllRoutesResultInner inner, IoTHubManager manager) { + private final DevicesManager manager; + TestAllRoutesResultImpl(TestAllRoutesResultInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestRouteResultImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestRouteResultImpl.java index 71d2e546fb00..744b99409da4 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestRouteResultImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/TestRouteResultImpl.java @@ -14,14 +14,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.TestResultStatus; class TestRouteResultImpl extends WrapperImpl implements TestRouteResult { - private final IoTHubManager manager; - TestRouteResultImpl(TestRouteResultInner inner, IoTHubManager manager) { + private final DevicesManager manager; + TestRouteResultImpl(TestRouteResultInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; } diff --git a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/UserSubscriptionQuotaImpl.java b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/UserSubscriptionQuotaImpl.java index 83b3543fb2ad..753bb532081b 100644 --- a/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/UserSubscriptionQuotaImpl.java +++ b/sdk/iothub/mgmt-v2018_12_01_preview/src/main/java/com/microsoft/azure/management/iothub/v2018_12_01_preview/implementation/UserSubscriptionQuotaImpl.java @@ -13,14 +13,14 @@ import com.microsoft.azure.management.iothub.v2018_12_01_preview.Name; class UserSubscriptionQuotaImpl extends WrapperImpl implements UserSubscriptionQuota { - private final IoTHubManager manager; - UserSubscriptionQuotaImpl(UserSubscriptionQuotaInner inner, IoTHubManager manager) { + private final DevicesManager manager; + UserSubscriptionQuotaImpl(UserSubscriptionQuotaInner inner, DevicesManager manager) { super(inner); this.manager = manager; } @Override - public IoTHubManager manager() { + public DevicesManager manager() { return this.manager; }