Refactor scancode file adapter

core/src/main/java/com/devonfw/tools/solicitor/componentinfo/scancode/FileScancodeRawComponentInfoProvider.java

@@ -14,7 +14,6 @@
 import com.devonfw.tools.solicitor.common.IOHelper;
 import com.devonfw.tools.solicitor.common.content.web.DirectUrlWebContentProvider;
 import com.devonfw.tools.solicitor.common.packageurl.AllKindsPackageURLHandler;
-import com.devonfw.tools.solicitor.componentinfo.ComponentContentProvider;
 import com.devonfw.tools.solicitor.componentinfo.ComponentInfoAdapterException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -160,29 +159,16 @@ public String retrieveContent(String packageUrl, String fileUri) {
     return this.contentProvider.getContentForUri(directUrl).getContent();
   }
 
-  /**
-   * Checks if the argument seems to be a (relative) path pointing to some content within the package.
-   *
-   * @param path the path to check
-   * @return <code>true</code> if the seems to be a correct path, <code>false</code> otherwise.
-   */
   @Override
-  public boolean isLocalContentPath(String path) {
+  public boolean isLocalContentPath(String packageUrl, String path) {
 
     return (path != null && path.startsWith(SOURCES_DIR));
   }
 
-  /**
-   * Creates a pkgcontent-URI (see {@link ComponentContentProvider}) from the relative local file path.
-   *
-   * @param path the path referencing file content
-   * @return a pkgContent URI which might be used for retrieving the content vis
-   *         {@link ComponentContentProvider#retrieveContent(String, String)}
-   */
   @Override
-  public String pkgContentUriFromPath(String path) {
+  public String pkgContentUriFromPath(String packageUrl, String path) {
 
-    if (!isLocalContentPath(path)) {
+    if (!isLocalContentPath(packageUrl, path)) {
       throw new IllegalArgumentException("'" + path + "' is not a valid path to content within the package");
     }
     return PKG_CONTENT_SCHEMA_PREFIX + path.substring(SOURCES_DIR.length());

core/src/main/java/com/devonfw/tools/solicitor/componentinfo/scancode/ScancodeRawComponentInfoPovider.java

@@ -21,18 +21,22 @@ public interface ScancodeRawComponentInfoPovider extends ComponentContentProvide
   /**
    * Creates a pkgcontent-URI (see {@link ComponentContentProvider}) from the relative local file path.
    *
+   * @param packageUrl the PackageUrl of the component
    * @param path the path referencing file content
+   *
    * @return a pkgContent URI which might be used for retrieving the content vis
    *         {@link ComponentContentProvider#retrieveContent(String, String)}
    */
-  String pkgContentUriFromPath(String path);
+  String pkgContentUriFromPath(String packageUrl, String path);
 
   /**
    * Checks if the argument seems to be a (relative) path pointing to some content within the package.
    *
+   * @param packageUrl the PackageUrl of the component
    * @param path the path to check
+   *
    * @return <code>true</code> if the seems to be a correct path, <code>false</code> otherwise.
    */
-  boolean isLocalContentPath(String path);
+  boolean isLocalContentPath(String packageUrl, String path);
 
 }

core/src/main/java/com/devonfw/tools/solicitor/componentinfo/scancode/UncuratedScancodeComponentInfoProvider.java

@@ -152,7 +152,8 @@ private ScancodeComponentInfo parseAndMapScancodeJson(String packageUrl, Scancod
       }
       if (file.get("path").asText().contains("/NOTICE")) {
         componentScancodeInfos.addNoticeFilePath(
-            this.fileScancodeRawComponentInfoProvider.pkgContentUriFromPath(file.get("path").asText()), 100.0);
+            this.fileScancodeRawComponentInfoProvider.pkgContentUriFromPath(packageUrl, file.get("path").asText()),
+            100.0);
       }
       double licenseTextRatio = file.get("percentage_of_license_text").asDouble();
       boolean takeCompleteFile = licenseTextRatio >= this.licenseToTextRatioToTakeCompleteFile;
@@ -255,8 +256,9 @@ private String normalizeLicenseUrl(String packageUrl, String licenseFilePath) {
             "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses",
             "https://scancode-licensedb.aboutcode.org");
         adjustedLicenseFilePath = adjustedLicenseFilePath.replace("github.com", "raw.github.com").replace("/tree", "");
-      } else if (this.fileScancodeRawComponentInfoProvider.isLocalContentPath(licenseFilePath)) {
-        adjustedLicenseFilePath = this.fileScancodeRawComponentInfoProvider.pkgContentUriFromPath(licenseFilePath);
+      } else if (this.fileScancodeRawComponentInfoProvider.isLocalContentPath(packageUrl, licenseFilePath)) {
+        adjustedLicenseFilePath = this.fileScancodeRawComponentInfoProvider.pkgContentUriFromPath(packageUrl,
+            licenseFilePath);
         LOG.debug("LOCAL LICENSE: " + licenseFilePath);
       }
     }