From 0ff819702de4513486a562b1b5ddaba9039e1613 Mon Sep 17 00:00:00 2001
From: Vaci Koblizek <vaci@vaci.org>
Date: Mon, 9 Nov 2020 15:09:32 +0000
Subject: [PATCH] avoid test package name clash

---
 runtime-rpc/pom.xml                                      | 4 ++--
 runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java | 4 ----
 runtime-rpc/src/test/schema/test.capnp                   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/runtime-rpc/pom.xml b/runtime-rpc/pom.xml
index 29b5bd4..c45f31f 100644
--- a/runtime-rpc/pom.xml
+++ b/runtime-rpc/pom.xml
@@ -111,13 +111,13 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <target>
-                                <mkdir dir="src/test/generated/org/capnproto"/>
+                                <mkdir dir="src/test/generated/org/capnproto/rpctest"/>
                                 <exec executable="capnp" failonerror="true">
                                     <arg value="compile"/>
                                     <arg value="-I"/>
                                     <arg value="../compiler/src/main/schema/"/>
                                     <arg value="--src-prefix=src/test/schema/"/>
-                                    <arg value="-o../capnpc-java:src/test/generated/org/capnproto"/>
+                                    <arg value="-o../capnpc-java:src/test/generated/org/capnproto/rpctest"/>
                                     <arg value="src/test/schema/test.capnp"/>
                                 </exec>
                             </target>
diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java b/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
index 5fc0072..2770c93 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
@@ -1,8 +1,5 @@
 package org.capnproto;
 
-import org.capnproto.CallContext;
-import org.capnproto.Capability;
-import org.capnproto.Void;
 import org.capnproto.rpctest.Test;
 import org.junit.Assert;
 
@@ -10,7 +7,6 @@ import java.util.concurrent.CompletableFuture;
 
 class RpcTestUtil {
 
-
     static void initTestMessage(Test.TestAllTypes.Builder builder) {
         builder.setVoidField(Void.VOID);
         builder.setBoolField(true);
diff --git a/runtime-rpc/src/test/schema/test.capnp b/runtime-rpc/src/test/schema/test.capnp
index ea500f6..fff9a0c 100644
--- a/runtime-rpc/src/test/schema/test.capnp
+++ b/runtime-rpc/src/test/schema/test.capnp
@@ -1,7 +1,7 @@
 @0xb365fb00cc89383b;
 
 using Java = import "/capnp/java.capnp";
-$Java.package("org.capnproto.test");
+$Java.package("org.capnproto.rpctest");
 $Java.outerClassname("Test");
 
 struct TestAllTypes {