FIX breaking changes on library update (#2137)

mesmacosta · nnegrey · web-flow · commit 4f6ddbcb3dd6 · 2020-02-26T11:16:29.000-07:00
Co-authored-by: Noah Negrey &lt;nnegrey@users.noreply.github.com&gt;
diff --git a/datacatalog/cloud-client/build.gradle b/datacatalog/cloud-client/build.gradle
@@ -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'
diff --git a/datacatalog/cloud-client/pom.xml b/datacatalog/cloud-client/pom.xml
@@ -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 -->
diff --git a/datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateEntryGroup.java b/datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateEntryGroup.java
@@ -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 {
diff --git a/datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateFilesetEntry.java b/datacatalog/cloud-client/src/main/java/com/example/datacatalog/CreateFilesetEntry.java
@@ -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 {
diff --git a/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryDataset.java b/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryDataset.java
@@ -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 {
 
diff --git a/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryTable.java b/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryBigQueryTable.java
@@ -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 {
 
diff --git a/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryPubSubTopic.java b/datacatalog/cloud-client/src/main/java/com/example/datacatalog/LookupEntryPubSubTopic.java
@@ -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 {
 
diff --git a/datacatalog/cloud-client/src/test/java/com/example/datacatalog/CreateEntryTests.java b/datacatalog/cloud-client/src/test/java/com/example/datacatalog/CreateEntryTests.java
@@ -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;
diff --git a/datacatalog/quickstart/build.gradle b/datacatalog/quickstart/build.gradle
@@ -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'
diff --git a/datacatalog/quickstart/pom.xml b/datacatalog/quickstart/pom.xml
@@ -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 -->
diff --git a/datacatalog/quickstart/src/main/java/com/example/datacatalog/CreateFilesetEntry.java b/datacatalog/quickstart/src/main/java/com/example/datacatalog/CreateFilesetEntry.java
@@ -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 {
diff --git a/datacatalog/quickstart/src/test/java/com/example/datacatalog/CreateFilesetEntryTests.java b/datacatalog/quickstart/src/test/java/com/example/datacatalog/CreateFilesetEntryTests.java
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ repositories {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- compile group: 'com.google.cloud', name: 'google-cloud-datacatalog', version:'0.28.0-alpha'`
	`22`	`+ compile group: 'com.google.cloud', name: 'google-cloud-datacatalog', version:'0.32.1'`
`23`	`23`
`24`	`24`	`testCompile group: 'com.google.truth', name: 'truth', version:'0.46'`
`25`	`25`	`testCompile group: 'junit', name: 'junit', version:'4.13'`