Adjust protobuf package name and imports

vogti · vogti · commit 3b048b310280 · 2024-05-05T14:56:17.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ task generateVersionProperties {
 
 task packageProto(type: Jar, dependsOn: generateVersionProperties) {
     // Copy the proto files to the desired package structure in the JAR
-    from(fileTree('proto').matching {
+    from(fileTree('org/polypheny/prism').matching {
         include '**/*.proto'
     }) {
         into 'org/polypheny/prism'
@@ -125,4 +125,3 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign publishing.publications.packageProtoPublication
 }
-
diff --git a/org/polypheny/prism/connection_requests.proto b/org/polypheny/prism/connection_requests.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "ConnectionRequests";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The ConnectionRequest message is designed to initiate a connection request from the client to the server.
diff --git a/org/polypheny/prism/connection_responses.proto b/org/polypheny/prism/connection_responses.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "ConnectionResponses";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The ConnectionResponse message is sent by the server in response to a ConnectionRequest from the client.
diff --git a/org/polypheny/prism/document_frame.proto b/org/polypheny/prism/document_frame.proto
@@ -4,18 +4,18 @@ Messages pertaining to document frames as used to represent results from the doc
 
 syntax = "proto3";
 
-import "value.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "DocumentResultProto";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The DocumentFrame message represents a frame containing one or more documents and is used to relay results or data entries structured as documents from the server to the client.
 */
 message DocumentFrame {
   // A list of documents contained within this frame. Each entry in this list is an instance of ProtoDocument, representing an individual document.
   repeated ProtoDocument documents = 1;
-}
+}
diff --git a/org/polypheny/prism/error.proto b/org/polypheny/prism/error.proto
@@ -7,7 +7,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "Error";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The ErrorDetails message conveys specific information about an error encountered during the processing of a request.
diff --git a/org/polypheny/prism/graph_frame.proto b/org/polypheny/prism/graph_frame.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "GraphResultProto";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The GraphFrame message is a placeholder intended to represent graph frames as part of the labeled property graph model.
@@ -17,4 +17,4 @@ It acts as a provision for future developments where fields related to the graph
 Currently, this message does not contain any fields. It is reserved for future use when the graph model is more completely realized.
 */
 message GraphFrame {
-}
+}
diff --git a/org/polypheny/prism/meta_requests.proto b/org/polypheny/prism/meta_requests.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "MetaRequests";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The DbmsVersionRequest message is utilized to request the version information of the database management system (DBMS) in use.
diff --git a/org/polypheny/prism/meta_responses.proto b/org/polypheny/prism/meta_responses.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "MetaResponses";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The DbmsVersionResponse message relays details about the version and name of the database management system (DBMS) in response to a DbmsVersionRequest.
diff --git a/org/polypheny/prism/namespace_meta_requests.proto b/org/polypheny/prism/namespace_meta_requests.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "NamespaceMeta";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The NamespacesRequest message allows querying for namespaces based on specific patterns in their names as well as their types.
diff --git a/org/polypheny/prism/namespace_meta_responses.proto b/org/polypheny/prism/namespace_meta_responses.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "NamespaceMetaResponses";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The NamespacesResponse message delivers a list of namespaces based on the provided criteria in the NamespacesRequest.
@@ -231,4 +231,4 @@ The structure is presently empty, but it’s expected to be expanded with attrib
 At this moment, the Document message serves as a placeholder and does not possess any fields.
 */
 message Document {
-}
+}
diff --git a/org/polypheny/prism/protointerface.proto b/org/polypheny/prism/protointerface.proto
@@ -6,23 +6,23 @@ Further messages for error responses are included.
 
 syntax = "proto3";
 
-import "connection_requests.proto";
-import "connection_responses.proto";
-import "meta_requests.proto";
-import "meta_responses.proto";
-import "namespace_meta_requests.proto";
-import "namespace_meta_responses.proto";
-import "statement_requests.proto";
-import "statement_responses.proto";
-import "transaction_requests.proto";
-import "transaction_responses.proto";
-import "value.proto";
+import "org/polypheny/prism/connection_requests.proto";
+import "org/polypheny/prism/connection_responses.proto";
+import "org/polypheny/prism/meta_requests.proto";
+import "org/polypheny/prism/meta_responses.proto";
+import "org/polypheny/prism/namespace_meta_requests.proto";
+import "org/polypheny/prism/namespace_meta_responses.proto";
+import "org/polypheny/prism/statement_requests.proto";
+import "org/polypheny/prism/statement_responses.proto";
+import "org/polypheny/prism/transaction_requests.proto";
+import "org/polypheny/prism/transaction_responses.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "ProtoInterfaceProto";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 Wrapper message wrapping a specific request message to be sent to the server.
@@ -112,4 +112,4 @@ message Response {
     ConnectionPropertiesUpdateResponse connection_properties_update_response = 23;
     CloseResultResponse close_result_response = 34;
   }
-}
+}
diff --git a/org/polypheny/prism/relational_frame.proto b/org/polypheny/prism/relational_frame.proto
@@ -4,13 +4,13 @@ Messages related to relational frames as used to represent the results form the
 
 syntax = "proto3";
 
