Skip to content

Commit d6275a7

Browse files
yoshi-automationkolea2
authored andcommitted
docs: synth updates to javadoc and kokoro build configs
1 parent f92da32 commit d6275a7

File tree

171 files changed

+5757
-981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+5757
-981
lines changed

.github/release-please.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
releaseType: java-yoshi
2+
bumpMinorPreMajor: true

.kokoro/build.sh

+24-5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ echo ${JOB_TYPE}
2727
mvn install -B -V \
2828
-DskipTests=true \
2929
-Dclirr.skip=true \
30+
-Denforcer.skip=true \
3031
-Dmaven.javadoc.skip=true \
3132
-Dgcloud.download.skip=true \
3233
-T 1C
@@ -38,23 +39,41 @@ fi
3839

3940
case ${JOB_TYPE} in
4041
test)
41-
mvn test -B -Dclirr.skip=true
42+
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
4243
bash ${KOKORO_GFILE_DIR}/codecov.sh
4344
bash .kokoro/coerce_logs.sh
4445
;;
4546
lint)
46-
mvn com.coveo:fmt-maven-plugin:check
47+
mvn \
48+
-Penable-samples \
49+
com.coveo:fmt-maven-plugin:check
4750
;;
4851
javadoc)
4952
mvn javadoc:javadoc javadoc:test-javadoc
5053
;;
5154
integration)
52-
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
55+
mvn -B ${INTEGRATION_TEST_ARGS} \
56+
-Penable-integration-tests \
57+
-DtrimStackTrace=false \
58+
-Dclirr.skip=true \
59+
-Denforcer.skip=true \
60+
-fae \
61+
verify
62+
bash .kokoro/coerce_logs.sh
63+
;;
64+
samples)
65+
mvn -B \
66+
-Penable-samples \
67+
-DtrimStackTrace=false \
68+
-Dclirr.skip=true \
69+
-Denforcer.skip=true \
70+
-fae \
71+
verify
5372
bash .kokoro/coerce_logs.sh
5473
;;
5574
clirr)
56-
mvn -B clirr:check
75+
mvn -B -Denforcer.skip=true clirr:check
5776
;;
5877
*)
5978
;;
60-
esac
79+
esac

.kokoro/continuous/samples.cfg

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
19+
env_vars: {
20+
key: "GOOGLE_APPLICATION_CREDENTIALS"
21+
value: "keystore/73713_java_it_service_account"
22+
}
23+
24+
before_action {
25+
fetch_keystore {
26+
keystore_resource {
27+
keystore_config_id: 73713
28+
keyname: "java_it_service_account"
29+
}
30+
}
31+
}

.kokoro/dependencies.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@ echo $JOB_TYPE
2323

2424
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
2525

26-
mvn install -DskipTests=true -B -V
26+
# this should run maven enforcer
27+
mvn install -B -V \
28+
-DskipTests=true \
29+
-Dclirr.skip=true
30+
2731
mvn -B dependency:analyze -DfailOnWarning=true

.kokoro/nightly/samples.cfg

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
19+
env_vars: {
20+
key: "GOOGLE_APPLICATION_CREDENTIALS"
21+
value: "keystore/73713_java_it_service_account"
22+
}
23+
24+
before_action {
25+
fetch_keystore {
26+
keystore_resource {
27+
keystore_config_id: 73713
28+
keyname: "java_it_service_account"
29+
}
30+
}
31+
}

.kokoro/presubmit/samples.cfg

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "samples"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
19+
env_vars: {
20+
key: "GOOGLE_APPLICATION_CREDENTIALS"
21+
value: "keystore/73713_java_it_service_account"
22+
}
23+
24+
before_action {
25+
fetch_keystore {
26+
keystore_resource {
27+
keystore_config_id: 73713
28+
keyname: "java_it_service_account"
29+
}
30+
}
31+
}

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,8 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
11541154

