From ff6a657fda9c4e001f0714e55de90b3be547561a Mon Sep 17 00:00:00 2001
From: "A.J. Stein" <alexander.stein@nist.gov>
Date: Mon, 3 Jul 2023 15:59:51 -0400
Subject: [PATCH] [WIP] Adding URI resolver for #16.

---
 .../oscal/lib/profile/resolver/ProfileResolver.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 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
index 7429b824..d3b5d704 100644
--- 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