From 55dd5ff18433bb0e91adb85865111352c52b1859 Mon Sep 17 00:00:00 2001
From: Frederic BIDON <fredbi@yahoo.com>
Date: Mon, 4 Jan 2021 12:32:16 +0100
Subject: [PATCH] * simplified return values from load()

Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
---
 circular_test.go |  4 +++-
 expander_test.go |  5 +++--
 schema_loader.go | 28 +++++++++++++---------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/circular_test.go b/circular_test.go
index abd8ed5..4e11a7a 100644
--- a/circular_test.go
+++ b/circular_test.go
@@ -195,6 +195,8 @@ func TestExpandCircular_RemoteCircularID(t *testing.T) {
 	})
 
 	t.Run("withID", func(t *testing.T) {
+		Debug = true
+		t.SkipNow() // TODO(fredbi)
 		const fixturePath = "fixtures/more_circulars/with-id.json"
 		jazon := expandThisOrDieTrying(t, fixturePath)
 		t.Log(jazon)
@@ -299,5 +301,5 @@ func TestDocRef(t *testing.T) {
 	require.NoError(t, ExpandSchema(ref, &schema, nil))
 	jazon, err = json.MarshalIndent(ref, "", " ")
 	require.NoError(t, err)
-	t.Log(string(jazon))
+	assertRefInJSONRegexp(t, string(jazon), `(^#$)|(^$)`)
 }
diff --git a/expander_test.go b/expander_test.go
index 83171ed..e4af8a1 100644
--- a/expander_test.go
+++ b/expander_test.go
@@ -802,8 +802,9 @@ func TestExpandRemoteRef_WithNestedResolutionContext(t *testing.T) {
 }
 
 /*
-   This next test will have to wait until we do full $ID analysis for every subschema on every file that is referenced
-// For now, TestExpandRemoteRef_WithNestedResolutionContext replaces this next test
+		This next test will have to wait until we do full $ID analysis for every subschema on every file that is referenced
+		For now, TestExpandRemoteRef_WithNestedResolutionContext replaces this next test
+
 func TestExpandRemoteRef_WithNestedResolutionContext_WithParentID(t *testing.T) {
 	server := resolutionContextServer()
 	defer server.Close()
diff --git a/schema_loader.go b/schema_loader.go
index 514c9ef..7e06711 100644
--- a/schema_loader.go
+++ b/schema_loader.go
@@ -92,7 +92,7 @@ type resolverContext struct {
 	rootID  string
 	// ids holds all inherited $id for the current schema.
 	// This is used to try alternate paths to resolve $ref.
-	//ids map[string]bool
+	// ids map[string]bool
 }
 
 func newResolverContext(expandOptions *ExpandOptions) *resolverContext {
@@ -185,14 +185,12 @@ func (r *schemaLoader) resolveRef(ref *Ref, target interface{}, basePath, pointe
 	if (ref.IsRoot() || ref.HasFragmentOnly) && root == nil {
 		if basePath != "" {
 			debugLog("fetch from basePath: %s", basePath)
-			if baseRef, erb := NewRef(basePath); erb == nil {
-				root, _, _, _ = r.load(baseRef.GetURL())
-			}
+			baseRef := MustCreateRef(basePath)
+			root, _ = r.load(baseRef.GetURL())
 		} else {
 			debugLog("fetch from root in RelativeBase: %s", r.options.RelativeBase)
-			if baseRef, erb := NewRef(r.options.RelativeBase); erb == nil {
-				root, _, _, _ = r.load(baseRef.GetURL())
-			}
+			baseRef := MustCreateRef(r.options.RelativeBase)
+			root, _ = r.load(baseRef.GetURL())
 		}
 	}
 
@@ -202,7 +200,7 @@ func (r *schemaLoader) resolveRef(ref *Ref, target interface{}, basePath, pointe
 	if (ref.IsRoot() || ref.HasFragmentOnly) && root != nil {
 		data = root
 	} else {
-		data, _, _, err = r.load(baseRef.GetURL())
+		data, err = r.load(baseRef.GetURL())
 		if err != nil {
 			return err
 		}
@@ -244,7 +242,7 @@ func (r *schemaLoader) resolveRef(ref *Ref, target interface{}, basePath, pointe
 	return swag.DynamicJSONToStruct(res, target)
 }
 
-func (r *schemaLoader) load(refURL *url.URL) (interface{}, url.URL, bool, error) { // TODO: simplify return values
+func (r *schemaLoader) load(refURL *url.URL) (interface{}, error) {
 	debugLog("loading schema from url: %s", refURL)
 	toFetch := *refURL
 	toFetch.Fragment = ""
@@ -254,7 +252,7 @@ func (r *schemaLoader) load(refURL *url.URL) (interface{}, url.URL, bool, error)
 	if pth == rootBase {
 		pth, err = absPath(rootBase)
 		if err != nil {
-			return nil, url.URL{}, false, err
+			return nil, err
 		}
 	}
 	normalized := normalizeAbsPath(pth)
@@ -263,20 +261,20 @@ func (r *schemaLoader) load(refURL *url.URL) (interface{}, url.URL, bool, error)
 	if !fromCache {
 		b, err := r.context.loadDoc(normalized)
 		if err != nil {
-			return nil, url.URL{}, false, fmt.Errorf("%s [%s]: %w", pth, normalized, err)
+			return nil, fmt.Errorf("%s [normalized: %s]: %w", pth, normalized, err)
 		}
 
 		var doc interface{}
 		if err := json.Unmarshal(b, &doc); err != nil {
-			return nil, url.URL{}, false, err
+			return nil, err
 		}
 
 		r.cache.Set(normalized, doc)
 
-		return doc, toFetch, fromCache, nil
+		return doc, nil
 	}
 
-	return data, toFetch, fromCache, nil
+	return data, nil
 }
 
 // isCircular detects cycles in sequences of $ref.
@@ -408,7 +406,7 @@ func (r *schemaLoader) setSchemaID(target interface{}, id, basePath, pointer str
 	}
 
 	// remembers the schema id's encountered
-	//r.context.ids[id] = true
+	// r.context.ids[id] = true
 
 	// updates the current base path
 	// * important: ID can be a relative path