From 1a9919de2c0f98eb21c3cb76b821a86fca5d0287 Mon Sep 17 00:00:00 2001 From: Hendrik7889 <44064629+Hendrik7889@users.noreply.github.com> Date: Thu, 23 Oct 2025 12:22:06 +0200 Subject: [PATCH] replaced Log::errorIfNull and Objects::requireNonNull with their respective Guava implementation --- cli/src/main/java/montithings/steps/UnpackResources.java | 3 ++- .../java/montithings/generator/helper/ComponentHelper.java | 4 +--- .../main/java/montithings/generator/helper/FileHelper.java | 7 ++++--- .../steps/generate/GenerateSensorActuatorPorts.java | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cli/src/main/java/montithings/steps/UnpackResources.java b/cli/src/main/java/montithings/steps/UnpackResources.java index a6e491ea8..eeed602cd 100644 --- a/cli/src/main/java/montithings/steps/UnpackResources.java +++ b/cli/src/main/java/montithings/steps/UnpackResources.java @@ -1,6 +1,7 @@ // (c) https://github.com/MontiCore/monticore package montithings.steps; +import com.google.common.base.Verify; import montithings.CLIState; import montithings.CLIStep; import montithings.MTCLI; @@ -54,7 +55,7 @@ public void unpackResources(String srcName, File targetDirectory, String targetN * @param target copy destination directory */ public void copyFromJar(String source, final Path target) throws URISyntaxException, IOException { - URI resource = Objects.requireNonNull(MTCLI.class.getResource("")).toURI(); + URI resource = Verify.verifyNotNull(MTCLI.class.getResource("")).toURI(); FileSystem fileSystem; try { fileSystem = FileSystems.newFileSystem(resource, Collections.emptyMap()); diff --git a/generators/montithings2cpp/src/main/java/montithings/generator/helper/ComponentHelper.java b/generators/montithings2cpp/src/main/java/montithings/generator/helper/ComponentHelper.java index f6b33cbd0..62a42ffb0 100644 --- a/generators/montithings2cpp/src/main/java/montithings/generator/helper/ComponentHelper.java +++ b/generators/montithings2cpp/src/main/java/montithings/generator/helper/ComponentHelper.java @@ -77,8 +77,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.swing.text.DocumentFilter; - import static montithings.generator.helper.TypesHelper.java2cppTypeString; /** @@ -1094,7 +1092,7 @@ public static ASTInitBehavior getInitBehavior(ComponentTypeSymbol component, public static String getInitBehaviorName(ComponentTypeSymbol component, ASTBehavior behavior) { return getPortSpecificInitBehaviorName(component, - Objects.requireNonNull(getInitBehavior(component, behavior))); + Preconditions.checkNotNull(getInitBehavior(component, behavior))); } public static List getInitBehaviorsWithoutBehaviors( diff --git a/generators/montithings2cpp/src/main/java/montithings/generator/helper/FileHelper.java b/generators/montithings2cpp/src/main/java/montithings/generator/helper/FileHelper.java index f9f4cb9b4..07b769fbe 100644 --- a/generators/montithings2cpp/src/main/java/montithings/generator/helper/FileHelper.java +++ b/generators/montithings2cpp/src/main/java/montithings/generator/helper/FileHelper.java @@ -2,6 +2,7 @@ package montithings.generator.helper; import arcbasis._symboltable.ComponentTypeSymbol; +import com.google.common.base.Verify; import de.se_rwth.commons.Names; import de.se_rwth.commons.logging.Log; import montithings._symboltable.IMontiThingsScope; @@ -218,7 +219,7 @@ public static Set getFilesWithEnding(File hwcPath, Set fileEndin if (recursive) { pathStream = Files.walk(hwcPath.toPath()); } else { - pathStream = Arrays.stream(Objects.requireNonNull(hwcPath.listFiles())).map(File::toPath); + pathStream = Arrays.stream(Verify.verifyNotNull(hwcPath.listFiles())).map(File::toPath); } files = pathStream @@ -251,7 +252,7 @@ public static Set getFilesWithPrefix(File hwcPath, Set filePrefi if (recursive) { pathStream = Files.walk(hwcPath.toPath()); } else { - pathStream = Arrays.stream(Objects.requireNonNull(hwcPath.listFiles())).map(File::toPath); + pathStream = Arrays.stream(Verify.verifyNotNull(hwcPath.listFiles())).map(File::toPath); } files = pathStream @@ -299,7 +300,7 @@ public static File[] getSubPackagesPath(String modelPath) { File[] subDirs = new File(modelPath).listFiles(File::isDirectory); // Iterate over subdirectories of the model folder and add the paths of the subdirs to array - for (File subDir : Objects.requireNonNull(subDirs)) { + for (File subDir : Verify.verifyNotNull(subDirs)) { subPackagesPaths.add(new File(subDir.getAbsolutePath())); } diff --git a/generators/montithings2cpp/src/main/java/montithings/generator/steps/generate/GenerateSensorActuatorPorts.java b/generators/montithings2cpp/src/main/java/montithings/generator/steps/generate/GenerateSensorActuatorPorts.java index 4b6a7f841..9ae135a99 100644 --- a/generators/montithings2cpp/src/main/java/montithings/generator/steps/generate/GenerateSensorActuatorPorts.java +++ b/generators/montithings2cpp/src/main/java/montithings/generator/steps/generate/GenerateSensorActuatorPorts.java @@ -2,6 +2,7 @@ package montithings.generator.steps.generate; import arcbasis._symboltable.PortSymbol; +import com.google.common.base.Verify; import de.se_rwth.commons.logging.Log; import montithings.generator.config.SplittingMode; import montithings.generator.config.TargetPlatform; @@ -43,7 +44,7 @@ public void action(GeneratorToolState state) { List executableSensorActuatorPorts = new ArrayList<>(); - for (File pckg : Objects.requireNonNull(packages)) { + for (File pckg : Verify.verifyNotNull(packages)) { Set sensorActuatorPorts = getFilesWithEnding(pckg, getFileEndings(), false); for (String port : sensorActuatorPorts) { if (!templatePortBelongsToComponent(port, state)) { @@ -56,7 +57,7 @@ public void action(GeneratorToolState state) { } } - for (File pckg : Objects.requireNonNull(packages)) { + for (File pckg : Verify.verifyNotNull(packages)) { Set sensorActuatorPorts = getFilesWithPrefix(pckg, Collections.singleton("&"), false); for (String port : sensorActuatorPorts) { Log.debug("Processing handwritten port '" + port + "'", TOOL_NAME);