Skip to content

Fix breaking changes on Data Catalog library update #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nnegrey merged 12 commits into from
Feb 26, 2020
Merged

Fix breaking changes on Data Catalog library update #2137

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f73a85
FIX breaking changes on library update
mesmacosta Feb 18, 2020
6c812d5
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 18, 2020
d14190b
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 19, 2020
a0a5827
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 19, 2020
690c858
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 20, 2020
f109afb
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 20, 2020
e59dc33
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 21, 2020
0347a29
Merge branch 'master' into task/update-datacatalog-library
nnegrey Feb 24, 2020
7d21952
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 26, 2020
4b595c0
Merge branch 'master' into task/update-datacatalog-library
nnegrey Feb 26, 2020
39d4f6d
Merge branch 'master' into task/update-datacatalog-library
nnegrey Feb 26, 2020
9a51946
Merge branch 'master' into task/update-datacatalog-library
mesmacosta Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datacatalog/cloud-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
}

dependencies {
compile group: 'com.google.cloud', name: 'google-cloud-datacatalog', version:'0.28.0-alpha'
compile group: 'com.google.cloud', name: 'google-cloud-datacatalog', version:'0.32.1'

testCompile group: 'com.google.truth', name: 'truth', version:'0.46'
testCompile group: 'junit', name: 'junit', version:'4.13'
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/cloud-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datacatalog</artifactId>
<version>0.29.0-alpha</version>
<version>0.32.1</version>
</dependency>

<!-- Test dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateEntryGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
// [START datacatalog_create_entry_group_tag]

import com.google.api.gax.rpc.AlreadyExistsException;
import com.google.cloud.datacatalog.CreateEntryGroupRequest;
import com.google.cloud.datacatalog.EntryGroup;
import com.google.cloud.datacatalog.LocationName;
import com.google.cloud.datacatalog.v1beta1.CreateEntryGroupRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.EntryGroup;
import com.google.cloud.datacatalog.v1beta1.LocationName;
import java.io.IOException;

public class CreateEntryGroup {
Expand Down
14 changes: 7 additions & 7 deletions datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateFilesetEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
// [START datacatalog_create_fileset_tag]

import com.google.api.gax.rpc.AlreadyExistsException;
import com.google.cloud.datacatalog.ColumnSchema;
import com.google.cloud.datacatalog.CreateEntryRequest;
import com.google.cloud.datacatalog.Entry;
import com.google.cloud.datacatalog.EntryGroupName;
import com.google.cloud.datacatalog.EntryType;
import com.google.cloud.datacatalog.GcsFilesetSpec;
import com.google.cloud.datacatalog.Schema;
import com.google.cloud.datacatalog.v1beta1.ColumnSchema;
import com.google.cloud.datacatalog.v1beta1.CreateEntryRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.Entry;
import com.google.cloud.datacatalog.v1beta1.EntryGroupName;
import com.google.cloud.datacatalog.v1beta1.EntryType;
import com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec;
import com.google.cloud.datacatalog.v1beta1.Schema;
import java.io.IOException;

public class CreateFilesetEntry {
Expand Down
4 changes: 2 additions & 2 deletions ...atalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package com.example.datacatalog;

// [START datacatalog_bigquery_lookup_dataset]
import com.google.cloud.datacatalog.Entry;
import com.google.cloud.datacatalog.LookupEntryRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.Entry;
import com.google.cloud.datacatalog.v1beta1.LookupEntryRequest;

public class LookupEntryBigQueryDataset {

Expand Down
4 changes: 2 additions & 2 deletions datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.example.datacatalog;

import com.google.cloud.datacatalog.Entry;
import com.google.cloud.datacatalog.LookupEntryRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.Entry;
import com.google.cloud.datacatalog.v1beta1.LookupEntryRequest;

public class LookupEntryBigQueryTable {

Expand Down
4 changes: 2 additions & 2 deletions datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryPubSubTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.example.datacatalog;

import com.google.cloud.datacatalog.Entry;
import com.google.cloud.datacatalog.LookupEntryRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.Entry;
import com.google.cloud.datacatalog.v1beta1.LookupEntryRequest;

public class LookupEntryPubSubTopic {

Expand Down
4 changes: 2 additions & 2 deletions datacatalog/cloud-client/src/test/java/com/example/datacatalog/CreateEntryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;

import com.google.cloud.datacatalog.EntryGroupName;
import com.google.cloud.datacatalog.EntryName;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.EntryGroupName;
import com.google.cloud.datacatalog.v1beta1.EntryName;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/quickstart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
}

dependencies {
compile group: 'com.google.cloud', name: 'google-cloud-datacatalog-quickstart', version:'0.28.0-alpha'
compile group: 'com.google.cloud', name: 'google-cloud-datacatalog-quickstart', version:'0.32.1'

testCompile group: 'com.google.truth', name: 'truth', version:'0.46'
testCompile group: 'junit', name: 'junit', version:'4.13'
Expand Down
2 changes: 1 addition & 1 deletion datacatalog/quickstart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datacatalog</artifactId>
<version>0.29.0-alpha</version>
<version>0.32.1</version>
</dependency>

<!-- Test dependencies -->
Expand Down
22 changes: 11 additions & 11 deletions datacatalog/quickstart/src/main/java/com/example/datacatalog/CreateFilesetEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
import com.google.api.gax.rpc.AlreadyExistsException;
import com.google.api.gax.rpc.NotFoundException;
import com.google.api.gax.rpc.PermissionDeniedException;
import com.google.cloud.datacatalog.ColumnSchema;
import com.google.cloud.datacatalog.CreateEntryGroupRequest;
import com.google.cloud.datacatalog.CreateEntryRequest;
import com.google.cloud.datacatalog.Entry;
import com.google.cloud.datacatalog.EntryGroup;
import com.google.cloud.datacatalog.EntryGroupName;
import com.google.cloud.datacatalog.EntryName;
import com.google.cloud.datacatalog.EntryType;
import com.google.cloud.datacatalog.GcsFilesetSpec;
import com.google.cloud.datacatalog.LocationName;
import com.google.cloud.datacatalog.Schema;
import com.google.cloud.datacatalog.v1beta1.ColumnSchema;
import com.google.cloud.datacatalog.v1beta1.CreateEntryGroupRequest;
import com.google.cloud.datacatalog.v1beta1.CreateEntryRequest;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.Entry;
import com.google.cloud.datacatalog.v1beta1.EntryGroup;
import com.google.cloud.datacatalog.v1beta1.EntryGroupName;
import com.google.cloud.datacatalog.v1beta1.EntryName;
import com.google.cloud.datacatalog.v1beta1.EntryType;
import com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec;
import com.google.cloud.datacatalog.v1beta1.LocationName;
import com.google.cloud.datacatalog.v1beta1.Schema;
import java.io.IOException;

public class CreateFilesetEntry {
Expand Down
4 changes: 2 additions & 2 deletions datacatalog/quickstart/src/test/java/com/example/datacatalog/CreateFilesetEntryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;

import com.google.cloud.datacatalog.EntryGroupName;
import com.google.cloud.datacatalog.EntryName;
import com.google.cloud.datacatalog.v1beta1.DataCatalogClient;
import com.google.cloud.datacatalog.v1beta1.EntryGroupName;
import com.google.cloud.datacatalog.v1beta1.EntryName;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
Expand Down