Fix checkstyle in copied codes

apache · Jan 27, 2025 · 1f0ebd6 · 1f0ebd6
1 parent e21a71c
commit 1f0ebd6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle
@@ -62,7 +62,6 @@ dependencies {
   // For writing to GCS
   runtimeOnly library.java.bigdataoss_gcs_connector
   // HiveCatalog
-  runtimeOnly ("org.apache.iceberg:iceberg-hive-metastore:1.4.2")
   runtimeOnly project(path: ":sdks:java:io:iceberg:hive")
   // BigQueryMetastoreCatalog (Java 11+)
   runtimeOnly project(path: ":sdks:java:io:iceberg:bqms", configuration: "shadow")

diff --git a/sdks/java/io/iceberg/hive/build.gradle b/sdks/java/io/iceberg/hive/build.gradle
@@ -28,13 +28,12 @@ ext.summary = "Runtime dependencies needed for Hive catalog integration."
 def hive_version = "4.0.1"
 def hbase_version = "2.6.1-hadoop3"
 def hadoop_version = "3.4.1"
-def iceberg_version = "1.6.1"
 def avatica_version = "1.25.0"
 
 dependencies {
     // dependencies needed to run with iceberg's hive catalog
     // these dependencies are going to be included in io-expansion-service
-    runtimeOnly ("org.apache.iceberg:iceberg-hive-metastore:$iceberg_version")
+    runtimeOnly ("org.apache.hive:hive-iceberg-catalog:$hive_version")
     // analyzeClassesDependencies fails with "Cannot accept visitor on URL", likely the plugin does not recognize "core" classifier
     // use "core" classifier to depend on un-shaded jar
     runtimeOnly ("org.apache.hive:hive-exec:$hive_version:core") {

diff --git a/...erg/src/test/java/org/apache/beam/sdk/io/iceberg/catalog/hiveutils/TestHiveMetastore.java b/...erg/src/test/java/org/apache/beam/sdk/io/iceberg/catalog/hiveutils/TestHiveMetastore.java
@@ -257,7 +257,7 @@ public Table getTable(TableIdentifier identifier) throws TException, Interrupted
     return getTable(identifier.namespace().toString(), identifier.name());
   }
 
-  public <R> R run(ClientPool.Action<R, IMetaStoreClient, TException> action)
+  public <T> T run(ClientPool.Action<T, IMetaStoreClient, TException> action)
       throws InterruptedException, TException {
     return clientPool.run(action, false);
   }

diff --git a/...iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/catalog/hiveutils/TestTxnDbUtil.java b/...iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/catalog/hiveutils/TestTxnDbUtil.java
@@ -324,7 +324,7 @@ public static int countLockComponents(Configuration conf, long lockId) throws Ex
 
   /**
    * Utility method used to run COUNT queries like "select count(*) from ..." against metastore
-   * tables
+   * tables.
    *
    * @param countQuery countQuery text
    * @return count countQuery result