[WIP] Adding URI resolver for #16.

usnistgov · Jul 3, 2023 · 8affdef · 8affdef
1 parent 81e184f
commit 8affdef
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java b/src/main/java/gov/nist/secauto/oscal/lib/profile/resolver/ProfileResolver.java
@@ -196,6 +196,14 @@ public IDocumentNodeItem resolveProfile(@NonNull File file) throws IOException,
   protected IDocumentNodeItem resolveProfile(
       @NonNull IDocumentNodeItem profileDocument,
       @NonNull Stack<URI> importHistory) throws IOException, ProfileResolutionException {
+    return resolveProfile(profileDocument, importHistory, profileDocument.getBaseUri());
+  }
+
+  @NonNull
+  protected IDocumentNodeItem resolveProfile(
+      @NonNull IDocumentNodeItem profileDocument,
+      @NonNull Stack<URI> importHistory,
+      @NonNull URI resolvedCatalogUri) throws IOException, ProfileResolutionException {
     Catalog resolvedCatalog = new Catalog();
 
     generateMetadata(resolvedCatalog, profileDocument);
@@ -210,7 +218,7 @@ protected IDocumentNodeItem resolveProfile(
             ObjectUtils.notNull(
                 (IAssemblyClassBinding) OscalBindingContext.instance().getClassBinding(Catalog.class))),
         resolvedCatalog,
-        profileDocument.getBaseUri());
+        resolvedCatalogUri);
   }
 
   @NonNull