split into subprojects: abecto-core, abecto-benchmark

fusion-jena · Nov 20, 2023 · 70b925c · 70b925c
1 parent 3f91db8
commit 70b925c
Show file tree

Hide file tree

Showing 89 changed files with 42,862 additions and 42,629 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -27,6 +27,6 @@ jobs:
       if: always()
       with:
         name: Test Reports
-        path: target/surefire-reports/*.xml
+        path: */target/surefire-reports/*.xml
         reporter: java-junit
         fail-on-error: false
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 ## Maven
 /target
+*/target
 /dependency-reduced-pom.xml
 
 ## Eclipse

diff --git a/Dockerfile b/Dockerfile
@@ -20,4 +20,4 @@ RUN mvn package
 
 FROM openjdk:11-jre-slim
 RUN echo '#!/bin/sh\nexec java -jar /opt/abecto.jar "$@"' >> /bin/abecto && chmod +x /bin/abecto
-COPY --from=builder target/abecto.jar /opt/abecto.jar
+COPY --from=builder abecto-core/target/abecto-exec.jar /opt/abecto.jar
diff --git a/README.md b/README.md
@@ -51,10 +51,10 @@ This sections provides an overview about the use of ABECTO.
 To use ABECTO, first checkout the project and compile ABECTO using Maven:
 
 ```shell
-mvn -B -Dmaven.test.skip=true package
+mvn -Dmaven.test.skip=true package
 ```
 
-This will create a stand alone .jar file at [target/abecto.jar](target).
+This will create a stand alone .jar file at [abecto-core/target/abecto-exec.jar](target).
 
 ## Configuration
 

diff --git a/abecto-benchmark/pom.xml b/abecto-benchmark/pom.xml
@@ -0,0 +1,138 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>abecto-benchmark</artifactId>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>de.uni_jena.cs.fusion</groupId>
+		<artifactId>abecto</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
+	</parent>
+
+	<name>ABECTO Benchmark</name>
+
+	<dependencies>
+		<dependency>
+			<!-- GPL 2 with classpath exception -->
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-core</artifactId>
+			<version>${jmh.version}</version>
+		</dependency>
+		<dependency>
+			<!-- GPL 2 with classpath exception -->
+			<groupId>org.openjdk.jmh</groupId>
+			<artifactId>jmh-generator-annprocess</artifactId>
+			<version>${jmh.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>de.uni_jena.cs.fusion</groupId>
+			<artifactId>abecto-core</artifactId>
+			<version>${project.parent.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<!-- EPL 2.0 -->
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit.jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<!-- EPL 2.0 -->
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<version>${junit.jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<properties>
+		<jmh.version>1.37</jmh.version>
+		<uberjar.name>benchmarks</uberjar.name>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<finalName>${uberjar.name}</finalName>
+							<transformers>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.openjdk.jmh.Main</mainClass>
+								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+							</transformers>
+							<filters>
+								<filter>
+									<!--
+										Shading signed JARs will fail without this.
+										http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+									-->
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.5.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.4</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.9.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.3</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>2.2.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.17</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+</project>
diff --git a/...ssor/ComparisonBenchmarkDataSupplier.java → ...mark/ComparisonBenchmarkDataSupplier.java b/...ssor/ComparisonBenchmarkDataSupplier.java → ...mark/ComparisonBenchmarkDataSupplier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.uni_jena.cs.fusion.abecto.processor;
+package de.uni_jena.cs.fusion.abecto.benchmark;
 
 import com.google.common.collect.Streams;
 import org.apache.jena.rdf.model.RDFNode;

diff --git a/...pulationComparisonProcessorBenchmark.java → ...pulationComparisonProcessorBenchmark.java b/...pulationComparisonProcessorBenchmark.java → ...pulationComparisonProcessorBenchmark.java
@@ -13,17 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.uni_jena.cs.fusion.abecto.processor;
+package de.uni_jena.cs.fusion.abecto.benchmark;
 
 import de.uni_jena.cs.fusion.abecto.Aspect;
+import de.uni_jena.cs.fusion.abecto.processor.PopulationComparisonProcessor;
 import org.apache.jena.rdf.model.Resource;
+import org.openjdk.jmh.annotations.Benchmark;
 
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 
 public class PopulationComparisonProcessorBenchmark {
 
+    @Benchmark
+    public void testMethod() {
+        // This is a demo/sample template for building your JMH benchmarks. Edit as needed.
+        // Put your benchmark code here.
+    }
+
     private static class IndependentPopulationComparisonProcessor extends PopulationComparisonProcessor {
 
         private final ComparisonBenchmarkDataSupplier dataSupplier;

diff --git a/...PropertyComparisonProcessorBenchmark.java → ...PropertyComparisonProcessorBenchmark.java b/...PropertyComparisonProcessorBenchmark.java → ...PropertyComparisonProcessorBenchmark.java
@@ -13,17 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.uni_jena.cs.fusion.abecto.processor;
+package de.uni_jena.cs.fusion.abecto.benchmark;
 
 import de.uni_jena.cs.fusion.abecto.Aspect;
+import de.uni_jena.cs.fusion.abecto.processor.PropertyComparisonProcessor;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
+import org.openjdk.jmh.annotations.Benchmark;
 
 import java.util.*;
 import java.util.stream.Stream;
 
 public class PropertyComparisonProcessorBenchmark {
 
+    @Benchmark
+    public void testMethod() {
+        // This is a demo/sample template for building your JMH benchmarks. Edit as needed.
+        // Put your benchmark code here.
+    }
+
     private static class IndependentPropertyComparisonProcessor extends PropertyComparisonProcessor {
 
         private final ComparisonBenchmarkDataSupplier dataSupplier;

diff --git a/.../ComparisonBenchmarkDataSupplierTest.java → .../ComparisonBenchmarkDataSupplierTest.java b/.../ComparisonBenchmarkDataSupplierTest.java → .../ComparisonBenchmarkDataSupplierTest.java
@@ -1,17 +1,19 @@
 /**
- * Copyright © 2019 Heinz Nixdorf Chair for Distributed Information Systems, Friedrich Schiller University Jena
- * (http://www.fusion.uni-jena.de/)
+ * Copyright © 2019 Heinz Nixdorf Chair for Distributed Information Systems, Friedrich Schiller University Jena (http://www.fusion.uni-jena.de/)
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package de.uni_jena.cs.fusion.abecto.processor;
+package de.uni_jena.cs.fusion.abecto.benchmark;
 
 import org.apache.jena.rdf.model.Resource;
 import org.junit.jupiter.api.Assertions;