chore: updated license marks in source files

.golangci.yml

@@ -16,7 +16,7 @@ linters:
     - godox
     - gosmopolitan
     - inamedparam
-    #- intrange # disabled while < go1.22
+    - intrange
     - ireturn
     - lll
     - musttag

README.md

@@ -7,6 +7,10 @@
 
 The object model for OpenAPI specification documents.
 
+## Licensing
+
+This library ships under the [SPDX-License-Identifier: Apache-2.0](./LICENSE).
+
 ### FAQ
 
 * What does this do?

auth_test.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 

cache.go

@@ -1,40 +1,28 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 
 import (
+	"maps"
 	"sync"
 )
 
 // ResolutionCache a cache for resolving urls
 type ResolutionCache interface {
-	Get(string) (interface{}, bool)
-	Set(string, interface{})
+	Get(string) (any, bool)
+	Set(string, any)
 }
 
 type simpleCache struct {
 	lock  sync.RWMutex
-	store map[string]interface{}
+	store map[string]any
 }
 
 func (s *simpleCache) ShallowClone() ResolutionCache {
-	store := make(map[string]interface{}, len(s.store))
+	store := make(map[string]any, len(s.store))
 	s.lock.RLock()
-	for k, v := range s.store {
-		store[k] = v
-	}
+	maps.Copy(store, s.store)
 	s.lock.RUnlock()
 
 	return &simpleCache{
@@ -43,7 +31,7 @@ func (s *simpleCache) ShallowClone() ResolutionCache {
 }
 
 // Get retrieves a cached URI
-func (s *simpleCache) Get(uri string) (interface{}, bool) {
+func (s *simpleCache) Get(uri string) (any, bool) {
 	s.lock.RLock()
 	v, ok := s.store[uri]
 
@@ -52,7 +40,7 @@ func (s *simpleCache) Get(uri string) (interface{}, bool) {
 }
 
 // Set caches a URI
-func (s *simpleCache) Set(uri string, data interface{}) {
+func (s *simpleCache) Set(uri string, data any) {
 	s.lock.Lock()
 	s.store[uri] = data
 	s.lock.Unlock()
@@ -80,7 +68,7 @@ func initResolutionCache() {
 }
 
 func defaultResolutionCache() *simpleCache {
-	return &simpleCache{store: map[string]interface{}{
+	return &simpleCache{store: map[string]any{
 		"http://swagger.io/v2/schema.json":       MustLoadSwagger20Schema(),
 		"http://json-schema.org/draft-04/schema": MustLoadJSONSchemaDraft04(),
 	}}

cache_test.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
+
 package spec
 
 import (

circular_test.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
+
 package spec
 
 import (

contact_info.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 

contact_info_test.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 
@@ -33,7 +22,7 @@ var contactInfo = ContactInfo{ContactInfoProps: ContactInfoProps{
 	Name:  "wordnik api team",
 	URL:   "http://developer.wordnik.com",
 	Email: "[email protected]",
-}, VendorExtensible: VendorExtensible{Extensions: map[string]interface{}{"x-teams": "test team"}}}
+}, VendorExtensible: VendorExtensible{Extensions: map[string]any{"x-teams": "test team"}}}
 
 func TestIntegrationContactInfo(t *testing.T) {
 	b, err := json.MarshalIndent(contactInfo, "", "\t")

debug.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 
@@ -40,7 +29,7 @@ func debugOptions() {
 	specLogger = log.New(os.Stdout, "spec:", log.LstdFlags)
 }
 
-func debugLog(msg string, args ...interface{}) {
+func debugLog(msg string, args ...any) {
 	// A private, trivial trace logger, based on go-openapi/spec/expander.go:debugLog()
 	if Debug {
 		_, file1, pos1, _ := runtime.Caller(1)

debug_test.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 

embed.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
+
 package spec
 
 import (

errors.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
+
 package spec
 
 import "errors"

expander.go

@@ -1,16 +1,5 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-FileCopyrightText: Copyright 2015-2025 go-swagger maintainers
+// SPDX-License-Identifier: Apache-2.0
 
 package spec
 
@@ -104,7 +93,7 @@ const rootBase = ".root"
 
 // baseForRoot loads in the cache the root document and produces a fake ".root" base path entry
 // for further $ref resolution
-func baseForRoot(root interface{}, cache ResolutionCache) string {
+func baseForRoot(root any, cache ResolutionCache) string {
 	// cache the root document to resolve $ref's
 	normalizedBase := normalizeBase(rootBase)
 
@@ -116,7 +105,7 @@ func baseForRoot(root interface{}, cache ResolutionCache) string {
 			return normalizedBase
 		}
 
-		root = map[string]interface{}{}
+		root = map[string]any{}
 	}
 
 	cache.Set(normalizedBase, root)
@@ -132,7 +121,7 @@ func baseForRoot(root interface{}, cache ResolutionCache) string {
 // (use ExpandSchemaWithBasePath to resolve external references).
 //
 // Setting the cache is optional and this parameter may safely be left to nil.
-func ExpandSchema(schema *Schema, root interface{}, cache ResolutionCache) error {
+func ExpandSchema(schema *Schema, root any, cache ResolutionCache) error {
 	cache = cacheOrDefault(cache)
 	if root == nil {
 		root = schema
@@ -463,7 +452,7 @@ func expandOperation(op *Operation, resolver *schemaLoader, basePath string) err
 // (use ExpandResponse to resolve external references).
 //
 // Setting the cache is optional and this parameter may safely be left to nil.
-func ExpandResponseWithRoot(response *Response, root interface{}, cache ResolutionCache) error {
+func ExpandResponseWithRoot(response *Response, root any, cache ResolutionCache) error {
 	cache = cacheOrDefault(cache)
 	opts := &ExpandOptions{
 		RelativeBase: baseForRoot(root, cache),
@@ -489,7 +478,7 @@ func ExpandResponse(response *Response, basePath string) error {
 //
 // Notice that it is impossible to reference a json schema in a different document other than root
 // (use ExpandParameter to resolve external references).
-func ExpandParameterWithRoot(parameter *Parameter, root interface{}, cache ResolutionCache) error {
+func ExpandParameterWithRoot(parameter *Parameter, root any, cache ResolutionCache) error {
 	cache = cacheOrDefault(cache)
 
 	opts := &ExpandOptions{
@@ -512,7 +501,7 @@ func ExpandParameter(parameter *Parameter, basePath string) error {
 	return expandParameterOrResponse(parameter, resolver, opts.RelativeBase)
 }
 
-func getRefAndSchema(input interface{}) (*Ref, *Schema, error) {
+func getRefAndSchema(input any) (*Ref, *Schema, error) {
 	var (
 		ref *Ref
 		sch *Schema
@@ -538,7 +527,7 @@ func getRefAndSchema(input interface{}) (*Ref, *Schema, error) {
 	return ref, sch, nil
 }
 
-func expandParameterOrResponse(input interface{}, resolver *schemaLoader, basePath string) error {
+func expandParameterOrResponse(input any, resolver *schemaLoader, basePath string) error {
 	ref, sch, err := getRefAndSchema(input)
 	if err != nil {
 		return err