[Maven-project] Incorporate maven-proto-plugin into build of Maven pr…

…ojects (#535)

* Add proto-maven-plugin for java-info

* upgrade proto version adn patched optinal

* split proto into a single package

* modify proto java package name

* use ascopes maven plugin and delete java code gen in buf.gen.yaml

* Add ci for Java code-gen

* modify code-gen command

.github/workflows/format.yml

@@ -1,59 +1,65 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: GraphAr Format 
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'format/**'
-      - '.github/workflows/format.yml'
-      - 'buf.gen.yaml'
-      - 'buf.yaml'
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'format/**'
-      - '.github/workflows/format.yml'
-      - 'buf.gen.yaml'
-      - 'buf.yaml'
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.event.number || github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
-          submodules: false
-          fetch-depth: 0
-
-      - uses: bufbuild/buf-setup-action@v1
-        with:
-          version: "1.32.0"
-
-      - name: Buf Generate
-        run: buf generate
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: GraphAr Format 
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'format/**'
+      - '.github/workflows/format.yml'
+      - 'buf.gen.yaml'
+      - 'buf.yaml'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'format/**'
+      - '.github/workflows/format.yml'
+      - 'buf.gen.yaml'
+      - 'buf.yaml'
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.event.number || github.head_ref || github.sha }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+          submodules: false
+          fetch-depth: 0
+
+      - uses: bufbuild/buf-setup-action@v1
+        with:
+          version: "1.32.0"
+
+      - name: Buf Generate
+        run: buf generate
+
+      - name: Java Code Generate
+        run: |
+          pushd maven-projects/proto
+          mvn protobuf:generate
+          popd
+             

.gitignore

@@ -68,4 +68,8 @@ venv.bak/
 
 ### Scala ###
 *.bloop
-*.metals
+*.metals
+
+### Java ###
+target/
+maven-projects/proto/src/main/java

buf.gen.yaml

@@ -30,6 +30,4 @@ plugins:
   # Cpp
   - remote: buf.build/protocolbuffers/cpp:v27.1
     out: cpp/proto
-  # Java
-  - remote: buf.build/protocolbuffers/java:v27.1
-    out: maven-projects/info/src/main/java/
+  # Java code well be generated by maven plugin

format/adjacent_list.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 import "enums.proto";
 

format/edge_info.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 import "property_group.proto";
 import "adjacent_list.proto";

format/enums.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 enum DataType {
     BOOL = 0;

format/graph_info.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 import "vertex_info.proto";
 import "edge_info.proto";

format/property_group.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 import "enums.proto";
 

format/vertex_info.proto

@@ -21,7 +21,7 @@ syntax = "proto3";
 
 package graphar;
 option java_multiple_files = true;
-option java_package = "org.apache.graphar.info.proto";
+option java_package = "org.apache.graphar.proto";
 
 import "property_group.proto";
 

maven-projects/info/pom.xml

@@ -63,5 +63,4 @@
         </dependency>
     </dependencies>
 
-
 </project>

maven-projects/pom.xml

@@ -75,5 +75,6 @@
         <module>java</module>
         <module>spark</module>
         <module>info</module>
+        <module>proto</module>
     </modules>
 </project>

maven-projects/proto/pom.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.graphar</groupId>
+        <artifactId>graphar-root</artifactId>
+        <version>${graphar.version}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>proto</artifactId>
+    <packaging>jar</packaging>
+    <version>0.13.0.dev-SNAPSHOT</version>
+
+    <name>proto</name>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <protobuf-maven-plugin.version>2.3.0</protobuf-maven-plugin.version>
+        <protobuf.version>4.27.1</protobuf.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${protobuf.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.github.ascopes</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>${protobuf-maven-plugin.version}</version>
+                <configuration>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.basedir}/../../format</sourceDirectory>
+                    </sourceDirectories>
+                    <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
+                    <protocVersion>${protobuf.version}</protocVersion>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>