edemo · magwas · Aug 26, 2025 · Aug 26, 2025
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/target/
+target/
 .git-versioned-pom.xml
 xslt
 .konveyor

diff --git a/inez.model.tests/.eclipse-pmd b/inez.model.tests/.eclipse-pmd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inez.model.tests/.gitignore b/inez.model.tests/.gitignore
diff --git a/inez.model.tests/.project b/inez.model.tests/.project
@@ -25,10 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 </projectDescription>
diff --git a/inez.model.tests/build.properties b/inez.model.tests/build.properties
@@ -1,4 +1,4 @@
-source.. = src/main/java/
+source.. = src/main/java/,src/main/resources
 output.. = target/classes/
 bin.includes = META-INF/,\
                .
diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -79,19 +78,6 @@ void test() throws IOException {
 		assertTrue(element.isInstance(THING_ID));
 	}
 
-	private List<String> ancestry(String x) {
-		if (x == null)
-			return List.of("<none>");
-		if (x.equals(THING_ID))
-			return List.of(THING_ID);
-		if (x.equals(ROOT_ID))
-			return List.of(ROOT_ID);
-		BridiElement element = bridiElementFactory.apply(x);
-		List<String> ancestry = new ArrayList<>(ancestry(element.getParent().id));
-		ancestry.add(0, x);
-		return ancestry;
-	}
-
 	private String loadResourceAsString(String definitionName)
 			throws IOException {
 		ClassLoader classloader = Thread.currentThread().getContextClassLoader();

diff --git a/...odel.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java b/...odel.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java
@@ -29,7 +29,8 @@ public class CreateBridiElementServiceTest extends TestBase
 	@Override
 	public void setUp() {
 		super.setUp();
-		element = createBridiElement.apply(MY_MODEL_ID, HUMAN_ID, ALICE_REPR, null);
+		element = createBridiElement.apply(MY_MODEL_ID, HUMAN_ID, ALICE_REPR);
+		@SuppressWarnings("unchecked")
 		ArgumentCaptor<List<Bridi>> argument = ArgumentCaptor.forClass(List.class);
 		verify(createBridiElement.saveBridi).apply(argument.capture());
 		saved = argument.getValue();
@@ -94,6 +95,7 @@ void test5_1() {
 	void test6() {
 		createBridiElement.apply(MY_MODEL_ID, HUMAN_ID, ALICE_REPR, IS_A_ID,
 				ALICE_ID, GOD_ID);
+		@SuppressWarnings("unchecked")
 		ArgumentCaptor<List<Bridi>> argument = ArgumentCaptor.forClass(List.class);
 		verify(createBridiElement.saveBridi, times(2)).apply(argument.capture());
 		List<Bridi> saved = argument.getValue();

diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java
@@ -36,17 +36,15 @@ class QueryProcessorEndToEndTest implements BridiTestData {
 	@Autowired
 	InezImpl inez;
 
-	@Autowired
-	SpringBootBundleActivator springBootBundleActivator;
 
 	@BeforeEach
-	private void setUp() {
-		ServiceReference sr = mock(ServiceReference.class);
+	 void setUp() {
+		ServiceReference<Save> sr = mock(ServiceReference.class);
 		BundleContext ctx = mock(BundleContext.class);
-		when(ctx.getServiceReference("io.github.magwas.inez.functions.Save"))
+		when((ServiceReference<Save>)ctx.getServiceReference("io.github.magwas.inez.functions.Save"))
 				.thenReturn(sr);
 		when(ctx.getService(sr)).thenReturn(new Save());
-		springBootBundleActivator.bundleContext = ctx;
+		SpringBootBundleActivator.bundleContext = ctx;
 		inez.initialize();
 	}
 

diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java
@@ -3,7 +3,7 @@
 import static org.mockito.Mockito.mock;
 
 public class SaveBridiServiceStub {
-	private static SaveBridiService stub() {
+	static SaveBridiService stub() {
 		SaveBridiService mock = mock(SaveBridiService.class);
 		return mock;
 	}

diff --git a/inez.model/.eclipse-pmd b/inez.model/.eclipse-pmd
@@ -2,7 +2,7 @@
 <eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
   <analysis enabled="true" />
   <rulesets>
-    <ruleset name="Kode Konveyor ruleset" ref="konveyor-pmdrules/target/classes/konveyor.xml" refcontext="workspace" />
-    <ruleset name="Upstream rules" ref="konveyor-pmdrules/target/classes/upstream.xml" refcontext="workspace" />
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
   </rulesets>
 </eclipse-pmd>
diff --git a/inez.model/.gitignore b/inez.model/.gitignore
diff --git a/inez.model/build.properties b/inez.model/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               plugin.xml,\
                .
 output.. = target/classes/
 source.. = src/main/java
diff --git a/inez.model/plugin.xml b/inez.model/plugin.xml
diff --git a/inez.model/src/main/java/io/github/magwas/inez/Main.java b/inez.model/src/main/java/io/github/magwas/inez/Main.java
diff --git a/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java b/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java
@@ -15,10 +15,12 @@
 import io.github.magwas.inez.Inez;
 import io.github.magwas.inez.InezImpl;
 import io.github.magwas.inez.query.BridiFunction;
+import io.github.magwas.kodekonveyorannotations.Glue;
 
 @SpringBootApplication
 @EnableMapRepositories("io.github.magwas.inez.storage")
 @ComponentScan(basePackages = { "io.github.magwas" })
+@Glue
 public class SpringBootBundleActivator implements BundleActivator {
 
 	public static BundleContext bundleContext;

diff --git a/inez.parser.tests/.classpath b/inez.parser.tests/.classpath
@@ -7,5 +7,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/inez.parser.tests/.eclipse-pmd b/inez.parser.tests/.eclipse-pmd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inez.parser.tests/.gitignore b/inez.parser.tests/.gitignore
diff --git a/inez.parser.tests/.project b/inez.parser.tests/.project
@@ -25,10 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 </projectDescription>
diff --git a/inez.parser/.eclipse-pmd b/inez.parser/.eclipse-pmd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
-  <analysis enabled="false" />
+  <analysis enabled="true" />
   <rulesets>
-    <ruleset name="Kode Konveyor ruleset" ref="konveyor-pmdrules/target/classes/konveyor.xml" refcontext="workspace" />
-    <ruleset name="Upstream rules" ref="konveyor-pmdrules/target/classes/upstream.xml" refcontext="workspace" />
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
   </rulesets>
 </eclipse-pmd>
diff --git a/inez.parser/.gitignore b/inez.parser/.gitignore
diff --git a/inez.parser/.project b/inez.parser/.project
@@ -25,10 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 </projectDescription>
diff --git a/inez.target/.gitignore b/inez.target/.gitignore
diff --git a/inez.ui.product/.gitignore b/inez.ui.product/.gitignore
diff --git a/inez.ui.tests/.eclipse-pmd b/inez.ui.tests/.eclipse-pmd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inez.ui.tests/.gitignore b/inez.ui.tests/.gitignore
diff --git a/inez.ui.tests/.project b/inez.ui.tests/.project
@@ -25,10 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 </projectDescription>
diff --git a/inez.ui/.eclipse-pmd b/inez.ui/.eclipse-pmd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Kode Konveyor ruleset" ref=".konveyor/konveyor.xml" refcontext="project" />
+    <ruleset name="Upstream rules" ref=".konveyor/upstream.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inez.ui/.gitignore b/inez.ui/.gitignore
diff --git a/inez.ui/.project b/inez.ui/.project
@@ -25,10 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 </projectDescription>
diff --git a/inez.ui/build.properties b/inez.ui/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = target/classes
 bin.includes = plugin.xml,\
                META-INF/,\
                .
diff --git a/inez.ui/src/io/github/magwas/inez/ui/Application.java b/inez.ui/src/io/github/magwas/inez/ui/Application.java
@@ -25,9 +25,9 @@ public Object start(IApplicationContext context) {
 			int returnCode = PlatformUI.createAndRunWorkbench(display,
 					new ApplicationWorkbenchAdvisor());
 			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IApplication.EXIT_RESTART;
+				return EXIT_RESTART;
 			}
-			return IApplication.EXIT_OK;
+			return EXIT_OK;
 		} finally {
 			display.dispose();
 		}

diff --git a/inez.ui/src/io/github/magwas/inez/ui/Perspective.java b/inez.ui/src/io/github/magwas/inez/ui/Perspective.java
@@ -51,16 +51,4 @@ public void createInitialLayout(IPageLayout layout) {
 
 	}
 
-	private void addFolderLayouts(IPageLayout layout) {
-		// The declared order of these matters
-		folderLayoutLeftTop = layout.createFolder(LEFT_TOP, IPageLayout.LEFT, .23f,
-				IPageLayout.ID_EDITOR_AREA);
-		folderLayoutLeftBottom = layout.createFolder("Left bottom",
-				IPageLayout.BOTTOM, .6f, LEFT_TOP);
-		folderLayoutRight = layout.createPlaceholderFolder("right",
-				IPageLayout.RIGHT, .85f, IPageLayout.ID_EDITOR_AREA);
-		folderLayoutBottom = layout.createFolder("bottom", IPageLayout.BOTTOM, .7f,
-				IPageLayout.ID_EDITOR_AREA);
-	}
-
 }
diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java
@@ -41,8 +41,8 @@ public class MindMapNode extends AbstractMindMapItem implements Serializable {
 	 */
 	private Rectangle bounds;
 
-	private List<MindMapConnection> incomingConnections = new ArrayList();
-	private List<MindMapConnection> outgoingConnections = new ArrayList();
+	private List<MindMapConnection> incomingConnections = new ArrayList<>();
+	private List<MindMapConnection> outgoingConnections = new ArrayList<>();
 
 	public void addIncomingConnection(MindMapConnection conn) {
 		incomingConnections.add(conn);
@@ -90,19 +90,19 @@ public void removeOutgoingConnection(MindMapConnection conn) {
 
 	public void setBounds(Rectangle bounds) {
 		pcs.firePropertyChange(PROP_BOUNDS, this.bounds,
-				(this.bounds = bounds.getCopy()));
+				this.bounds = bounds.getCopy());
 	}
 
 	public void setColor(Color color) {
-		pcs.firePropertyChange(PROP_COLOR, this.color, (this.color = color));
+		pcs.firePropertyChange(PROP_COLOR, this.color, this.color = color);
 	}
 
 	public void setDescription(String description) {
 		pcs.firePropertyChange(PROP_DESCRIPTION, this.description,
-				(this.description = description));
+				this.description = description);
 	}
 
 	public void setTitle(String title) {
-		pcs.firePropertyChange(PROP_TITLE, this.title, (this.title = title));
+		pcs.firePropertyChange(PROP_TITLE, this.title, this.title = title);
 	}
 }
diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java
@@ -0,0 +1,9 @@
+package io.github.magwas.inez.ui.mindmap.visuals;
+
+import javafx.scene.shape.Polygon;
+
+public class ArrowHead extends Polygon {
+	public ArrowHead() {
+		super(0, 0, 10, 3, 10, -3);
+	}
+}