Arrange code.

.github/workflows/pull_request.yml

@@ -6,7 +6,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.16'
       - run: go install github.com/jdeflander/goarrange@v1.0.0
         working-directory: ${{ runner.temp }}
       - run: test -z "$(goarrange run -r -d)"
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.56.2
+          version: 'v1.56.2'
           args: -E misspell,godot,whitespace
 
   test:
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.16'
       - run: go test -v ./...
 
   tidy:
@@ -35,6 +35,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.16'
       - run: go mod tidy
       - run: git diff --quiet go.mod go.sum

go.mod

@@ -1,6 +1,6 @@
 module github.com/elimity-com/scim
 
-go 1.21
+go 1.16
 
 require (
 	github.com/di-wu/xsd-datetime v1.0.0

server.go

@@ -60,22 +60,6 @@ type Server struct {
 	log           Logger
 }
 
-type ServerArgs struct {
-	ServiceProviderConfig *ServiceProviderConfig
-	ResourceTypes         []ResourceType
-}
-
-type ServerOption func(*Server)
-
-// WithLogger sets the logger for the server.
-func WithLogger(logger Logger) ServerOption {
-	return func(s *Server) {
-		if logger != nil {
-			s.log = logger
-		}
-	}
-}
-
 func NewServer(args *ServerArgs, opts ...ServerOption) (Server, error) {
 	if args == nil {
 		return Server{}, fmt.Errorf("arguments not provided")
@@ -247,3 +231,19 @@ func (s Server) parseRequestParams(r *http.Request, refSchema schema.Schema, ref
 		StartIndex:      startIndex,
 	}, nil
 }
+
+type ServerArgs struct {
+	ServiceProviderConfig *ServiceProviderConfig
+	ResourceTypes         []ResourceType
+}
+
+type ServerOption func(*Server)
+
+// WithLogger sets the logger for the server.
+func WithLogger(logger Logger) ServerOption {
+	return func(s *Server) {
+		if logger != nil {
+			s.log = logger
+		}
+	}
+}