fix

Author: e-filchenko-bosh

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/resolver/FileSystemStrategy.java

@@ -84,7 +84,7 @@ public FileSystemStrategy( final ModelsRoot modelsRoot ) {
    public AspectModelFile apply( final AspectModelUrn aspectModelUrn, final ResolutionStrategySupport resolutionStrategySupport ) {
       final List<ModelResolutionException.LoadingFailure> checkedLocations = new ArrayList<>();
 
-      final File namedResourceFile = modelsRoot.determineAspectModelFile( aspectModelUrn );
+      final File namedResourceFile = modelsRoot.resolveAspectModelFile( aspectModelUrn );
       if ( namedResourceFile.exists() ) {
          final Try<RawAspectModelFile> tryFile = Try.of( () -> AspectModelFileLoader.load( namedResourceFile ) );
          if ( tryFile.isFailure() ) {

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/resolver/fs/ModelsRoot.java

@@ -51,22 +51,30 @@ public Stream<Path> paths() {
 
    public abstract Path directoryForNamespace( final AspectModelUrn urn );
 
+   public File determineAspectModelFile( final AspectModelUrn urn ) {
+      return constructAspectModelFilePath( urn ).toFile();
+   }
+
    /**
-    * Determines the aspect model file for the given {@link AspectModelUrn}.
+    * Resolve the aspect model file for the given {@link AspectModelUrn}.
     *
     * <p>Constructs the file path by resolving the namespace directory.
     * Validates the file using its canonical path.
     *
-    * <p>Returns an empty file if the resolution fails.
+    * <p>Returns an empty file if the resolution fails.s
     *
     * @param urn the {@link AspectModelUrn} representing the aspect model.
     * @return the resolved {@link File}, or an empty file if resolution fails.
     */
-   public File determineAspectModelFile( final AspectModelUrn urn ) {
-      Path path = directoryForNamespace( urn ).resolve( urn.getName() + ".ttl" );
+   public File resolveAspectModelFile( final AspectModelUrn urn ) {
+      Path path = constructAspectModelFilePath( urn );
       return resolveByCanonicalPath( path );
    }
 
+   private Path constructAspectModelFilePath( final AspectModelUrn urn ) {
+      return directoryForNamespace( urn ).resolve( urn.getName() + ".ttl" );
+   }
+
    private static File resolveByCanonicalPath( final Path path ) {
       File file = path.toFile();
       try {

tools/samm-cli/src/main/java/org/eclipse/esmf/aas/to/AasToAspectCommand.java

@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2025 Robert Bosch Manufacturing Solutions GmbH
+ *
+ * See the AUTHORS file(s) distributed with this work for additional
+ * information regarding authorship.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.eclipse.esmf.aas.to;
 
 import java.io.BufferedWriter;
@@ -43,13 +56,13 @@ public class AasToAspectCommand extends AbstractCommand {
          names = { "--output-directory", "-d" },
          description = "Output directory to write files to"
    )
-   private String outputPath = ".";
+   private final String outputPath = ".";
 
    @CommandLine.Option(
          names = { "--submodel-template", "-s" },
          description = "Select the submodel template(s) to include, as returned by the aas list command"
    )
-   private List<Integer> selectedOptions = new ArrayList<>();
+   private final List<Integer> selectedOptions = new ArrayList<>();
 
    @CommandLine.Mixin
    private LoggingMixin loggingMixin;
@@ -58,7 +71,7 @@ public class AasToAspectCommand extends AbstractCommand {
    public void run() {
       final String path = parentCommand.parentCommand.getInput();
       final String extension = FilenameUtils.getExtension( path );
-      if ( !extension.equals( "xml" ) && !extension.equals( "json" ) && !extension.equals( "aasx" ) ) {
+      if ( !"xml".equals( extension ) && !"json".equals( extension ) && !"aasx".equals( extension ) ) {
          throw new CommandException( "Input file name must be an .xml, .aasx or .json file" );
       }
       generateAspects( AasToAspectModelGenerator.fromFile( new File( path ) ) );
@@ -76,12 +89,12 @@ private void generateAspects( final AasToAspectModelGenerator generator ) {
 
       for ( final Aspect aspect : filteredAspects ) {
          final String aspectString = AspectSerializer.INSTANCE.aspectToString( aspect );
-         final File targetFile = modelsRoot.determineAspectModelFile( aspect.urn() );
-         LOG.info( "Writing {}", targetFile.getAbsolutePath() );
-         final File directory = targetFile.getParentFile();
+         final File directory = modelsRoot.directoryForNamespace( aspect.urn() ).toFile();
          if ( !directory.exists() && !directory.mkdirs() ) {
             throw new CommandException( "Could not create directory: " + directory.getAbsolutePath() );
          }
+         final File targetFile = modelsRoot.determineAspectModelFile( aspect.urn() );
+         LOG.info( "Writing {}", targetFile.getAbsolutePath() );
          try ( final Writer writer = new BufferedWriter( new FileWriter( targetFile ) ) ) {
             writer.write( aspectString );
          } catch ( final IOException exception ) {