From 261d4deb8d01aa53855cd8b2d4af5fef39c06b24 Mon Sep 17 00:00:00 2001
From: andreatp <andrea.peruffo1982@gmail.com>
Date: Wed, 25 Mar 2026 12:58:33 +0000
Subject: [PATCH] Use chicory-compiler moduleInterface instead of annotation
 processor

Replace the @WasmModuleInterface annotation approach with the new
moduleInterface config in chicory-compiler-maven-plugin. This removes
the need for annotations dependency, annotation processor, antrun
plugin (wasm path normalization), templating plugin, and WasmResource
java template.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 core-common/pom.xml                           | 44 ++++---------------
 .../protobuf4j/common/WasmResource.java       |  7 ---
 .../protobuf4j/common/Protobuf.java           |  2 -
 core-v3/pom.xml                               | 12 -----
 core-v4/pom.xml                               | 12 -----
 pom.xml                                       | 15 -------
 6 files changed, 9 insertions(+), 83 deletions(-)
 delete mode 100644 core-common/src/main/java-templates/io/roastedroot/protobuf4j/common/WasmResource.java

diff --git a/core-common/pom.xml b/core-common/pom.xml
index c03546e..7fcaee7 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -15,11 +15,6 @@
   <description>Protobuf common support for protobuf4j</description>
 
   <dependencies>
-    <dependency>
-      <groupId>com.dylibso.chicory</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${chicory.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.dylibso.chicory</groupId>
       <artifactId>wasi</artifactId>
@@ -55,33 +50,24 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>com.dylibso.chicory</groupId>
+        <artifactId>chicory-compiler-maven-plugin</artifactId>
+        <version>${chicory.version}</version>
         <executions>
           <execution>
-            <id>normalize-wasm-path</id>
+            <id>protoc-wrapper</id>
             <goals>
-              <goal>run</goal>
+              <goal>compile</goal>
             </goals>
-            <phase>initialize</phase>
             <configuration>
-              <target>
-                <property location="${project.basedir}/../wasm/protoc-wrapper-v3.wasm" name="wasm.resource.path.raw"/>
-                <makeurl file="${wasm.resource.path.raw}" property="wasm.resource.url.temp"/>
-                <loadresource property="wasm.resource.url">
-                  <propertyresource name="wasm.resource.url.temp"/>
-                  <filterchain>
-                    <tokenfilter>
-                      <replaceregex pattern="^file:/" replace="file:///"/>
-                    </tokenfilter>
-                  </filterchain>
-                </loadresource>
-              </target>
-              <exportAntProperties>true</exportAntProperties>
+              <name>io.roastedroot.protobuf4j.common.ProtobufWrapperCommon</name>
+              <wasmFile>${project.basedir}/../wasm/protoc-wrapper-v3.wasm</wasmFile>
+              <moduleInterface>io.roastedroot.protobuf4j.common.Protobuf</moduleInterface>
             </configuration>
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -100,18 +86,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>templating-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filtering-java-templates</id>
-            <goals>
-              <goal>filter-sources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/core-common/src/main/java-templates/io/roastedroot/protobuf4j/common/WasmResource.java b/core-common/src/main/java-templates/io/roastedroot/protobuf4j/common/WasmResource.java
deleted file mode 100644
index 730640b..0000000
--- a/core-common/src/main/java-templates/io/roastedroot/protobuf4j/common/WasmResource.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.roastedroot.protobuf4j.common;
-
-public final class WasmResource {
-    public static final String absoluteFile = "${wasm.resource.url}";
-
-    private WasmResource() {}
-}
diff --git a/core-common/src/main/java/io/roastedroot/protobuf4j/common/Protobuf.java b/core-common/src/main/java/io/roastedroot/protobuf4j/common/Protobuf.java
index a301676..52a2b40 100644
--- a/core-common/src/main/java/io/roastedroot/protobuf4j/common/Protobuf.java
+++ b/core-common/src/main/java/io/roastedroot/protobuf4j/common/Protobuf.java
@@ -1,6 +1,5 @@
 package io.roastedroot.protobuf4j.common;
 
-import com.dylibso.chicory.annotations.WasmModuleInterface;
 import com.dylibso.chicory.runtime.ByteArrayMemory;
 import com.dylibso.chicory.runtime.ImportMemory;
 import com.dylibso.chicory.runtime.ImportValues;
@@ -29,7 +28,6 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-@WasmModuleInterface(value = WasmResource.absoluteFile)
 public final class Protobuf {
 
     private static final Logger LOGGER = Logger.getLogger(Protobuf.class.getCanonicalName());
diff --git a/core-v3/pom.xml b/core-v3/pom.xml
index 8db2698..3870ae8 100644
--- a/core-v3/pom.xml
+++ b/core-v3/pom.xml
@@ -73,18 +73,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>templating-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filtering-java-templates</id>
-            <goals>
-              <goal>filter-sources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/core-v4/pom.xml b/core-v4/pom.xml
index fd3a190..2c76c1c 100644
--- a/core-v4/pom.xml
+++ b/core-v4/pom.xml
@@ -73,18 +73,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>templating-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filtering-java-templates</id>
-            <goals>
-              <goal>filter-sources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index e2c7537..e8e97c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
     <checkstyle.version>12.3.1</checkstyle.version>
     <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
     <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version>
-    <templating-maven-plugin.version>3.1.0</templating-maven-plugin.version>
     <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
     <surefire-plugin.version>3.5.2</surefire-plugin.version>
     <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
@@ -161,21 +160,8 @@
           <configuration>
             <parameters>true</parameters>
             <release>${maven.compiler.release}</release>
-            <annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
-            <annotationProcessorPaths>
-              <path>
-                <groupId>com.dylibso.chicory</groupId>
-                <artifactId>annotations-processor</artifactId>
-                <version>${chicory.version}</version>
-              </path>
-            </annotationProcessorPaths>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>templating-maven-plugin</artifactId>
-          <version>${templating-maven-plugin.version}</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -199,7 +185,6 @@
               <compilerArgs combine.self="override"/>
               <parameters>true</parameters>
               <release>${maven.compiler.release}</release>
-              <annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
             </configuration>
           </plugin>
         </plugins>