edemo · magwas · Oct 26, 2025 · Oct 26, 2025 · Oct 26, 2025
diff --git a/inez.model/pom.xml b/inez.model/pom.xml
@@ -45,13 +45,12 @@
     <dependencies>
         <dependency>
             <groupId>io.github.magwas</groupId>
-            <artifactId>konveyor.base</artifactId>
+            <artifactId>konveyor.runtime</artifactId>
             <version>${version.konveyor}</version>
-            <classifier>runtime</classifier>
         </dependency>
         <dependency>
             <groupId>io.github.magwas</groupId>
-            <artifactId>konveyor.base</artifactId>
+            <artifactId>konveyor.runtime</artifactId>
             <version>${version.konveyor}</version>
             <type>test-jar</type>
             <scope>test</scope>

diff --git a/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java b/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java
@@ -1,6 +1,6 @@
 package io.github.magwas.inez;
 
-import io.github.magwas.kodekonveyorannotations.Glue;
+import io.github.magwas.konveyor.annotations.Glue;
 
 @Glue
 public interface BridiStoreChangeListener {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/Inez.java b/inez.model/src/main/java/io/github/magwas/inez/Inez.java
@@ -8,7 +8,7 @@
 
 import io.github.magwas.inez.element.BridiElement;
 import io.github.magwas.inez.storage.model.Sumti;
-import io.github.magwas.kodekonveyorannotations.Glue;
+import io.github.magwas.konveyor.annotations.Glue;
 
 @Glue
 public interface Inez {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java b/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java
@@ -29,7 +29,7 @@
 import io.github.magwas.inez.storage.repository.BridiReferenceRepository;
 import io.github.magwas.inez.storage.repository.BridiStoreHistoryRepository;
 import io.github.magwas.inez.storage.repository.ProblemRepository;
-import io.github.magwas.kodekonveyorannotations.Delegate;
+import io.github.magwas.konveyor.annotations.Delegate;
 
 @Component
 @Delegate

diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java
@@ -10,8 +10,8 @@
 import io.github.magwas.inez.storage.model.Sumti;
 import io.github.magwas.inez.storage.repository.BridiReferenceRepository;
 import io.github.magwas.inez.storage.repository.SumtiRepository;
-import io.github.magwas.kodekonveyorannotations.Delegate;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.annotations.Delegate;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Delegate
 public class BridiElement implements ElementConstants {

diff --git a/.../src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java b/.../src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java
@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Service;
 
 import io.github.magwas.inez.InezImpl;
-import io.github.magwas.runtime.LoggerService;
+import io.github.magwas.konveyor.runtime.LoggerService;
 
 @Service
 public class BridiElementSystemInitializationService implements ElementConstants {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java
@@ -5,7 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class GetBridiElementTypeIdService implements ElementConstants {

diff --git a/....model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java b/....model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java
@@ -8,7 +8,7 @@
 
 import io.github.magwas.inez.storage.model.BridiReference;
 import io.github.magwas.inez.storage.repository.BridiReferenceRepository;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class GetRelativeForBridiElementService {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java b/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java
@@ -3,7 +3,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class IsOfTypeService implements ElementConstants {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java
@@ -5,7 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class RepresentBridiElementService implements ElementConstants {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java b/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java
@@ -11,7 +11,7 @@
 import io.github.magwas.inez.InezImpl;
 import io.github.magwas.inez.parse.ParseTextService;
 import io.github.magwas.inez.query.BridiFunction;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class Save implements BridiFunction {

diff --git a/....model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java b/....model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java
@@ -1,6 +1,6 @@
 package io.github.magwas.inez.query;
 
-import static io.github.magwas.runtime.LogUtil.debug;
+import static io.github.magwas.konveyor.runtime.LogUtil.debug;
 
 import java.util.List;
 import java.util.Map;

diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java
@@ -10,7 +10,7 @@
 import io.github.magwas.inez.element.BridiElementFactory;
 import io.github.magwas.inez.parse.ParseTextService;
 import io.github.magwas.inez.storage.SaveBridiService;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class CreateBridisFromQueryService {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java b/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java
@@ -7,7 +7,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
-import io.github.magwas.runtime.LoggerService;
+import io.github.magwas.konveyor.runtime.LoggerService;
 
 @Service
 public class GetServiceByNameService {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java
@@ -1,7 +1,7 @@
 package io.github.magwas.inez.query;
 
-import static io.github.magwas.runtime.LogUtil.debug;
-import static io.github.magwas.runtime.LogUtil.warning;
+import static io.github.magwas.konveyor.runtime.LogUtil.debug;
+import static io.github.magwas.konveyor.runtime.LogUtil.warning;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java
@@ -13,7 +13,7 @@
 import io.github.magwas.inez.storage.model.BridiReference;
 import io.github.magwas.inez.storage.model.Sumti;
 import io.github.magwas.inez.storage.repository.BridiReferenceRepository;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class CreateBridiFromSumtiService {

diff --git a/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java
@@ -12,7 +12,7 @@
 import io.github.magwas.inez.BridiStoreOperation;
 import io.github.magwas.inez.storage.model.Sumti;
 import io.github.magwas.inez.storage.repository.SumtiRepository;
-import io.github.magwas.runtime.LogUtil;
+import io.github.magwas.konveyor.runtime.LogUtil;
 
 @Service
 public class SaveBridiService implements Function<Bridi, Bridi> {

diff --git a/inez.model/src/main/java/module-info.java b/inez.model/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+open module inez.model {
+	exports io.github.magwas.inez;
+	exports io.github.magwas.inez.element;
+	exports io.github.magwas.inez.storage.model;
+	exports io.github.magwas.inez.storage.repository;
+	exports io.github.magwas.inez.functions;
+	exports io.github.magwas.inez.query;
+	exports io.github.magwas.inez.storage;
+
+	requires transitive inez.parser;
+	requires transitive spring.data.keyvalue;
+	requires transitive spring.data.commons;
+}
diff --git a/...eForBridiElementServiceStubGenerator.java → ...eForBridiElementServiceStubGenerator.java b/...eForBridiElementServiceStubGenerator.java → ...eForBridiElementServiceStubGenerator.java
@@ -1,21 +1,26 @@
-package io.github.magwas.inez.element;
+package io.github.magwas.inez.element.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class GetRelativeForBridiElementServiceStubGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {
 
 	@Override
 	public StringBuilder get() {
 		StringBuilder builder = GeneratorUtil.stubBoilerPlate("""
-				import java.util.stream.Stream;
-				""", "BridiElementTestData");
+import io.github.magwas.inez.element.GetRelativeForBridiElementService;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.stream.Stream;
+""", "BridiElementTestData");
 		String relatives = TestUtil.loadResourceAsString("relatives");
 		GeneratorUtil.mapToCode(relatives,
 				line -> MessageFormat.format(GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN,

diff --git a/...odel/BridiReferenceTestDataGenerator.java → ...ests/BridiReferenceTestDataGenerator.java b/...odel/BridiReferenceTestDataGenerator.java → ...ests/BridiReferenceTestDataGenerator.java
@@ -1,12 +1,12 @@
-package io.github.magwas.inez.storage.model;
+package io.github.magwas.inez.storage.model.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class BridiReferenceTestDataGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {

diff --git a/...storage/model/SumtiTestDataGenerator.java → ...e/model/tests/SumtiTestDataGenerator.java b/...storage/model/SumtiTestDataGenerator.java → ...e/model/tests/SumtiTestDataGenerator.java
@@ -1,20 +1,23 @@
-package io.github.magwas.inez.storage.model;
+package io.github.magwas.inez.storage.model.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class SumtiTestDataGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {
 
 	@Override
 	public StringBuilder get() {
 		StringBuilder builder = GeneratorUtil.testDataBoilerPlate(
-				"import io.github.magwas.inez.parse.IdTestData;", "IdTestData");
+				"""
+import io.github.magwas.inez.parse.tests.IdTestData;
+import io.github.magwas.inez.storage.model.Sumti;
+""", "IdTestData");
 		String sumties = TestUtil.loadResourceAsString("sumties");
 		GeneratorUtil.mapToCode(sumties,
 				line -> MessageFormat.format(SUMTI_TESTDATA_PATTERN,

diff --git a/...ository/SumtiRepositoryStubGenerator.java → ...y/tests/SumtiRepositoryStubGenerator.java b/...ository/SumtiRepositoryStubGenerator.java → ...y/tests/SumtiRepositoryStubGenerator.java
@@ -1,12 +1,12 @@
-package io.github.magwas.inez.storage.repository;
+package io.github.magwas.inez.storage.repository.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class SumtiRepositoryStubGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {

diff --git a/...ByRepresentationServiceStubGenerator.java → ...ByRepresentationServiceStubGenerator.java b/...ByRepresentationServiceStubGenerator.java → ...ByRepresentationServiceStubGenerator.java
@@ -1,12 +1,12 @@
-package io.github.magwas.inez.storage;
+package io.github.magwas.inez.storage.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class FindAllByRepresentationServiceStubGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {

diff --git a/...ByRepresentationServiceStubGenerator.java → ...ByRepresentationServiceStubGenerator.java b/...ByRepresentationServiceStubGenerator.java → ...ByRepresentationServiceStubGenerator.java
@@ -1,12 +1,12 @@
-package io.github.magwas.inez.storage;
+package io.github.magwas.inez.storage.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.inez.GeneratorPatternConstants;
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.inez.tests.GeneratorPatternConstants;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class FindAllIdByRepresentationServiceStubGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {

diff --git a/...b/magwas/inez/BridiTestDataGenerator.java → ...as/inez/tests/BridiTestDataGenerator.java b/...b/magwas/inez/BridiTestDataGenerator.java → ...as/inez/tests/BridiTestDataGenerator.java
@@ -1,11 +1,11 @@
-package io.github.magwas.inez;
+package io.github.magwas.inez.tests;
 
 import java.text.MessageFormat;
 import java.util.function.Supplier;
 
-import io.github.magwas.runtime.GeneratorUtil;
-import io.github.magwas.runtime.RuntimeConstants;
-import io.github.magwas.testing.TestUtil;
+import io.github.magwas.konveyor.runtime.GeneratorUtil;
+import io.github.magwas.konveyor.runtime.RuntimeConstants;
+import io.github.magwas.konveyor.testing.TestUtil;
 
 public class BridiTestDataGenerator
 		implements Supplier<StringBuilder>, GeneratorPatternConstants {

diff --git a/...agwas/inez/GeneratorPatternConstants.java → ...inez/tests/GeneratorPatternConstants.java b/...agwas/inez/GeneratorPatternConstants.java → ...inez/tests/GeneratorPatternConstants.java
@@ -1,23 +1,25 @@
-package io.github.magwas.inez;
+package io.github.magwas.inez.tests;
 
 public interface GeneratorPatternConstants {
 	String GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN = "\twhen(mock.apply({0}_ID, {1}_ID, {2}, {3})).thenReturn(Stream.of({4}_ID));\n";
 	String BRIDI_TEST_DATA_PATTERN = "\tBridi {0} = new Bridi({1}, {2},{3});\n";
 	String BRIDI_TEST_DATA_HEADER = """
-			import java.util.List;
-			import io.github.magwas.inez.parse.IdTestData;
-			import io.github.magwas.inez.parse.IdUtil;
-			import io.github.magwas.inez.parse.ParserConstants;
-			import io.github.magwas.inez.parse.ReferenceTestData;
+import java.util.List;
 
-			""";
+import io.github.magwas.inez.Bridi;
+import io.github.magwas.inez.parse.IdUtil;
+import io.github.magwas.inez.parse.ParserConstants;
+import io.github.magwas.inez.parse.tests.IdTestData;
+import io.github.magwas.inez.parse.tests.ReferenceTestData;
+""";
 	String SUMTI_REPOSITORY_STUB_PATTERN = "\twhen(mock.findById({0}_ID)).thenReturn(Optional.of({0}_SUMTI));\n";
 	String SUMTI_REPOSITORY_STUB_EXTRA = "\twhen(mock.findAllByRepresentation(GO_REPR)).thenReturn(Set.of(GO_SUMTI, GO2_SUMTI));\n";
 	String SUMTI_REPOSITORY_STUB_HEADER = """
-			import java.util.Set;
-			import java.util.Optional;
-			import io.github.magwas.inez.storage.model.SumtiTestData;
-			""";
+import java.util.Set;
+import java.util.Optional;
+import io.github.magwas.inez.storage.model.tests.SumtiTestData;
+import io.github.magwas.inez.storage.repository.SumtiRepository;
+""";
 	String SUMTI_TESTDATA_PATTERN = "\tSumti {0}_SUMTI = new Sumti({1}, {2});\n";
 	String BRIDI_REFERENCE_PATTERN = """
 			BridiReference {0}_REFERENCE_0 = new BridiReference(
@@ -31,16 +33,20 @@ public interface GeneratorPatternConstants {
 					{0}_REFERENCE_2);
 			""";
 	String BRIDI_REFERENCE_HEADER = """
-			import io.github.magwas.inez.parse.IdTestData;
-			import io.github.magwas.inez.parse.IdUtil;
-			import java.util.List;
-			""";
+import io.github.magwas.inez.parse.IdUtil;
+import io.github.magwas.inez.parse.tests.IdTestData;
+import io.github.magwas.inez.storage.model.BridiReference;
+
+import java.util.List;
+""";
 	String FIND_ALL_BY_REPRESENTATION_STUB_HEADER = """
-			import java.util.stream.Stream;
+import java.util.stream.Stream;
 
-			import io.github.magwas.inez.BridiTestData;
-			import io.github.magwas.inez.parse.ParserConstants;
-			""";
+import io.github.magwas.inez.storage.FindAllByRepresentationService;
+import io.github.magwas.inez.storage.FindAllIdByRepresentationService;
+import io.github.magwas.inez.tests.BridiTestData;
+import io.github.magwas.inez.parse.ParserConstants;
+""";
 	String FIND_ALL_ID_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n";
 	String FIND_ALL_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n";