Skip to content

Commit

Permalink
chore!: move FirestoreAdminClient and associated classes to new artif…
Browse files Browse the repository at this point in the history
…act google-cloud-firestore-admin (#311)

* All classes are retained in the new artifact
* New version defined in versions.txt for new artifact
  * For now, version number is set to be the same as google-cloud-firestore
  • Loading branch information
BenWhitehead committed Jul 28, 2020
1 parent 96adacb commit 03ef755
Show file tree
Hide file tree
Showing 18 changed files with 208 additions and 258 deletions.
144 changes: 144 additions & 0 deletions google-cloud-firestore-admin/pom.xml
@@ -0,0 +1,144 @@
<?xml version="1.0"?>
<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>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>1.35.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<packaging>jar</packaging>
<name>Google Cloud Firestore Admin Client</name>
<url>https://github.com/googleapis/java-firestore/tree/master
</url>
<description>
Java idiomatic client for Google Cloud Firestore Admin API.
</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>1.35.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
</parent>
<dependencies>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>


<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- Need testing utility classes for generated gRPC clients tests -->
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<show>protected</show>
<nohelp>true</nohelp>
<doclint>none</doclint>
<splitindex>true</splitindex>
<offlineLinks>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/proto-google-cloud-firestore-admin-v1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/grpc-google-cloud-firestore-admin-v1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/proto-google-cloud-firestore-v1/target/site/apidocs/</location>
</offlineLink>
<offlineLink>
<url>${project.javadoc.protobufBaseURL}</url>
<location>../../../../../google-api-grpc/grpc-google-cloud-firestore-v1/target/site/apidocs/</location>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</reporting>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
@@ -0,0 +1,41 @@
/*
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A client to Google Cloud Firestore Admin API.
*
* <p>The interfaces provided are listed below, along with usage samples.
*
* <p>==================== FirestoreAdminClient ====================
*
* <p>Service Description: Operations are created by service `FirestoreAdmin`, but are accessed via
* service `google.longrunning.Operations`.
*
* <p>Sample for FirestoreAdminClient:
*
* <pre>
* <code>
* try (FirestoreAdminClient firestoreAdminClient = FirestoreAdminClient.create()) {
* IndexName name = IndexName.of("[PROJECT]", "[DATABASE]", "[COLLECTION]", "[INDEX]");
* firestoreAdminClient.deleteIndex(name);
* }
* </code>
* </pre>
*/
@Generated("by gapic-generator")
package com.google.cloud.firestore.v1;

import javax.annotation.Generated;
5 changes: 5 additions & 0 deletions google-cloud-firestore-bom/pom.xml
Expand Up @@ -85,6 +85,11 @@
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>1.35.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>1.35.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
9 changes: 9 additions & 0 deletions google-cloud-firestore/clirr-ignored-differences.xml
Expand Up @@ -133,4 +133,13 @@
<to>com.google.cloud.firestore.v1.FirestoreAdminClient$List*PagedResponse list*(com.google.firestore.admin.v1.CollectionGroupName)</to>
</difference>

<!--
Admin client migrated to com.google.cloud:google-cloud-firestore-admin artifact.
-->
<difference>
<differenceType>8001</differenceType>
<className>com/google/cloud/firestore/v1/**/*FirestoreAdmin*</className>
<to>*</to>
</difference>

</differences>
9 changes: 0 additions & 9 deletions google-cloud-firestore/pom.xml
Expand Up @@ -25,10 +25,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
Expand All @@ -37,11 +33,6 @@
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -211,6 +211,7 @@
<module>proto-google-cloud-firestore-v1</module>
<module>grpc-google-cloud-firestore-admin-v1</module>
<module>grpc-google-cloud-firestore-v1</module>
<module>google-cloud-firestore-admin</module>
<module>google-cloud-firestore</module>
<module>google-cloud-firestore-bom</module>
</modules>
Expand Down

0 comments on commit 03ef755

Please sign in to comment.