-import "value.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "RelationalResult";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 The RelationalFrame message encapsulates the structure of a relational frame, which includes metadata about columns and rows of data within a relational table.
@@ -123,4 +123,4 @@ The Row message represents a single row within a relational frame.
 message Row {
   // The values within the row, represented as a series of ProtoValue objects.
   repeated ProtoValue values = 1;
-}
+}
diff --git a/org/polypheny/prism/statement_requests.proto b/org/polypheny/prism/statement_requests.proto
@@ -4,13 +4,13 @@ Messages related to statements in a query language and their results.
 
 syntax = "proto3";
 
-import "value.proto";
+import "org/polypheny/prism/value.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "StatementRequests";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 Closes the result set of the statement matching the specified statement id. If no such statement exists, or the result is already closed, this request is ignored.
@@ -149,4 +149,3 @@ message FetchRequest {
   // (Optional) Number of rows to retrieve in this batch. If no fetch size is specified, a default value is used.
   optional int32 fetch_size = 2;
 }
-
diff --git a/org/polypheny/prism/statement_responses.proto b/org/polypheny/prism/statement_responses.proto
@@ -4,15 +4,15 @@ Messages related to statements in a query language and their results.
 
 syntax = "proto3";
 
-import "relational_frame.proto";
-import "graph_frame.proto";
-import "document_frame.proto";
+import "org/polypheny/prism/relational_frame.proto";
+import "org/polypheny/prism/graph_frame.proto";
+import "org/polypheny/prism/document_frame.proto";
 
 option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "StatementResponses";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 Response of the server on the request of a client to close the result set of a specific statement.
@@ -111,4 +111,3 @@ message Frame {
     DocumentFrame document_frame = 4;
   }
 }
-
diff --git a/org/polypheny/prism/transaction_requests.proto b/org/polypheny/prism/transaction_requests.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "TransactionRequests";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 Represents a request to commit a transaction.
diff --git a/org/polypheny/prism/transaction_responses.proto b/org/polypheny/prism/transaction_responses.proto
@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "TransactionResponses";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 /*
 Represents the response after attempting to commit a transaction.
diff --git a/org/polypheny/prism/value.proto b/org/polypheny/prism/value.proto
@@ -4,7 +4,7 @@ option java_multiple_files = true;
 option java_package = "org.polypheny.prism";
 option java_outer_classname = "ProtoValueProto";
 
-package polypheny.prism;
+package org.polypheny.prism;
 
 // Specifies the type of a proto value. This enum contains a value for each datatype supported by the DBMS.
 enum ProtoPolyType {
@@ -284,4 +284,4 @@ Represents a file containing large binary data.
 message ProtoFile {
   // The content of the file in binary.
   bytes binary = 1;
-}
+}
