Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into exists_method_instanceAdmin
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Bernstein committed Nov 7, 2018
2 parents 81e95bc + 28fab80 commit 8e6d2fa
Show file tree
Hide file tree
Showing 142 changed files with 49,543 additions and 1,441 deletions.
44 changes: 22 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,25 @@ Besides adding client libraries, the plugins provide additional functionality, s

These client libraries can be used on App Engine standard for Java 8 runtime and App Engine flexible (including the Compat runtime). Most of the libraries do not work on the App Engine standard for Java 7 runtime. However, Datastore, Storage, and Bigquery should work.

If you are running into problems with version conflicts, see [Version Management](#version-management).
If you are running into problems with version conflicts, the easiest way to solve the conflicts is to use google-cloud's BOM. In Maven, add the following to your POM:

[//]: # ({x-version-update-start:google-cloud-bom:released})
```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bom</artifactId>
<version>0.57.0-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
```
[//]: # ({x-version-update-end})

Note that the BOM is only available starting at version 0.32.0-alpha. For prior versions, refer to [Old Version Combinations](#old-version-combinations) to make sure that your versions are compatible.

Specifying a Project ID
-----------------------
Expand Down Expand Up @@ -284,29 +302,11 @@ a higher priority.
are more likely to get backwards-incompatible updates. Additionally, it's possible for Alpha
libraries to get deprecated and deleted before ever being promoted to Beta or GA.

Version Management
Old Version Combinations
------------------

The easiest way to solve version conflicts is to use google-cloud's BOM. In Maven, add the following to your POM:
[//]: # ({x-version-update-start:google-cloud-bom:released})
```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bom</artifactId>
<version>0.69.0-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
```
[//]: # ({x-version-update-end})
This BOM is only available starting at version 0.32.0-alpha. If you are having problems with prior versions of
google-cloud, use the following table as a reference to make sure that your versions are compatible. Definitions:
If you are having compatbility problems with google-cloud prior to version 0.32.0-alpha, use the
following table as a reference to make sure that your versions are compatible. Definitions:

* **alpha**: The version of any alpha package in google-cloud
* **beta**: The version of any beta package in google-cloud
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
/*
* Copyright 2018 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
*
* http://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.google.privacy.dlp.v2;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.api.pathtemplate.PathTemplate;
import com.google.api.resourcenames.ResourceName;
import java.util.Map;
import java.util.ArrayList;
import java.util.List;

// AUTO-GENERATED DOCUMENTATION AND CLASS
@javax.annotation.Generated("by GAPIC protoc plugin")
public class OrganizationStoredInfoTypeName extends StoredInfoTypeName {

private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("organizations/{organization}/storedInfoTypes/{stored_info_type}");

private volatile Map<String, String> fieldValuesMap;

private final String organization;
private final String storedInfoType;

public String getOrganization() {
return organization;
}

public String getStoredInfoType() {
return storedInfoType;
}

public static Builder newBuilder() {
return new Builder();
}

public Builder toBuilder() {
return new Builder(this);
}

private OrganizationStoredInfoTypeName(Builder builder) {
organization = Preconditions.checkNotNull(builder.getOrganization());
storedInfoType = Preconditions.checkNotNull(builder.getStoredInfoType());
}

public static OrganizationStoredInfoTypeName of(String organization, String storedInfoType) {
return newBuilder()
.setOrganization(organization)
.setStoredInfoType(storedInfoType)
.build();
}

public static String format(String organization, String storedInfoType) {
return newBuilder()
.setOrganization(organization)
.setStoredInfoType(storedInfoType)
.build()
.toString();
}

public static OrganizationStoredInfoTypeName parse(String formattedString) {
if (formattedString.isEmpty()) {
return null;
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(formattedString, "OrganizationStoredInfoTypeName.parse: formattedString not in valid format");
return of(matchMap.get("organization"), matchMap.get("stored_info_type"));
}

public static List<OrganizationStoredInfoTypeName> parseList(List<String> formattedStrings) {
List<OrganizationStoredInfoTypeName> list = new ArrayList<>(formattedStrings.size());
for (String formattedString : formattedStrings) {
list.add(parse(formattedString));
}
return list;
}

public static List<String> toStringList(List<OrganizationStoredInfoTypeName> values) {
List<String> list = new ArrayList<String>(values.size());
for (OrganizationStoredInfoTypeName value : values) {
if (value == null) {
list.add("");
} else {
list.add(value.toString());
}
}
return list;
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
}

public Map<String, String> getFieldValuesMap() {
if (fieldValuesMap == null) {
synchronized (this) {
if (fieldValuesMap == null) {
ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
fieldMapBuilder.put("organization", organization);
fieldMapBuilder.put("storedInfoType", storedInfoType);
fieldValuesMap = fieldMapBuilder.build();
}
}
}
return fieldValuesMap;
}

public String getFieldValue(String fieldName) {
return getFieldValuesMap().get(fieldName);
}

@Override
public String toString() {
return PATH_TEMPLATE.instantiate("organization", organization, "stored_info_type", storedInfoType);
}

/** Builder for OrganizationStoredInfoTypeName. */
public static class Builder {

private String organization;
private String storedInfoType;

public String getOrganization() {
return organization;
}

public String getStoredInfoType() {
return storedInfoType;
}

public Builder setOrganization(String organization) {
this.organization = organization;
return this;
}

public Builder setStoredInfoType(String storedInfoType) {
this.storedInfoType = storedInfoType;
return this;
}

private Builder() {
}

private Builder(OrganizationStoredInfoTypeName organizationStoredInfoTypeName) {
organization = organizationStoredInfoTypeName.organization;
storedInfoType = organizationStoredInfoTypeName.storedInfoType;
}

public OrganizationStoredInfoTypeName build() {
return new OrganizationStoredInfoTypeName(this);
}
}

@Override
public boolean equals(Object o) {
if (o == this) {
return true;
}
if (o instanceof OrganizationStoredInfoTypeName) {
OrganizationStoredInfoTypeName that = (OrganizationStoredInfoTypeName) o;
return (this.organization.equals(that.organization))
&& (this.storedInfoType.equals(that.storedInfoType));
}
return false;
}

@Override
public int hashCode() {
int h = 1;
h *= 1000003;
h ^= organization.hashCode();
h *= 1000003;
h ^= storedInfoType.hashCode();
return h;
}
}

Loading

0 comments on commit 8e6d2fa

Please sign in to comment.