Skip to content

Commit

Permalink
Mgmt: Migrate Redis (Azure#14099)
Browse files Browse the repository at this point in the history
* move redis

* update pom

* add versioning

* move to models

* update api-specs

* rename package

* generate

* move manager

* update redis manager

* remove Beta and Method

* fix name error

* fix models compile

* fix some compile error

* fix impl compile error

* fix test compile

* ChildResourcesCached to flux

* remove redundant

* fix some checkstyle

* update impl of child resource

* fix map with null

* use lazy load for extern child resources

* update redis cache LRO

* update session-records

* regen redis

* format code

* add redis to azure

* update session-records

* move samples

* fix compile error

* update session-records

* add non async listChildResources

* revert 9f86b79 in vm impl

* update lincense

* fix checkstyle

* update version

* add readme and changelog

* add ensureCollectionLoaded

* delete first sleep in LRO

* set inner in LRO
  • Loading branch information
ChenTanyi authored Aug 17, 2020
1 parent ed00300 commit fb7b067
Show file tree
Hide file tree
Showing 92 changed files with 27,461 additions and 3,857 deletions.
1 change: 1 addition & 0 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ com.azure.resourcemanager:azure-resourcemanager-msi;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-network;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-privatedns;2.0.0-beta.4;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-resources;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-redis;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-sql;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-storage;2.0.0-beta.3;2.0.0-beta.4
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
"redis": {
"dir": "azure-resourcemanager-redis",
"source": "specification/redis/resource-manager/readme.md",
"package": "com.microsoft.azure.resourcemanager.redis",
"package": "com.azure.resourcemanager.redis",
"args": "--payload-flattening-threshold=1 --tag=package-2018-03"
},
"relay": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -130,7 +131,12 @@ protected List<VirtualMachineExtensionImpl> listChildResources() {
}
}
}
return childResources;
return Collections.unmodifiableList(childResources);
}

@Override
protected Flux<VirtualMachineExtensionImpl> listChildResourcesAsync() {
return Flux.fromIterable(listChildResources());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.azure.resourcemanager.cosmos.models.CosmosDBAccount;
import com.azure.resourcemanager.cosmos.models.PrivateEndpointConnection;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation.ExternalChildResourcesCachedImpl;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.HashMap;
Expand Down Expand Up @@ -92,6 +93,11 @@ public Mono<PrivateEndpointConnectionImpl> getImplAsync(String name) {
});
}

@Override
protected Flux<PrivateEndpointConnectionImpl> listChildResourcesAsync() {
return listAsync();
}

@Override
protected List<PrivateEndpointConnectionImpl> listChildResources() {
return listAsync().collectList().block();
Expand Down
5 changes: 5 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-redis/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Release History

## 2.0.0-beta.4 (Unreleased)

- TODO
40 changes: 40 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-redis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Azure Resource Manager redis cache client library for Java

Azure Resource Manager redis cache client library for Java

## Getting started

### Prerequisites

- Java Development Kit (JDK) with version 8 or above

### Adding the package to your product

[//]: # ({x-version-update-start;com.azure.resourcemanager:azure-resourcemanager-redis;current})
```xml
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-redis</artifactId>
<version>2.0.0-beta.4</version>
</dependency>
```
[//]: # ({x-version-update-end})

## Key concepts

## Examples

## Troubleshooting

## Next steps

## Contributing

If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft
Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).

1. Fork it
1. Create your feature branch (`git checkout -b my-new-feature`)
1. Commit your changes (`git commit -am 'Add some feature'`)
1. Push to the branch (`git push origin my-new-feature`)
1. Create new Pull Request
142 changes: 142 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-redis/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. See License.txt in the project root for
license information.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<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-redis</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-redis;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for Redis Cache Management</name>
<description>This package contains Microsoft Azure Redis Cache SDK.</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>

<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>

<properties>
<!-- RMJacoco -->
<jacoco.min.linecoverage>0.10</jacoco.min.linecoverage>
<jacoco.min.branchcoverage>0.10</jacoco.min.branchcoverage>
</properties>

<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>

<dependencies>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.6.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.30</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.5.4</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-storage</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.6.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>azure-mgmt-sdk-test-jar</id>
<activation>
<property>
<name>!maven.test.skip</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-resources</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>

<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>
<excludes>
<exclude>com/azure/resourcemanager/**/fluent/**/*</exclude>
<exclude>com/azure/resourcemanager/**/models/**/*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit fb7b067

Please sign in to comment.