codegen: update Java model path (#76)

Closes #71

Author: jackye1995

java/Makefile

@@ -21,7 +21,7 @@ gen-java-apache-client: clean-java-apache-client
 	  -g java \
 	  -o lance-namespace-apache-client \
 	  --ignore-file-override=.apache-client-ignore \
-	  --additional-properties=groupId=com.lancedb,artifactId=lance-namespace-apache-client,artifactVersion=$(VERSION),parentGroupId=com.lancedb,parentArtifactId=lance-namespace-root,parentVersion=$(VERSION),parentRelativePath=pom.xml,library=apache-httpclient,apiPackage=com.lancedb.lance.namespace.client.apache.api,modelPackage=com.lancedb.lance.namespace.client.apache.model,hideGenerationTimestamp=true,licenseName=Apache-2.0,licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt
+	  --additional-properties=groupId=com.lancedb,artifactId=lance-namespace-apache-client,artifactVersion=$(VERSION),parentGroupId=com.lancedb,parentArtifactId=lance-namespace-root,parentVersion=$(VERSION),parentRelativePath=pom.xml,library=apache-httpclient,apiPackage=com.lancedb.lance.namespace.client.apache.api,modelPackage=com.lancedb.lance.namespace.model,hideGenerationTimestamp=true,licenseName=Apache-2.0,licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt
 	sed -i -e 's#<junit-version>5.10.2</junit-version>#<junit-version>5.8.2</junit-version>#g' lance-namespace-apache-client/pom.xml
 	rm -f lance-namespace-apache-client/pom.xml-e
 

java/lance-namespace-adapter/src/main/java/com/lancedb/lance/namespace/adapter/ClientToServerResponse.java

@@ -23,7 +23,7 @@
 public class ClientToServerResponse {
 
   public static GetNamespaceResponse getNamespace(
-      com.lancedb.lance.namespace.client.apache.model.GetNamespaceResponse response) {
+      com.lancedb.lance.namespace.model.GetNamespaceResponse response) {
     GetNamespaceResponse converted = new GetNamespaceResponse();
     converted.setParent(response.getParent());
     converted.setProperties(response.getProperties());
@@ -32,21 +32,21 @@ public static GetNamespaceResponse getNamespace(
   }
 
   public static ListNamespacesResponse listNamespaces(
-      com.lancedb.lance.namespace.client.apache.model.ListNamespacesResponse response) {
+      com.lancedb.lance.namespace.model.ListNamespacesResponse response) {
     ListNamespacesResponse converted = new ListNamespacesResponse();
     converted.setNamespaces(response.getNamespaces());
     return converted;
   }
 
   public static NamespaceExistsResponse namespaceExists(
-      com.lancedb.lance.namespace.client.apache.model.NamespaceExistsResponse response) {
+      com.lancedb.lance.namespace.model.NamespaceExistsResponse response) {
     NamespaceExistsResponse converted = new NamespaceExistsResponse();
     converted.setExists(response.getExists());
     return converted;
   }
 
   public static GetTableResponse getTable(
-      com.lancedb.lance.namespace.client.apache.model.GetTableResponse response) {
+      com.lancedb.lance.namespace.model.GetTableResponse response) {
     GetTableResponse converted = new GetTableResponse();
     converted.setNamespace(response.getNamespace());
     converted.setName(response.getName());
@@ -55,7 +55,7 @@ public static GetTableResponse getTable(
   }
 
   public static RegisterTableResponse registerTable(
-      com.lancedb.lance.namespace.client.apache.model.RegisterTableResponse response) {
+      com.lancedb.lance.namespace.model.RegisterTableResponse response) {
     RegisterTableResponse converted = new RegisterTableResponse();
     converted.setNamespace(response.getNamespace());
     converted.setName(response.getName());
@@ -64,7 +64,7 @@ public static RegisterTableResponse registerTable(
   }
 
   public static TableExistsResponse tableExists(
-      com.lancedb.lance.namespace.client.apache.model.TableExistsResponse response) {
+      com.lancedb.lance.namespace.model.TableExistsResponse response) {
     TableExistsResponse converted = new TableExistsResponse();
     converted.setExists(response.getExists());
     return converted;

java/lance-namespace-adapter/src/main/java/com/lancedb/lance/namespace/adapter/ServerToClientRequest.java

@@ -13,14 +13,14 @@
  */
 package com.lancedb.lance.namespace.adapter;
 
-import com.lancedb.lance.namespace.client.apache.model.CreateNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.DropNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.GetNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.GetTableRequest;
-import com.lancedb.lance.namespace.client.apache.model.ListNamespacesRequest;
-import com.lancedb.lance.namespace.client.apache.model.NamespaceExistsRequest;
-import com.lancedb.lance.namespace.client.apache.model.RegisterTableRequest;
-import com.lancedb.lance.namespace.client.apache.model.TableExistsRequest;
+import com.lancedb.lance.namespace.model.CreateNamespaceRequest;
+import com.lancedb.lance.namespace.model.DropNamespaceRequest;
+import com.lancedb.lance.namespace.model.GetNamespaceRequest;
+import com.lancedb.lance.namespace.model.GetTableRequest;
+import com.lancedb.lance.namespace.model.ListNamespacesRequest;
+import com.lancedb.lance.namespace.model.NamespaceExistsRequest;
+import com.lancedb.lance.namespace.model.RegisterTableRequest;
+import com.lancedb.lance.namespace.model.TableExistsRequest;
 
 public class ServerToClientRequest {
 

java/lance-namespace-apache-client/.openapi-generator/FILES

@@ -36,18 +36,18 @@ src/main/java/com/lancedb/lance/namespace/client/apache/auth/ApiKeyAuth.java
 src/main/java/com/lancedb/lance/namespace/client/apache/auth/Authentication.java
 src/main/java/com/lancedb/lance/namespace/client/apache/auth/HttpBasicAuth.java
 src/main/java/com/lancedb/lance/namespace/client/apache/auth/HttpBearerAuth.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/CreateNamespaceRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/DropNamespaceRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/ErrorResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/GetNamespaceRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/GetNamespaceResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/GetTableRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/GetTableResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/ListNamespacesRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/ListNamespacesResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/NamespaceExistsRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/NamespaceExistsResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/RegisterTableRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/RegisterTableResponse.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/TableExistsRequest.java
-src/main/java/com/lancedb/lance/namespace/client/apache/model/TableExistsResponse.java
+src/main/java/com/lancedb/lance/namespace/model/CreateNamespaceRequest.java
+src/main/java/com/lancedb/lance/namespace/model/DropNamespaceRequest.java
+src/main/java/com/lancedb/lance/namespace/model/ErrorResponse.java
+src/main/java/com/lancedb/lance/namespace/model/GetNamespaceRequest.java
+src/main/java/com/lancedb/lance/namespace/model/GetNamespaceResponse.java
+src/main/java/com/lancedb/lance/namespace/model/GetTableRequest.java
+src/main/java/com/lancedb/lance/namespace/model/GetTableResponse.java
+src/main/java/com/lancedb/lance/namespace/model/ListNamespacesRequest.java
+src/main/java/com/lancedb/lance/namespace/model/ListNamespacesResponse.java
+src/main/java/com/lancedb/lance/namespace/model/NamespaceExistsRequest.java
+src/main/java/com/lancedb/lance/namespace/model/NamespaceExistsResponse.java
+src/main/java/com/lancedb/lance/namespace/model/RegisterTableRequest.java
+src/main/java/com/lancedb/lance/namespace/model/RegisterTableResponse.java
+src/main/java/com/lancedb/lance/namespace/model/TableExistsRequest.java
+src/main/java/com/lancedb/lance/namespace/model/TableExistsResponse.java

java/lance-namespace-apache-client/README.md

@@ -79,7 +79,7 @@ Please follow the [installation](#installation) instruction and execute the foll
 
 import com.lancedb.lance.namespace.client.apache.*;
 import com.lancedb.lance.namespace.client.apache.auth.*;
-import com.lancedb.lance.namespace.client.apache.model.*;
+import com.lancedb.lance.namespace.model.*;
 import com.lancedb.lance.namespace.client.apache.api.NamespaceApi;
 
 public class NamespaceApiExample {

java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/api/NamespaceApi.java

@@ -18,14 +18,14 @@
 import com.lancedb.lance.namespace.client.apache.BaseApi;
 import com.lancedb.lance.namespace.client.apache.Configuration;
 import com.lancedb.lance.namespace.client.apache.Pair;
-import com.lancedb.lance.namespace.client.apache.model.CreateNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.DropNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.GetNamespaceRequest;
-import com.lancedb.lance.namespace.client.apache.model.GetNamespaceResponse;
-import com.lancedb.lance.namespace.client.apache.model.ListNamespacesRequest;
-import com.lancedb.lance.namespace.client.apache.model.ListNamespacesResponse;
-import com.lancedb.lance.namespace.client.apache.model.NamespaceExistsRequest;
-import com.lancedb.lance.namespace.client.apache.model.NamespaceExistsResponse;
+import com.lancedb.lance.namespace.model.CreateNamespaceRequest;
+import com.lancedb.lance.namespace.model.DropNamespaceRequest;
+import com.lancedb.lance.namespace.model.GetNamespaceRequest;
+import com.lancedb.lance.namespace.model.GetNamespaceResponse;
+import com.lancedb.lance.namespace.model.ListNamespacesRequest;
+import com.lancedb.lance.namespace.model.ListNamespacesResponse;
+import com.lancedb.lance.namespace.model.NamespaceExistsRequest;
+import com.lancedb.lance.namespace.model.NamespaceExistsResponse;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 

java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/api/TableApi.java

@@ -18,12 +18,12 @@
 import com.lancedb.lance.namespace.client.apache.BaseApi;
 import com.lancedb.lance.namespace.client.apache.Configuration;
 import com.lancedb.lance.namespace.client.apache.Pair;
-import com.lancedb.lance.namespace.client.apache.model.GetTableRequest;
-import com.lancedb.lance.namespace.client.apache.model.GetTableResponse;
-import com.lancedb.lance.namespace.client.apache.model.RegisterTableRequest;
-import com.lancedb.lance.namespace.client.apache.model.RegisterTableResponse;
-import com.lancedb.lance.namespace.client.apache.model.TableExistsRequest;
-import com.lancedb.lance.namespace.client.apache.model.TableExistsResponse;
+import com.lancedb.lance.namespace.model.GetTableRequest;
+import com.lancedb.lance.namespace.model.GetTableResponse;
+import com.lancedb.lance.namespace.model.RegisterTableRequest;
+import com.lancedb.lance.namespace.model.RegisterTableResponse;
+import com.lancedb.lance.namespace.model.TableExistsRequest;
+import com.lancedb.lance.namespace.model.TableExistsResponse;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 

…apache/model/CreateNamespaceRequest.java …espace/model/CreateNamespaceRequest.javajava/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/CreateNamespaceRequest.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/CreateNamespaceRequest.java java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/CreateNamespaceRequest.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/CreateNamespaceRequest.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lancedb.lance.namespace.client.apache.model;
+package com.lancedb.lance.namespace.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;

…t/apache/model/DropNamespaceRequest.java …amespace/model/DropNamespaceRequest.javajava/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/DropNamespaceRequest.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/DropNamespaceRequest.java java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/DropNamespaceRequest.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/DropNamespaceRequest.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lancedb.lance.namespace.client.apache.model;
+package com.lancedb.lance.namespace.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

…e/client/apache/model/ErrorResponse.java …lance/namespace/model/ErrorResponse.javajava/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/ErrorResponse.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/ErrorResponse.java java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/client/apache/model/ErrorResponse.java renamed to java/lance-namespace-apache-client/src/main/java/com/lancedb/lance/namespace/model/ErrorResponse.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.lancedb.lance.namespace.client.apache.model;
+package com.lancedb.lance.namespace.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;