moved api key resolution to the ScanApi class

Author: eeisegn

src/main/java/com/scanoss/Scanner.java

@@ -132,7 +132,7 @@ private Scanner(Boolean skipSnippets, Boolean allExtensions, Boolean obfuscate,
         this.timeout = timeout;
         this.retryLimit = retryLimit;
         this.url = url;
-        this.apiKey = resolveApiKey(apiKey);
+        this.apiKey = apiKey;
         this.scanFlags = scanFlags;
         this.sbomType = sbomType;
         this.sbom = sbom;
@@ -171,28 +171,6 @@ private Scanner(Boolean skipSnippets, Boolean allExtensions, Boolean obfuscate,
         this.folderFilter = Objects.requireNonNullElseGet(folderFilter, () -> FolderFilterFactory.build(this.filterConfig));
     }
 
-    /**
-     * Resolve the API key for Scanoss API
-     *
-     * @param apiKey The API key provided by the user
-     * @return The resolved API key, either from the user-provided value or environment variable
-     */
-    private static String resolveApiKey(String apiKey) {
-        if (apiKey != null && !apiKey.isBlank()) {
-            return apiKey;
-        }
-        try {
-            String envApiKey = System.getenv("SCANOSS_API_KEY");
-            if (envApiKey != null && !envApiKey.isBlank()) {
-                log.debug( "Using SCANOSS_API_KEY env value");
-                return envApiKey;
-            }
-        } catch (RuntimeException e) {
-            log.warn("Unable to read SCANOSS_API_KEY from environment: {}", e.getMessage());
-        }
-        return apiKey;
-    }
-
     /**
      * Generate a WFP/Fingerprint for the given file
      *

src/main/java/com/scanoss/rest/ScanApi.java

@@ -84,7 +84,7 @@ private ScanApi(String scanType, Duration timeout, Integer retryLimit, String ur
         this.timeout = timeout;
         this.retryLimit = retryLimit;
         this.url = url;
-        this.apiKey = apiKey;
+        this.apiKey = resolveApiKey(apiKey);
         this.flags = flags;
         this.sbomType = sbomType;
         this.sbom = sbom;
@@ -130,6 +130,28 @@ private ScanApi(String scanType, Duration timeout, Integer retryLimit, String ur
         }
     }
 
+    /**
+     * Resolve the API key for Scanoss API
+     *
+     * @param apiKey The API key provided by the user
+     * @return The resolved API key, either from the user-provided value or environment variable
+     */
+    private static String resolveApiKey(String apiKey) {
+        if (apiKey != null && !apiKey.isBlank()) {
+            return apiKey;
+        }
+        try {
+            String envApiKey = System.getenv("SCANOSS_API_KEY");
+            if (envApiKey != null && !envApiKey.isBlank()) {
+                log.debug( "Using SCANOSS_API_KEY env value");
+                return envApiKey;
+            }
+        } catch (RuntimeException e) {
+            log.warn("Unable to read SCANOSS_API_KEY from environment: {}", e.getMessage());
+        }
+        return apiKey;
+    }
+
     /**
      * Scan the given WFP
      *