From bbc976ce9f1789b422b8ae4d543ebabae32337c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20R=C3=B6der?= Date: Sat, 14 Oct 2023 16:08:33 +0200 Subject: [PATCH] Fixed smaller errors and several warnings. --- src/main/java/org/hobbit/core/Commands.java | 2 +- .../hobbit/core/data/BenchmarkMetaData.java | 11 ------- src/main/java/org/hobbit/vocab/HOBBIT.java | 2 ++ src/main/java/org/hobbit/vocab/XHV.java | 1 - .../ContainerCreationNoCorrelationTest.java | 33 +++++++++---------- .../core/components/EvaluationModuleTest.java | 1 - .../hobbit/utils/docker/DockerHelperTest.java | 2 -- start_test_environment.sh | 0 8 files changed, 18 insertions(+), 34 deletions(-) mode change 100755 => 100644 start_test_environment.sh diff --git a/src/main/java/org/hobbit/core/Commands.java b/src/main/java/org/hobbit/core/Commands.java index c4b2e76..87c395f 100644 --- a/src/main/java/org/hobbit/core/Commands.java +++ b/src/main/java/org/hobbit/core/Commands.java @@ -122,7 +122,7 @@ private static ImmutableMap generateMap() { * @return the name of the command or its id if the name is not known */ public static String toString(byte command) { - Byte commandObject = new Byte(command); + Byte commandObject = Byte.valueOf(command); if (Commands.ID_TO_COMMAND_NAME_MAP.containsKey(commandObject)) { return ID_TO_COMMAND_NAME_MAP.get(commandObject); } else { diff --git a/src/main/java/org/hobbit/core/data/BenchmarkMetaData.java b/src/main/java/org/hobbit/core/data/BenchmarkMetaData.java index a5b8771..7bea03d 100644 --- a/src/main/java/org/hobbit/core/data/BenchmarkMetaData.java +++ b/src/main/java/org/hobbit/core/data/BenchmarkMetaData.java @@ -16,13 +16,11 @@ */ package org.hobbit.core.data; -import java.util.Map; import java.util.Set; public class BenchmarkMetaData extends ImageMetaData { public Set definedApis; - protected Map systemHardwareConstraints = null; public BenchmarkMetaData() { } @@ -30,19 +28,10 @@ public BenchmarkMetaData() { public BenchmarkMetaData(BenchmarkMetaData other) { super(other); this.definedApis = other.definedApis; - this.systemHardwareConstraints = other.systemHardwareConstraints; } @Override public Object clone() { return new BenchmarkMetaData(this); } - - public Map getSystemHardwareConstraints() { - return systemHardwareConstraints; - } - - public void setSystemHardwareConstraints(Map systemHardwareConstraints) { - this.systemHardwareConstraints = systemHardwareConstraints; - } } diff --git a/src/main/java/org/hobbit/vocab/HOBBIT.java b/src/main/java/org/hobbit/vocab/HOBBIT.java index 4263796..baaca41 100644 --- a/src/main/java/org/hobbit/vocab/HOBBIT.java +++ b/src/main/java/org/hobbit/vocab/HOBBIT.java @@ -100,6 +100,8 @@ protected static final Property property(String local) { public static final Property involvesSystemInstance = property("involvesSystemInstance"); public static final Property isPartOf = property("isPartOf"); public static final Property isTaskOf = property("isTaskOf"); + public static final Property maxHardware = property("maxHardware"); + public static final Property minHardware = property("minHardware"); public static final Property measuresKPI = property("measuresKPI"); public static final Property organizer = property("organizer"); public static final Property publicationDate = property("publicationDate"); diff --git a/src/main/java/org/hobbit/vocab/XHV.java b/src/main/java/org/hobbit/vocab/XHV.java index 9ec20fd..2e699da 100644 --- a/src/main/java/org/hobbit/vocab/XHV.java +++ b/src/main/java/org/hobbit/vocab/XHV.java @@ -17,7 +17,6 @@ package org.hobbit.vocab; import org.apache.jena.rdf.model.Property; -import org.apache.jena.rdf.model.Resource; import org.apache.jena.rdf.model.ResourceFactory; /** diff --git a/src/test/java/org/hobbit/core/components/ContainerCreationNoCorrelationTest.java b/src/test/java/org/hobbit/core/components/ContainerCreationNoCorrelationTest.java index 1d3076d..10ddf84 100644 --- a/src/test/java/org/hobbit/core/components/ContainerCreationNoCorrelationTest.java +++ b/src/test/java/org/hobbit/core/components/ContainerCreationNoCorrelationTest.java @@ -16,35 +16,32 @@ */ package org.hobbit.core.components; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.hobbit.core.components.dummy.DummyComponentExecutor; -import java.util.Random; - -import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.MessageProperties; -import org.hobbit.core.rabbit.RabbitMQUtils; -import org.hobbit.utils.config.HobbitConfiguration; +import static org.junit.Assert.assertEquals; import java.io.IOException; -import org.hobbit.core.Commands; -import org.hobbit.core.components.dummy.AbstractDummyPlatformController; -import org.hobbit.core.data.StartCommandData; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import org.hobbit.core.components.dummy.DummyCommandReceivingComponent; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.hobbit.core.Commands; import org.hobbit.core.Constants; import org.hobbit.core.TestConstants; +import org.hobbit.core.components.dummy.AbstractDummyPlatformController; +import org.hobbit.core.components.dummy.DummyCommandReceivingComponent; +import org.hobbit.core.components.dummy.DummyComponentExecutor; +import org.hobbit.core.data.StartCommandData; +import org.hobbit.core.rabbit.RabbitMQUtils; +import org.hobbit.utils.config.HobbitConfiguration; import org.junit.After; import org.junit.Before; -import org.junit.Test; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.Stopwatch; -import static org.junit.Assert.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.rabbitmq.client.AMQP; public class ContainerCreationNoCorrelationTest { diff --git a/src/test/java/org/hobbit/core/components/EvaluationModuleTest.java b/src/test/java/org/hobbit/core/components/EvaluationModuleTest.java index 7286ee1..db6b459 100644 --- a/src/test/java/org/hobbit/core/components/EvaluationModuleTest.java +++ b/src/test/java/org/hobbit/core/components/EvaluationModuleTest.java @@ -40,7 +40,6 @@ import org.hobbit.utils.config.HobbitConfiguration; import org.hobbit.vocab.HobbitExperiments; import org.junit.Assert; -import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/hobbit/utils/docker/DockerHelperTest.java b/src/test/java/org/hobbit/utils/docker/DockerHelperTest.java index 2e11fa3..3b72bda 100644 --- a/src/test/java/org/hobbit/utils/docker/DockerHelperTest.java +++ b/src/test/java/org/hobbit/utils/docker/DockerHelperTest.java @@ -16,8 +16,6 @@ */ package org.hobbit.utils.docker; -import org.hobbit.utils.docker.DockerHelper; - import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/start_test_environment.sh b/start_test_environment.sh old mode 100755 new mode 100644