HIVE-28059 : fixing more nits;

- moving to metastore-iceberg-catalog;
- removing never thrown exceptions from signatures;
- fixing javadoc;

standalone-metastore/metastore-catalog/pom.xml → standalone-metastore/metastore-iceberg-catalog/pom.xml

@@ -17,7 +17,7 @@
     <version>4.1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>hive-standalone-metastore-icecat</artifactId>
+  <artifactId>hive-standalone-metastore-iceberg-catalog</artifactId>
   <name>Hive Metastore Iceberg Catalog</name>
   <properties>
     <standalone.metastore.path.to.root>..</standalone.metastore.path.to.root>
@@ -59,6 +59,21 @@
       <artifactId>iceberg-bundled-guava</artifactId>
       <version>${iceberg.version}</version>
     </dependency>
+    <!-- Intellij dislikes shaded Iceberg: uncomment the following 2 blocks helps when coding/debugging -->
+    <!--
+    <dependency>
+      <groupId>org.apache.iceberg</groupId>
+      <artifactId>iceberg-api</artifactId>
+      <version>${iceberg.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.iceberg</groupId>
+      <artifactId>iceberg-core</artifactId>
+      <version>${iceberg.version}</version>
+      <optional>true</optional>
+    </dependency>
+    -->
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-standalone-metastore-common</artifactId>

standalone-metastore/metastore-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogAdapter.java → standalone-metastore/metastore-iceberg-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogAdapter.java

@@ -77,7 +77,7 @@
 import org.apache.iceberg.util.PropertyUtil;
 
 /**
- * Original @ https://github.com/apache/iceberg/blob/main/core/src/test/java/org/apache/iceberg/rest/RESTCatalogAdapter.java
+ * Original @ https://github.com/apache/iceberg/blob/1.6.x/core/src/test/java/org/apache/iceberg/rest/RESTCatalogAdapter.java
  * Adaptor class to translate REST requests into {@link Catalog} API calls.
  */
 public class HMSCatalogAdapter implements RESTClient {
@@ -696,10 +696,8 @@ public <T extends RESTResponse> T postForm(
   }
 
   @Override
-  public void close() throws IOException {
-    // The calling test is responsible for closing the underlying catalog backing this REST catalog
-    // so that the underlying backend catalog is not closed and reopened during the REST catalog's
-    // initialize method when fetching the server configuration.
+  public void close() {
+    // The caller is responsible for closing the underlying catalog backing this REST catalog.
   }
 
   private static class NamespaceNotSupported extends RuntimeException {

standalone-metastore/metastore-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServer.java → standalone-metastore/metastore-iceberg-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServer.java

@@ -131,6 +131,14 @@ protected Server createServer() {
    * @throws Exception if servlet initialization fails
    */
   public static Server startServer(Configuration conf) throws Exception {
-    return new HMSCatalogServer(conf, null).startServer();
+    Server server = new HMSCatalogServer(conf, null).startServer();
+    if (server != null) {
+      if (!server.isStarted()) {
+        LOG.error("Unable to start property-maps servlet server on {}", server.getURI());
+      } else {
+        LOG.info("Started property-maps servlet server on {}", server.getURI());
+      }
+    }
+    return server;
   }
 }

standalone-metastore/metastore-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServlet.java → standalone-metastore/metastore-iceberg-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogServlet.java

@@ -29,7 +29,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,7 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Original @ https://github.com/apache/iceberg/blob/main/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java
+ * Original @ https://github.com/apache/iceberg/blob/1.6.x/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java
  * The RESTCatalogServlet provides a servlet implementation used in combination with a
  * RESTCatalogAdaptor to proxy the REST Spec to any Catalog implementation.
  */
@@ -60,7 +59,7 @@ public HMSCatalogServlet(HMSCatalogAdapter restCatalogAdapter) {
   }
 
   @Override
-  protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+  protected void service(HttpServletRequest request, HttpServletResponse response) {
     try {
       ServletRequestContext context = ServletRequestContext.from(request);
       response.setStatus(HttpServletResponse.SC_OK);

standalone-metastore/metastore-catalog/src/test/java/org/apache/iceberg/rest/HMSTestBase.java → standalone-metastore/metastore-iceberg-catalog/src/test/java/org/apache/iceberg/rest/HMSTestBase.java

@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -433,15 +434,7 @@ static <T> String serialize(T object) {
         }
     }
 
-    static <T> T deserialize(String s) {
-        try {
-            return MAPPER.readValue(s, new TypeReference<T>() {});
-        } catch (JsonProcessingException xany) {
-            throw new RuntimeException(xany);
-        }
-    }
-
-    static <T> T deserialize(BufferedReader s) {
+    static <T> T deserialize(Reader s) {
         try {
             return MAPPER.readValue(s, new TypeReference<T>() {});
         } catch (IOException xany) {

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java

@@ -336,7 +336,7 @@ protected int getServerPort() {
     }
 
     @Override
-    protected HttpServlet createServlet() throws IOException {
+    protected HttpServlet createServlet() {
       ServletSecurity security = new ServletSecurity(configuration, PropertyServlet.isAuthJwt(configuration));
       return security.proxy(new PropertyServlet(configuration));
     }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java

@@ -53,7 +53,7 @@
  * </p>
  * A typical usage in a servlet is the following:
  * <pre><code>
- * SecureServletCaller security; // ...
+ * ServletSecurity security; // ...
  * {@literal @}Override protected void doPost(HttpServletRequest request, HttpServletResponse response)
  *    throws ServletException, IOException {
  *  security.execute(request, response, this::runPost);

standalone-metastore/pom.xml

@@ -29,7 +29,7 @@
     <module>metastore-common</module>
     <module>metastore-server</module>
     <module>metastore-tools</module>
-    <module>metastore-catalog</module>
+    <module>metastore-iceberg-catalog</module>
   </modules>
   <properties>
     <hive.version>4.1.0-SNAPSHOT</hive.version>