Skip to content

Commit

Permalink
CodeGen from PR 14550 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history 
Remove x-ms-flatten setting for resource properties (Azure#14550)

* Disabled flatten setting for properties

* added forceDelete parameter for orchestrator resource

* remove forcedelete

* config

Co-authored-by: msyyc <[email protected]>
  • Loading branch information
@msyyc
SDKAuto and msyyc committed May 26, 2021
1 parent 9d6deb6 commit c0c7f96
Show file tree
Hide file tree
Showing 17 changed files with 598 additions and 748 deletions.
3 changes: 2 additions & 1 deletion sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Release History

## 1.0.0-beta.2 (Unreleased)
## 1.0.0-beta.1 (2021-05-26)

- Azure Resource Manager DelegatedNetwork client library for Java. This package contains Microsoft Azure SDK for DelegatedNetwork Management SDK. DNC web api provides way to create, get and delete dnc controller. Package tag package-2021-03-15. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## 1.0.0-beta.1 (2021-03-26)

Expand Down
4 changes: 3 additions & 1 deletion sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Various documentation is available to help you get started
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-delegatednetwork</artifactId>
<version>1.0.0-beta.1</version>
<version>1.0.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on

## Examples



## Troubleshooting

## Next steps
Expand Down
141 changes: 80 additions & 61 deletions sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,86 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-delegatednetwork</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-delegatednetwork;current} -->
<packaging>jar</packaging>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-delegatednetwork</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-delegatednetwork;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for DelegatedNetwork Management</name>
<description>This package contains Microsoft Azure SDK for DelegatedNetwork Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. DNC web api provides way to create, get and delete dnc controller. Package tag package-2021-03-15.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<name>Microsoft Azure SDK for DelegatedNetwork Management</name>
<description>This package contains Microsoft Azure SDK for DelegatedNetwork Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. DNC web api provides way to create, get and delete dnc controller. Package tag package-2021-03-15.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>

<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
<configuration>
<analysisConfiguration>
<revapi.ignore>
<item>
<code>java.method.addedToInterface</code>
</item>
<item>
<regex>true</regex>
<code>.*</code>
<package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
</item>
</revapi.ignore>
</analysisConfiguration>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 1 addition & 0 deletions ...ork/src/main/java/com/azure/resourcemanager/delegatednetwork/DelegatedNetworkManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ public DelegatedNetworkManager authenticate(TokenCredential credential, AzurePro
.add(
new BearerTokenAuthenticationPolicy(
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
policies.addAll(this.policies);
HttpPolicyProviders.addAfterRetryPolicies(policies);
policies.add(new HttpLoggingPolicy(httpLogOptions));
HttpPipeline httpPipeline =
Expand Down
84 changes: 12 additions & 72 deletions ...va/com/azure/resourcemanager/delegatednetwork/fluent/models/DelegatedControllerInner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,94 +5,31 @@
package com.azure.resourcemanager.delegatednetwork.fluent.models;

import com.azure.core.annotation.Immutable;
import com.azure.core.annotation.JsonFlatten;
import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.delegatednetwork.models.ControllerResource;
import com.azure.resourcemanager.delegatednetwork.models.ControllerState;
import com.azure.resourcemanager.delegatednetwork.models.DelegatedControllerProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Map;

/** Represents an instance of a DNC controller. */
@JsonFlatten
@Immutable
public class DelegatedControllerInner extends ControllerResource {
public final class DelegatedControllerInner extends ControllerResource {
@JsonIgnore private final ClientLogger logger = new ClientLogger(DelegatedControllerInner.class);

/*
* Resource guid.
* Properties of the provision operation request.
*/
@JsonProperty(value = "properties.resourceGuid", access = JsonProperty.Access.WRITE_ONLY)
private String resourceGuid;

/*
* The current state of dnc controller resource.
*/
@JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
private ControllerState provisioningState;

/*
* dnc application id should be used by customer to authenticate with dnc
* gateway.
*/
@JsonProperty(value = "properties.dncAppId", access = JsonProperty.Access.WRITE_ONLY)
private String dncAppId;

/*
* tenant id of dnc application id
*/
@JsonProperty(value = "properties.dncTenantId", access = JsonProperty.Access.WRITE_ONLY)
private String dncTenantId;

/*
* dnc endpoint url that customers can use to connect to
*/
@JsonProperty(value = "properties.dncEndpoint", access = JsonProperty.Access.WRITE_ONLY)
private String dncEndpoint;

/**
* Get the resourceGuid property: Resource guid.
*
* @return the resourceGuid value.
*/
public String resourceGuid() {
return this.resourceGuid;
}

/**
* Get the provisioningState property: The current state of dnc controller resource.
*
* @return the provisioningState value.
*/
public ControllerState provisioningState() {
return this.provisioningState;
}

/**
* Get the dncAppId property: dnc application id should be used by customer to authenticate with dnc gateway.
*
* @return the dncAppId value.
*/
public String dncAppId() {
return this.dncAppId;
}

/**
* Get the dncTenantId property: tenant id of dnc application id.
*
* @return the dncTenantId value.
*/
public String dncTenantId() {
return this.dncTenantId;
}
@JsonProperty(value = "properties", access = JsonProperty.Access.WRITE_ONLY)
private DelegatedControllerProperties properties;

/**
* Get the dncEndpoint property: dnc endpoint url that customers can use to connect to.
* Get the properties property: Properties of the provision operation request.
*
* @return the dncEndpoint value.
* @return the properties value.
*/
public String dncEndpoint() {
return this.dncEndpoint;
public DelegatedControllerProperties properties() {
return this.properties;
}

/** {@inheritDoc} */
Expand All @@ -117,5 +54,8 @@ public DelegatedControllerInner withTags(Map<String, String> tags) {
@Override
public void validate() {
super.validate();
if (properties() != null) {
properties().validate();
}
}
}
Loading

0 comments on commit c0c7f96

Please sign in to comment.