Skip to content

Commit 93dacde

Browse files
kurtisvgkurtisvg
authored
Update KMS, Language, and Logging folders. (GoogleCloudPlatform#990)
* Updated kms/. * Updated language/ * Updated logging/ * Resolve project conflict between logging and error reporting. * Fixed missing checkstyle violoations.
1 parent 481fe97 commit 93dacde

File tree

32 files changed

+284
-226
lines changed

32 files changed

+284
-226
lines changed

‎errorreporting/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ limitations under the License.
1616
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
19-
<groupId>com.google.cloud.logging.samples</groupId>
20-
<artifactId>cloud-logging-samples</artifactId>
19+
<groupId>com.google.cloud.errorreporting.samples</groupId>
20+
<artifactId>cloud-errorreporting-samples</artifactId>
2121
<packaging>pom</packaging>
2222

2323
<!--

‎kms/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Cloud Key Management Service
22

3+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=kms/README.md">
4+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
5+
36
Google [Cloud Key Management Service](https://cloud.google.com/kms/) is a
47
cloud-hosted key management service that lets you manage encryption for your
58
cloud services the same way you do on-premise. You can generate, use, rotate and

‎kms/pom.xml

+13-10
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,22 @@
55
<artifactId>kms-samples</artifactId>
66
<packaging>jar</packaging>
77

8+
<!--
9+
The parent pom defines common style checks and testing strategies for our samples.
10+
Removing or replacing it should not affect the execution of the samples in anyway.
11+
-->
812
<parent>
9-
<artifactId>doc-samples</artifactId>
10-
<groupId>com.google.cloud</groupId>
11-
<version>1.0.0</version>
12-
<relativePath>..</relativePath>
13+
<groupId>com.google.cloud.samples</groupId>
14+
<artifactId>shared-configuration</artifactId>
15+
<version>1.0.8</version>
1316
</parent>
1417

18+
<properties>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<maven.compiler.target>1.8</maven.compiler.target>
21+
<maven.compiler.source>1.8</maven.compiler.source>
22+
</properties>
23+
1524
<dependencies>
1625
<dependency>
1726
<groupId>com.google.apis</groupId>
@@ -60,12 +69,6 @@
6069
</dependency>
6170
</dependencies>
6271

63-
<properties>
64-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65-
<maven.compiler.source>1.7</maven.compiler.source>
66-
<maven.compiler.target>1.7</maven.compiler.target>
67-
</properties>
68-
6972
<build>
7073
<sourceDirectory>src/main/java</sourceDirectory>
7174
<plugins>

‎kms/src/main/java/com/example/CryptFile.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;
@@ -25,12 +27,10 @@
2527
import com.google.api.services.cloudkms.v1.model.DecryptResponse;
2628
import com.google.api.services.cloudkms.v1.model.EncryptRequest;
2729
import com.google.api.services.cloudkms.v1.model.EncryptResponse;
28-
30+
import java.io.IOException;
2931
import org.kohsuke.args4j.CmdLineException;
3032
import org.kohsuke.args4j.CmdLineParser;
3133

32-
import java.io.IOException;
33-
3434
public class CryptFile {
3535

3636
/**

‎kms/src/main/java/com/example/CryptFileCommands.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;
1618

19+
import java.io.FileOutputStream;
20+
import java.io.IOException;
21+
import java.nio.file.Files;
22+
import java.nio.file.Paths;
1723
import org.kohsuke.args4j.Argument;
1824
import org.kohsuke.args4j.Option;
1925
import org.kohsuke.args4j.spi.SubCommand;
2026
import org.kohsuke.args4j.spi.SubCommandHandler;
2127
import org.kohsuke.args4j.spi.SubCommands;
2228

23-
import java.nio.file.Files;
24-
import java.nio.file.Paths;
25-
26-
import java.io.FileOutputStream;
27-
import java.io.IOException;
28-
2929
/**
3030
* Defines the different sub-commands and their parameters, for command-line invocation.
3131
*/

‎kms/src/main/java/com/example/Quickstart.java

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
/*
2-
Copyright 2016, Google, Inc.
3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
6-
http://www.apache.org/licenses/LICENSE-2.0
7-
Unless required by applicable law or agreed to in writing, software
8-
distributed under the License is distributed on an "AS IS" BASIS,
9-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10-
See the License for the specific language governing permissions and
11-
limitations under the License.
12-
*/
2+
* Copyright 2017 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1316

1417
package com.example;
1518

1619
// [START kms_quickstart]
1720
// Imports the Google Cloud client library
21+
1822
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
1923
import com.google.api.client.http.HttpTransport;
2024
import com.google.api.client.http.javanet.NetHttpTransport;
@@ -24,7 +28,6 @@
2428
import com.google.api.services.cloudkms.v1.CloudKMSScopes;
2529
import com.google.api.services.cloudkms.v1.model.KeyRing;
2630
import com.google.api.services.cloudkms.v1.model.ListKeyRingsResponse;
27-
2831
import java.io.IOException;
2932

3033
public class Quickstart {

‎kms/src/main/java/com/example/SnippetCommands.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;
1618

19+
import java.io.IOException;
1720
import org.kohsuke.args4j.Argument;
1821
import org.kohsuke.args4j.Option;
1922
import org.kohsuke.args4j.spi.SubCommand;
2023
import org.kohsuke.args4j.spi.SubCommandHandler;
2124
import org.kohsuke.args4j.spi.SubCommands;
2225

23-
import java.io.IOException;
24-
2526
/**
2627
* Defines the different sub-commands and their parameters, for command-line invocation.
2728
*/

‎kms/src/main/java/com/example/Snippets.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;
@@ -20,18 +22,17 @@
2022
import com.google.api.client.json.JsonFactory;
2123
import com.google.api.client.json.jackson2.JacksonFactory;
2224
import com.google.api.services.cloudkms.v1.CloudKMS;
23-
import com.google.api.services.cloudkms.v1.CloudKMS.Projects.Locations.KeyRings.CryptoKeys.UpdatePrimaryVersion;
2425
import com.google.api.services.cloudkms.v1.CloudKMSScopes;
2526
import com.google.api.services.cloudkms.v1.model.Binding;
2627
import com.google.api.services.cloudkms.v1.model.CryptoKey;
2728
import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion;
2829
import com.google.api.services.cloudkms.v1.model.DestroyCryptoKeyVersionRequest;
29-
import com.google.api.services.cloudkms.v1.model.RestoreCryptoKeyVersionRequest;
3030
import com.google.api.services.cloudkms.v1.model.KeyRing;
3131
import com.google.api.services.cloudkms.v1.model.ListCryptoKeyVersionsResponse;
3232
import com.google.api.services.cloudkms.v1.model.ListCryptoKeysResponse;
3333
import com.google.api.services.cloudkms.v1.model.ListKeyRingsResponse;
3434
import com.google.api.services.cloudkms.v1.model.Policy;
35+
import com.google.api.services.cloudkms.v1.model.RestoreCryptoKeyVersionRequest;
3536
import com.google.api.services.cloudkms.v1.model.SetIamPolicyRequest;
3637
import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest;
3738
import java.io.IOException;
@@ -179,8 +180,7 @@ public static CryptoKeyVersion disableCryptoKeyVersion(
179180
}
180181
// [END kms_disable_cryptokey_version]
181182

182-
// [START kms_enable_cryptokey_version]
183-
183+
// [START kms_enable_cryptokey_version]
184184
/**
185185
* Enables the given version of the crypto key.
186186
*/
@@ -563,7 +563,7 @@ public static void listCryptoKeys(String projectId, String locationId, String ke
563563
for (CryptoKey key : cryptoKeys.getCryptoKeys()) {
564564
System.out.println(key);
565565
}
566-
} while(cryptoKeys.getNextPageToken() != null);
566+
} while (cryptoKeys.getNextPageToken() != null);
567567
}
568568

569569
/**

‎kms/src/test/java/com/example/QuickstartIT.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;
1618

1719
import static com.google.common.truth.Truth.assertThat;
1820

21+
import java.io.ByteArrayOutputStream;
22+
import java.io.PrintStream;
1923
import org.junit.AfterClass;
2024
import org.junit.Before;
2125
import org.junit.BeforeClass;
2226
import org.junit.Test;
2327
import org.junit.runner.RunWith;
2428
import org.junit.runners.JUnit4;
2529

26-
import java.io.ByteArrayOutputStream;
27-
import java.io.PrintStream;
28-
2930
/**
3031
* Integration (system) tests for {@link Quickstart}.
3132
*/

‎kms/src/test/java/com/example/SnippetsIT.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
/*
2-
* Copyright (c) 2017 Google Inc.
2+
* Copyright 2017 Google Inc.
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
* in compliance with the License. You may obtain a copy of the License at
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
67
*
78
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* Unless required by applicable law or agreed to in writing, software distributed under the License
10-
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11-
* or implied. See the License for the specific language governing permissions and limitations under
12-
* the License.
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1315
*/
1416

1517
package com.example;

‎language/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Google Cloud Natural Language API Samples
22

3+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=language/README.md">
4+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
5+
36
These samples demonstrate the use of the [Google Cloud Natural Language API][NL-Docs].
47

58
[NL-Docs]: https://cloud.google.com/natural-language/docs/

‎language/analysis/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Google Cloud Natural Language API Entity Recognition Sample
22

3+
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=language/analysis/README.md">
4+
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
5+
6+
37
This sample demonstrates the use of the [Google Cloud Natural Language API][NL-Docs]
48
for entity recognition.
59

0 commit comments

Comments
 (0)