From 82e8b7688c3cb306a5a55210bbe7230820ef623b Mon Sep 17 00:00:00 2001
From: Andrea Peruffo <andrea.peruffo1982@gmail.com>
Date: Wed, 25 Mar 2026 15:09:20 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"Use=20chicory-compiler=20moduleInterf?=
 =?UTF-8?q?ace=20instead=20of=20annotation=20processor=20=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c5d0979ae4af2055c5f53a454683bf908afb68f0.
---
 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, 83 insertions(+), 9 deletions(-)
 create 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 7fcaee7..c03546e 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -15,6 +15,11 @@
   <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>
@@ -50,24 +55,33 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.dylibso.chicory</groupId>
-        <artifactId>chicory-compiler-maven-plugin</artifactId>
-        <version>${chicory.version}</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>protoc-wrapper</id>
+            <id>normalize-wasm-path</id>
             <goals>
-              <goal>compile</goal>
+              <goal>run</goal>
             </goals>
+            <phase>initialize</phase>
             <configuration>
-              <name>io.roastedroot.protobuf4j.common.ProtobufWrapperCommon</name>
-              <wasmFile>${project.basedir}/../wasm/protoc-wrapper-v3.wasm</wasmFile>
-              <moduleInterface>io.roastedroot.protobuf4j.common.Protobuf</moduleInterface>
+              <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>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -86,6 +100,18 @@
         <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
new file mode 100644
index 0000000..730640b
--- /dev/null
+++ b/core-common/src/main/java-templates/io/roastedroot/protobuf4j/common/WasmResource.java
@@ -0,0 +1,7 @@
+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 52a2b40..a301676 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,5 +1,6 @@
 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;
@@ -28,6 +29,7 @@
 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 3870ae8..8db2698 100644
--- a/core-v3/pom.xml
+++ b/core-v3/pom.xml
@@ -73,6 +73,18 @@
         <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 2c76c1c..fd3a190 100644
--- a/core-v4/pom.xml
+++ b/core-v4/pom.xml
@@ -73,6 +73,18 @@
         <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 e8e97c5..e2c7537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
     <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>
@@ -160,8 +161,21 @@
           <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>
@@ -185,6 +199,7 @@
               <compilerArgs combine.self="override"/>
               <parameters>true</parameters>
               <release>${maven.compiler.release}</release>
+              <annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
             </configuration>
           </plugin>
         </plugins>