updated code.

1. Resolved merge conflicts.
2. Resolved go linting issues.

pkg/plugin/implementation/schemaValidator/cmd/plugin.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	definition "github.com/beckn/beckn-onix/pkg/plugin/definition"
-	schemaValidator "github.com/beckn/beckn-onix/pkg/plugin/implementation/schemaValidator"
+	schemaValidator "github.com/beckn/beckn-onix/pkg/plugin/implementation/schemavalidator"
 )
 
 // schemaValidatorProvider provides instances of schemaValidator.

pkg/plugin/implementation/schemaValidator/schemaValidator.go

@@ -1,4 +1,4 @@
-package schemaValidator
+package schemavalidator
 
 import (
 	"context"

pkg/plugin/implementation/schemaValidator/schemaValidator_test.go

@@ -1,4 +1,4 @@
-package schemaValidator
+package schemavalidator
 
 import (
 	"context"

pkg/plugin/manager.go

@@ -149,8 +149,15 @@ func (m *Manager) Router(ctx context.Context, cfg *Config) (definition.Router, e
 	if err != nil {
 		return nil, fmt.Errorf("failed to load provider for %s: %w", cfg.ID, err)
 	}
-	return rp.New(ctx, cfg.Config)
-
+	router, closer, err := rp.New(ctx, cfg.Config)
+	if closer != nil {
+		m.addCloser(func() {
+			if err := closer(); err != nil {
+				panic(err)
+			}
+		})
+	}
+	return router, nil
 }
 
 func (m *Manager) Middleware(ctx context.Context, cfg *Config) (func(http.Handler) http.Handler, error) {