11551155
// AUTO-GENERATED DOCUMENTATION AND METHOD
11561156
/**
1157-
* Gets the access control policy for an instance resource. Returns an empty policy if an table
1158-
* exists but does not have a policy set.
1157+
* Gets the access control policy for a table resource. Returns an empty policy if an table exists
1158+
* but does not have a policy set.
11591159
*
11601160
* <p>Sample code:
11611161
*
@@ -1178,8 +1178,8 @@ public final Policy getIamPolicy(String resource) {
11781178

11791179
// AUTO-GENERATED DOCUMENTATION AND METHOD
11801180
/**
1181-
* Gets the access control policy for an instance resource. Returns an empty policy if an table
1182-
* exists but does not have a policy set.
1181+
* Gets the access control policy for a table resource. Returns an empty policy if an table exists
1182+
* but does not have a policy set.
11831183
*
11841184
* <p>Sample code:
11851185
*
@@ -1202,8 +1202,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
12021202

12031203
// AUTO-GENERATED DOCUMENTATION AND METHOD
12041204
/**
1205-
* Gets the access control policy for an instance resource. Returns an empty policy if an table
1206-
* exists but does not have a policy set.
1205+
* Gets the access control policy for a table resource. Returns an empty policy if an table exists
1206+
* but does not have a policy set.
12071207
*
12081208
* <p>Sample code:
12091209
*

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import java.util.HashMap;
7171
import java.util.List;
7272
import java.util.Map;
73+
import java.util.UUID;
7374
import java.util.concurrent.ExecutionException;
7475
import org.junit.After;
7576
import org.junit.AfterClass;
@@ -92,7 +93,7 @@ public static void startStaticServer() {
9293
mockBigtableTableAdmin = new MockBigtableTableAdmin();
9394
serviceHelper =
9495
new MockServiceHelper(
95-
"in-process-1",
96+
UUID.randomUUID().toString(),
9697
Arrays.<MockGrpcService>asList(mockBigtableInstanceAdmin, mockBigtableTableAdmin));
9798
serviceHelper.start();
9899
}

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import java.util.ArrayList;
6666
import java.util.Arrays;
6767
import java.util.List;
68+
import java.util.UUID;
6869
import java.util.concurrent.ExecutionException;
6970
import org.junit.After;
7071
import org.junit.AfterClass;
@@ -87,7 +88,7 @@ public static void startStaticServer() {
8788
mockBigtableTableAdmin = new MockBigtableTableAdmin();
8889
serviceHelper =
8990
new MockServiceHelper(
90-
"in-process-1",
91+
UUID.randomUUID().toString(),
9192
Arrays.<MockGrpcService>asList(mockBigtableInstanceAdmin, mockBigtableTableAdmin));
9293
serviceHelper.start();
9394
}

grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ public void deleteSnapshot(
11671167
*
11681168
*
11691169
* <pre>
1170-
* Gets the access control policy for an instance resource. Returns an empty
1170+
* Gets the access control policy for a table resource. Returns an empty
11711171
* policy if an table exists but does not have a policy set.
11721172
* </pre>
11731173
*/
@@ -1592,7 +1592,7 @@ public void deleteSnapshot(
15921592
*
15931593
*
15941594
* <pre>
1595-
* Gets the access control policy for an instance resource. Returns an empty
1595+
* Gets the access control policy for a table resource. Returns an empty
15961596
* policy if an table exists but does not have a policy set.
15971597
* </pre>
15981598
*/
@@ -1877,7 +1877,7 @@ public com.google.protobuf.Empty deleteSnapshot(
18771877
*
18781878
*
18791879
* <pre>
1880-
* Gets the access control policy for an instance resource. Returns an empty
1880+
* Gets the access control policy for a table resource. Returns an empty
18811881
* policy if an table exists but does not have a policy set.
18821882
* </pre>
18831883
*/
@@ -2158,7 +2158,7 @@ protected BigtableTableAdminFutureStub build(
21582158
*
21592159
*
21602160
* <pre>
2161-
* Gets the access control policy for an instance resource. Returns an empty
2161+
* Gets the access control policy for a table resource. Returns an empty
21622162
* policy if an table exists but does not have a policy set.
21632163
* </pre>
21642164
*/

0 commit comments

Comments
 (0)