diff --git a/CHANGELOG.md b/CHANGELOG.md index c477a82c94..9153147053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [3.24.1](https://github.com/googleapis/java-firestore/compare/v3.24.0...v3.24.1) (2024-07-22) + + +### Dependencies + +* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v1.4.2 ([#1749](https://github.com/googleapis/java-firestore/issues/1749)) ([b20371a](https://github.com/googleapis/java-firestore/commit/b20371a62fa261b50a4522786d4f91a5fac01487)) +* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2 ([#1755](https://github.com/googleapis/java-firestore/issues/1755)) ([fb71213](https://github.com/googleapis/java-firestore/commit/fb712130e51327a71d0c90f6f3cda76398ec9e0a)) +* Update dependency com.google.cloud:google-cloud-trace to v2 ([#1756](https://github.com/googleapis/java-firestore/issues/1756)) ([f6989d8](https://github.com/googleapis/java-firestore/commit/f6989d89211849cd301e799406f59283b8162ea9)) +* Update dependency com.google.cloud.opentelemetry:exporter-trace to v0.31.0 ([#1750](https://github.com/googleapis/java-firestore/issues/1750)) ([7219bb3](https://github.com/googleapis/java-firestore/commit/7219bb3f0e98462faeb8d7e24f1aedad4cd2de15)) +* Update opentelemetry.version to v1.40.0 ([#1753](https://github.com/googleapis/java-firestore/issues/1753)) ([23ce20b](https://github.com/googleapis/java-firestore/commit/23ce20b08d8da195cf32036de4e73cee831225ef)) + ## [3.24.0](https://github.com/googleapis/java-firestore/compare/v3.23.1...v3.24.0) (2024-07-18) diff --git a/README.md b/README.md index 10d588aa47..35de18e5cb 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-firestore/tre | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | -| Native Image Firestore Sample | [source code](https://github.com/googleapis/java-firestore/blob/main/samples/native-image-sample/src/main/java/com/example/firestore/NativeImageFirestoreSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-firestore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/firestore/NativeImageFirestoreSample.java) | -| Person | [source code](https://github.com/googleapis/java-firestore/blob/main/samples/native-image-sample/src/main/java/com/example/firestore/Person.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-firestore&page=editor&open_in_editor=samples/native-image-sample/src/main/java/com/example/firestore/Person.java) | | Quickstart | [source code](https://github.com/googleapis/java-firestore/blob/main/samples/snippets/src/main/java/com/example/firestore/Quickstart.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-firestore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/firestore/Quickstart.java) | | Example Firestore Beam Read | [source code](https://github.com/googleapis/java-firestore/blob/main/samples/snippets/src/main/java/com/example/firestore/beam/ExampleFirestoreBeamRead.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-firestore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/firestore/beam/ExampleFirestoreBeamRead.java) | | Example Firestore Beam Write | [source code](https://github.com/googleapis/java-firestore/blob/main/samples/snippets/src/main/java/com/example/firestore/beam/ExampleFirestoreBeamWrite.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-firestore&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/firestore/beam/ExampleFirestoreBeamWrite.java) | diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml index 23b17602c7..48b6513947 100644 --- a/google-cloud-firestore-admin/pom.xml +++ b/google-cloud-firestore-admin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore-admin - 3.24.0 + 3.24.1 jar Google Cloud Firestore Admin Client https://github.com/googleapis/java-firestore @@ -14,7 +14,7 @@ com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index e1b96dd2d8..5dae179228 100644 --- a/google-cloud-firestore-bom/pom.xml +++ b/google-cloud-firestore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-firestore-bom - 3.24.0 + 3.24.1 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-firestore - 3.24.0 + 3.24.1 com.google.cloud google-cloud-firestore-admin - 3.24.0 + 3.24.1 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 3.24.0 + 3.24.1 diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 4b11ca0a9d..b9d0aae628 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-firestore - 3.24.0 + 3.24.1 jar Google Cloud Firestore https://github.com/googleapis/java-firestore @@ -12,11 +12,11 @@ com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 google-cloud-firestore - 1.38.0 + 1.40.0 @@ -214,7 +214,7 @@ com.google.cloud.opentelemetry exporter-trace - 0.15.0 + 0.31.0 test @@ -222,13 +222,13 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.3.0 + 2.46.0 test com.google.cloud.opentelemetry exporter-trace - 0.15.0 + 0.31.0 test @@ -236,13 +236,13 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.3.0 + 2.46.0 test com.google.cloud google-cloud-trace - 1.3.0 + 2.46.0 test diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java index 44a8376cdb..7a3c9fc856 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java @@ -75,6 +75,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; +import io.opentelemetry.sdk.trace.export.SpanExporter; import io.opentelemetry.sdk.trace.samplers.Sampler; import java.io.IOException; import java.util.ArrayList; @@ -245,7 +246,7 @@ private boolean dfsContainsCallStack(long spanId, List expectedCallStack // Random int generator for trace ID and span ID private static Random random; - private static TraceExporter traceExporter; + private static SpanExporter traceExporter; // Required for reading back traces from Cloud Trace for validation private static TraceServiceClient traceClient_v1; diff --git a/grpc-google-cloud-firestore-admin-v1/pom.xml b/grpc-google-cloud-firestore-admin-v1/pom.xml index bb6a745472..7182a197ef 100644 --- a/grpc-google-cloud-firestore-admin-v1/pom.xml +++ b/grpc-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 grpc-google-cloud-firestore-admin-v1 GRPC library for grpc-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/grpc-google-cloud-firestore-v1/pom.xml b/grpc-google-cloud-firestore-v1/pom.xml index bb5ec42507..a33c0274cf 100644 --- a/grpc-google-cloud-firestore-v1/pom.xml +++ b/grpc-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 grpc-google-cloud-firestore-v1 GRPC library for grpc-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/pom.xml b/pom.xml index 7f392dd0b0..5a9679adfe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-firestore-parent pom - 3.24.0 + 3.24.1 Google Cloud Firestore Parent https://github.com/googleapis/java-firestore @@ -150,32 +150,32 @@ com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 com.google.cloud google-cloud-firestore - 3.24.0 + 3.24.1 com.google.cloud proto-google-cloud-firestore-bundle-v1 - 3.24.0 + 3.24.1 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 com.google.api.grpc grpc-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 com.google.api.grpc grpc-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 diff --git a/proto-google-cloud-firestore-admin-v1/pom.xml b/proto-google-cloud-firestore-admin-v1/pom.xml index 0de523fa17..2427e866d9 100644 --- a/proto-google-cloud-firestore-admin-v1/pom.xml +++ b/proto-google-cloud-firestore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-admin-v1 - 3.24.0 + 3.24.1 proto-google-cloud-firestore-admin-v1 PROTO library for proto-google-cloud-firestore-admin-v1 com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/proto-google-cloud-firestore-bundle-v1/pom.xml b/proto-google-cloud-firestore-bundle-v1/pom.xml index f3727c1ee9..db7c4ff0b9 100644 --- a/proto-google-cloud-firestore-bundle-v1/pom.xml +++ b/proto-google-cloud-firestore-bundle-v1/pom.xml @@ -5,14 +5,14 @@ 4.0.0 proto-google-cloud-firestore-bundle-v1 - 3.24.0 + 3.24.1 proto-google-cloud-firestore-bundle-v1 PROTO library for proto-google-cloud-firestore-bundle-v1 com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/proto-google-cloud-firestore-v1/pom.xml b/proto-google-cloud-firestore-v1/pom.xml index 0a991ad02e..696b266d38 100644 --- a/proto-google-cloud-firestore-v1/pom.xml +++ b/proto-google-cloud-firestore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-firestore-v1 - 3.24.0 + 3.24.1 proto-google-cloud-firestore-v1 PROTO library for proto-google-cloud-firestore-v1 com.google.cloud google-cloud-firestore-parent - 3.24.0 + 3.24.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index c585bc34e1..ba73a4dda0 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-firestore - 3.23.1 + 3.24.0 diff --git a/samples/native-image-sample/README.md b/samples/native-image-sample/README.md deleted file mode 100644 index c6f60bcd10..0000000000 --- a/samples/native-image-sample/README.md +++ /dev/null @@ -1,95 +0,0 @@ -# Firestore Sample Application with Native Image - -This application uses the [Google Cloud Firestore client libraries](https://cloud.google.com/firestore/docs/quickstart-servers#java) and is compatible with Native Image compilation. - -This sample runs through basic operations of creating a new document, running queries, and then deleting the created resources. - -## Setup Instructions - -You will need to follow these prerequisite steps in order to run the samples: - -1. If you have not already, [create a Google Cloud Platform Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project). - -2. Install the [Google Cloud SDK](https://cloud.google.com/sdk/) which will allow you to run the sample with your project's credentials. - - Once installed, log in with Application Default Credentials using the following command: - - ``` - gcloud auth application-default login - ``` - - **Note:** Authenticating with Application Default Credentials is convenient to use during development, but we recommend [alternate methods of authentication](https://cloud.google.com/docs/authentication/production) during production use. - -3. Install the GraalVM compiler. - - You can follow the [official installation instructions](https://www.graalvm.org/docs/getting-started/#install-graalvm) from the GraalVM website. - After following the instructions, ensure that you install the native image extension installed by running: - - ``` - gu install native-image - ``` - - Once you finish following the instructions, verify that the default version of Java is set to the GraalVM version by running `java -version` in a terminal. - - You will see something similar to the below output: - - ``` - $ java -version - - openjdk version "11.0.7" 2020-04-14 - OpenJDK Runtime Environment GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02) - OpenJDK 64-Bit Server VM GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02, mixed mode, sharing) - ``` - -## Sample - -1. If you wish to run the application against the [Firestore emulator](https://cloud.google.com/sdk/gcloud/reference/beta/emulators/firestore), make sure that you have the [Google Cloud SDK](https://cloud.google.com/sdk) installed. - - In a new terminal window, start the emulator via `gcloud`: - - ``` - gcloud beta emulators firestore start --host-port=localhost:9010 - ``` - - Leave the emulator running in this terminal for now. - In the next section, we will run the sample application against the Firestore emulator instance. - - -2. Navigate to this directory and compile the application with the Native Image compiler. - - ``` - mvn package -P native -DskipTests - ``` - -3. **(Optional)** If you're using the emulator, export the `FIRESTORE_EMULATOR_HOST` as an environment variable in your terminal. - - ``` - export FIRESTORE_EMULATOR_HOST=localhost:9010 - ``` - - The Firestore Client Libraries will detect this environment variable and automatically connect to the emulator instance if this variable is set. - -4. Run the application. - - ``` - ./target/native-image-sample - ``` - -5. The application will run through some basic Firestore operations and log some output statements. - - ``` - Created user alovelace. Timestamp: 2020-12-15T20:19:28.444070000Z - The following users were saved: - Document: alovelace | Ada Lovelace born 1815 - Number of users born before 1900: 1 - Number of users born earlier after 1900: 0 - Number of users whose first name is 'Ada': 0 - ``` - -## Sample Integration test with Native Image Support - -In order to run the sample integration test as a native image, call the following command: - - ``` - mvn test -Pnative - ``` \ No newline at end of file diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml deleted file mode 100644 index da4cca7c6f..0000000000 --- a/samples/native-image-sample/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - 4.0.0 - com.example.firestore - native-image-sample - Native Image Sample - https://github.com/googleapis/java-firestore - - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - - 1.8 - 1.8 - 2.57.0 - UTF-8 - - - - - - com.google.cloud - libraries-bom - 26.43.0 - pom - import - - - - - - - com.google.cloud - google-cloud-firestore - - - - - org.apache.beam - beam-runners-direct-java - ${beam.version} - - - org.apache.beam - beam-runners-google-cloud-dataflow-java - ${beam.version} - - - - junit - junit - 4.13.2 - test - - - com.google.truth - truth - 1.4.4 - test - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - com.example.firestore.NativeImageFirestoreSample - - - - - - - - - - - native - - - - org.junit.vintage - junit-vintage-engine - 5.10.3 - test - - - org.graalvm.buildtools - junit-platform-native - 0.10.2 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - 3.3.1 - - - **/IT* - - - - - org.graalvm.buildtools - native-maven-plugin - 0.10.2 - true - - com.example.firestore.NativeImageFirestoreSample - - --no-fallback - --no-server - - - - - build-native - - build - test - - package - - - test-native - - test - - test - - - - - - - - \ No newline at end of file diff --git a/samples/native-image-sample/src/main/java/com/example/firestore/NativeImageFirestoreSample.java b/samples/native-image-sample/src/main/java/com/example/firestore/NativeImageFirestoreSample.java deleted file mode 100644 index a2917b5331..0000000000 --- a/samples/native-image-sample/src/main/java/com/example/firestore/NativeImageFirestoreSample.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright 2020-2021 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. - */ - -package com.example.firestore; - -import com.google.api.core.ApiFuture; -import com.google.cloud.firestore.CollectionReference; -import com.google.cloud.firestore.DocumentReference; -import com.google.cloud.firestore.FieldPath; -import com.google.cloud.firestore.Firestore; -import com.google.cloud.firestore.FirestoreOptions; -import com.google.cloud.firestore.Query; -import com.google.cloud.firestore.QueryDocumentSnapshot; -import com.google.cloud.firestore.QuerySnapshot; -import com.google.cloud.firestore.WriteResult; -import java.time.Duration; -import java.time.Instant; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** Sample Firestore application demonstrating basic operations. */ -public class NativeImageFirestoreSample { - - private static final String USERS_COLLECTION = "nativeimage_test_users"; - - /** Entrypoint to the Firestore sample application. */ - public static void main(String[] args) throws Exception { - Instant startTime = Instant.now(); - FirestoreOptions firestoreOptions = FirestoreOptions.getDefaultInstance(); - Firestore db = firestoreOptions.getService(); - - deleteCollection(db); - createUserDocument(db); - createUserDocumentPojo(db); - readDocuments(db); - runSampleQueries(db); - Instant endTime = Instant.now(); - Duration duration = Duration.between(startTime, endTime); - System.out.println("Duration: " + duration.toString()); - } - - static void deleteCollection(Firestore db) throws Exception { - Iterable documents = db.collection(USERS_COLLECTION).listDocuments(); - for (DocumentReference doc : documents) { - doc.delete().get(); - } - } - - static void createUserDocument(Firestore db) throws Exception { - DocumentReference docRef = db.collection(USERS_COLLECTION).document("alovelace"); - Map data = new HashMap<>(); - data.put("id", "10"); - data.put("first", "Ada"); - data.put("last", "Lovelace"); - data.put("born", 1815); - - WriteResult result = docRef.set(data).get(); - System.out.println("Created user " + docRef.getId() + ". Timestamp: " + result.getUpdateTime()); - } - - static void createUserDocumentPojo(Firestore db) throws Exception { - CollectionReference collectionReference = db.collection(USERS_COLLECTION); - WriteResult result = - collectionReference.document().set(new Person("Alan", "Turing", 1912)).get(); - - System.out.println("Created user by POJO. Timestamp: " + result.getUpdateTime()); - } - - static void readDocuments(Firestore db) throws Exception { - ApiFuture query = db.collection(USERS_COLLECTION).get(); - QuerySnapshot querySnapshot = query.get(); - List documents = querySnapshot.getDocuments(); - System.out.println("The following users were saved:"); - printUsers(documents); - } - - static void runSampleQueries(Firestore db) throws Exception { - List results = - runQuery(db.collection(USERS_COLLECTION).whereLessThan("born", 1900)); - System.out.println("Number of users born before 1900: " + results.size()); - - results = - runQuery(db.collection(USERS_COLLECTION).whereGreaterThan(FieldPath.of("born"), 1900)); - System.out.println("Number of users born earlier after 1900: " + results.size()); - - results = runQuery(db.collection(USERS_COLLECTION).whereEqualTo("name", "Ada")); - System.out.println("Number of users whose first name is 'Ada': " + results.size()); - } - - private static List runQuery(Query query) throws Exception { - QuerySnapshot querySnapshot = query.get().get(); - List documents = querySnapshot.getDocuments(); - return documents; - } - - private static void printUsers(Iterable documents) { - for (QueryDocumentSnapshot document : documents) { - System.out.printf( - "Document: %s | %s %s born %d\n", - document.getId(), - document.getString("first"), - document.getString("last"), - document.getLong("born")); - } - } -} diff --git a/samples/native-image-sample/src/main/java/com/example/firestore/Person.java b/samples/native-image-sample/src/main/java/com/example/firestore/Person.java deleted file mode 100644 index 63ce64714e..0000000000 --- a/samples/native-image-sample/src/main/java/com/example/firestore/Person.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2020-2021 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. - */ - -package com.example.firestore; - -import com.google.cloud.firestore.annotation.DocumentId; - -/** Simple document object to load into Firestore. */ -public class Person { - - @DocumentId public String id; - - public String first; - - public String last; - - public int born; - - Person(String first, String last, int born) { - this.first = first; - this.last = last; - this.born = born; - } -} diff --git a/samples/native-image-sample/src/main/resources/META-INF/native-image/reflect-config.json b/samples/native-image-sample/src/main/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index 5283155c60..0000000000 --- a/samples/native-image-sample/src/main/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "name" : "com.example.firestore.Person", - "allDeclaredConstructors" : true, - "allDeclaredMethods" : true, - "allDeclaredFields" : true - } -] \ No newline at end of file diff --git a/samples/native-image-sample/src/test/java/com/example/firestore/ITNativeImageFirestoreSample.java b/samples/native-image-sample/src/test/java/com/example/firestore/ITNativeImageFirestoreSample.java deleted file mode 100644 index 7ffb5517fd..0000000000 --- a/samples/native-image-sample/src/test/java/com/example/firestore/ITNativeImageFirestoreSample.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2022 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. - */ - -package com.example.firestore; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.cloud.firestore.Firestore; -import com.google.cloud.firestore.FirestoreOptions; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import org.junit.Before; -import org.junit.Test; - -public class ITNativeImageFirestoreSample { - - private ByteArrayOutputStream bout; - private PrintStream out; - private Firestore database; - - @Before - public void setUp() throws Exception { - FirestoreOptions firestoreOptions = FirestoreOptions.getDefaultInstance(); - database = firestoreOptions.getService(); - - NativeImageFirestoreSample.deleteCollection(database); - NativeImageFirestoreSample.createUserDocument(database); - - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); - } - - @Test - public void testReadDocument() throws Exception { - bout.reset(); - NativeImageFirestoreSample.readDocuments(database); - String output = bout.toString(); - assertThat(output).contains("Document: alovelace | Ada Lovelace born 1815"); - } - - @Test - public void testRunSampleQueries() throws Exception { - bout.reset(); - NativeImageFirestoreSample.runSampleQueries(database); - String output = bout.toString(); - assertThat(output).contains("Number of users born before 1900: 1"); - assertThat(output).contains("Number of users born earlier after 1900: 0"); - assertThat(output).contains("Number of users whose first name is 'Ada': 0"); - } -} diff --git a/samples/pom.xml b/samples/pom.xml index 4ef6cd2b8c..d9c181bf74 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -31,7 +31,6 @@ install-without-bom snapshot snippets - native-image-sample diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5a6265ab5c..d60f4fdf6f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-firestore - 3.23.1 + 3.24.0 diff --git a/versions.txt b/versions.txt index 481da1ebb6..61a4f036ff 100644 --- a/versions.txt +++ b/versions.txt @@ -1,11 +1,11 @@ # Format: # module:released-version:current-version -google-cloud-firestore:3.24.0:3.24.0 -google-cloud-firestore-admin:3.24.0:3.24.0 -google-cloud-firestore-bom:3.24.0:3.24.0 -grpc-google-cloud-firestore-admin-v1:3.24.0:3.24.0 -grpc-google-cloud-firestore-v1:3.24.0:3.24.0 -proto-google-cloud-firestore-admin-v1:3.24.0:3.24.0 -proto-google-cloud-firestore-v1:3.24.0:3.24.0 -proto-google-cloud-firestore-bundle-v1:3.24.0:3.24.0 +google-cloud-firestore:3.24.1:3.24.1 +google-cloud-firestore-admin:3.24.1:3.24.1 +google-cloud-firestore-bom:3.24.1:3.24.1 +grpc-google-cloud-firestore-admin-v1:3.24.1:3.24.1 +grpc-google-cloud-firestore-v1:3.24.1:3.24.1 +proto-google-cloud-firestore-admin-v1:3.24.1:3.24.1 +proto-google-cloud-firestore-v1:3.24.1:3.24.1 +proto-google-cloud-firestore-bundle-v1:3.24.1:3.24.1