Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/logic/azure-resourcemanager-logic/CHANGELOG.md
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-10-05)

- Azure Resource Manager Logic client library for Java. This package contains Microsoft Azure SDK for Logic Management SDK. REST API for Azure Logic Apps. Package tag package-2019-05. 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-04-16)

Expand Down
4 changes: 3 additions & 1 deletion sdk/logic/azure-resourcemanager-logic/README.md
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-logic</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/logic/azure-resourcemanager-logic/pom.xml
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-logic</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-logic;current} -->
<packaging>jar</packaging>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-logic</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-logic;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Logic Management</name>
<description>This package contains Microsoft Azure SDK for Logic Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure Logic Apps. Package tag package-2019-05.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<name>Microsoft Azure SDK for Logic Management</name>
<description>This package contains Microsoft Azure SDK for Logic Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure Logic Apps. Package tag package-2019-05.</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.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.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.7</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.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.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.7</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>
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.http.policy.AddDatePolicy;
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
import com.azure.core.http.policy.HttpLogOptions;
import com.azure.core.http.policy.HttpLoggingPolicy;
import com.azure.core.http.policy.HttpPipelinePolicy;
import com.azure.core.http.policy.HttpPolicyProviders;
import com.azure.core.http.policy.RequestIdPolicy;
import com.azure.core.http.policy.RetryPolicy;
import com.azure.core.http.policy.UserAgentPolicy;
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
import com.azure.core.management.profile.AzureProfile;
import com.azure.core.util.Configuration;
import com.azure.core.util.logging.ClientLogger;
Expand Down Expand Up @@ -181,6 +181,7 @@ public static final class Configurable {
private HttpClient httpClient;
private HttpLogOptions httpLogOptions;
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
private final List<String> scopes = new ArrayList<>();
private RetryPolicy retryPolicy;
private Duration defaultPollInterval;

Expand Down Expand Up @@ -220,6 +221,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
return this;
}

/**
* Adds the scope to permission sets.
*
* @param scope the scope.
* @return the configurable object itself.
*/
public Configurable withScope(String scope) {
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
return this;
}

/**
* Sets the retry policy to the HTTP pipeline.
*
Expand Down Expand Up @@ -276,6 +288,9 @@ public LogicManager authenticate(TokenCredential credential, AzureProfile profil
userAgentBuilder.append(" (auto-generated)");
}

if (scopes.isEmpty()) {
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
}
if (retryPolicy == null) {
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
}
Expand All @@ -285,10 +300,7 @@ public LogicManager authenticate(TokenCredential credential, AzureProfile profil
HttpPolicyProviders.addBeforeRetryPolicies(policies);
policies.add(retryPolicy);
policies.add(new AddDatePolicy());
policies
.add(
new BearerTokenAuthenticationPolicy(
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
policies.addAll(this.policies);
HttpPolicyProviders.addAfterRetryPolicies(policies);
policies.add(new HttpLoggingPolicy(httpLogOptions));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.azure.core.management.polling.PollResult;
import com.azure.core.util.Context;
import com.azure.core.util.polling.SyncPoller;
import com.azure.resourcemanager.logic.fluent.models.ManagedApiInner;
import com.azure.resourcemanager.logic.fluent.models.IntegrationServiceEnvironmentManagedApiInner;

/**
* An instance of this class provides access to all the operations defined in
Expand All @@ -29,7 +29,8 @@ public interface IntegrationServiceEnvironmentManagedApisClient {
* @return the integration service environment managed Apis.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedIterable<ManagedApiInner> list(String resourceGroup, String integrationServiceEnvironmentName);
PagedIterable<IntegrationServiceEnvironmentManagedApiInner> list(
String resourceGroup, String integrationServiceEnvironmentName);

/**
* Gets the integration service environment managed Apis.
Expand All @@ -43,7 +44,7 @@ public interface IntegrationServiceEnvironmentManagedApisClient {
* @return the integration service environment managed Apis.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedIterable<ManagedApiInner> list(
PagedIterable<IntegrationServiceEnvironmentManagedApiInner> list(
String resourceGroup, String integrationServiceEnvironmentName, Context context);

/**
Expand All @@ -58,7 +59,8 @@ PagedIterable<ManagedApiInner> list(
* @return the integration service environment managed Api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedApiInner get(String resourceGroup, String integrationServiceEnvironmentName, String apiName);
IntegrationServiceEnvironmentManagedApiInner get(
String resourceGroup, String integrationServiceEnvironmentName, String apiName);

/**
* Gets the integration service environment managed Api.
Expand All @@ -73,7 +75,7 @@ PagedIterable<ManagedApiInner> list(
* @return the integration service environment managed Api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<ManagedApiInner> getWithResponse(
Response<IntegrationServiceEnvironmentManagedApiInner> getWithResponse(
String resourceGroup, String integrationServiceEnvironmentName, String apiName, Context context);

/**
Expand All @@ -82,60 +84,81 @@ Response<ManagedApiInner> getWithResponse(
* @param resourceGroup The resource group name.
* @param integrationServiceEnvironmentName The integration service environment name.
* @param apiName The api name.
* @param integrationServiceEnvironmentManagedApi The integration service environment managed api.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the managed api definition.
* @return the integration service environment managed api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SyncPoller<PollResult<ManagedApiInner>, ManagedApiInner> beginPut(
String resourceGroup, String integrationServiceEnvironmentName, String apiName);
SyncPoller<PollResult<IntegrationServiceEnvironmentManagedApiInner>, IntegrationServiceEnvironmentManagedApiInner>
beginPut(
String resourceGroup,
String integrationServiceEnvironmentName,
String apiName,
IntegrationServiceEnvironmentManagedApiInner integrationServiceEnvironmentManagedApi);

/**
* Puts the integration service environment managed Api.
*
* @param resourceGroup The resource group name.
* @param integrationServiceEnvironmentName The integration service environment name.
* @param apiName The api name.
* @param integrationServiceEnvironmentManagedApi The integration service environment managed api.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the managed api definition.
* @return the integration service environment managed api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SyncPoller<PollResult<ManagedApiInner>, ManagedApiInner> beginPut(
String resourceGroup, String integrationServiceEnvironmentName, String apiName, Context context);
SyncPoller<PollResult<IntegrationServiceEnvironmentManagedApiInner>, IntegrationServiceEnvironmentManagedApiInner>
beginPut(
String resourceGroup,
String integrationServiceEnvironmentName,
String apiName,
IntegrationServiceEnvironmentManagedApiInner integrationServiceEnvironmentManagedApi,
Context context);

/**
* Puts the integration service environment managed Api.
*
* @param resourceGroup The resource group name.
* @param integrationServiceEnvironmentName The integration service environment name.
* @param apiName The api name.
* @param integrationServiceEnvironmentManagedApi The integration service environment managed api.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the managed api definition.
* @return the integration service environment managed api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedApiInner put(String resourceGroup, String integrationServiceEnvironmentName, String apiName);
IntegrationServiceEnvironmentManagedApiInner put(
String resourceGroup,
String integrationServiceEnvironmentName,
String apiName,
IntegrationServiceEnvironmentManagedApiInner integrationServiceEnvironmentManagedApi);

/**
* Puts the integration service environment managed Api.
*
* @param resourceGroup The resource group name.
* @param integrationServiceEnvironmentName The integration service environment name.
* @param apiName The api name.
* @param integrationServiceEnvironmentManagedApi The integration service environment managed api.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the managed api definition.
* @return the integration service environment managed api.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedApiInner put(
String resourceGroup, String integrationServiceEnvironmentName, String apiName, Context context);
IntegrationServiceEnvironmentManagedApiInner put(
String resourceGroup,
String integrationServiceEnvironmentName,
String apiName,
IntegrationServiceEnvironmentManagedApiInner integrationServiceEnvironmentManagedApi,
Context context);

/**
* Deletes the integration service environment managed Api.
Expand Down
Loading