Reverted changes linter made to packages

US-JOET · Jun 20, 2024 · 8b42be9 · 8b42be9
1 parent 9d9a3fc
commit 8b42be9
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 27 deletions.
diff --git a/manager/api/render.go b/manager/api/render.go
@@ -2,9 +2,7 @@
 
 package api
 
-import (
-	"net/http"
-)
+import "net/http"
 
 func (c ChargeStationAuth) Bind(r *http.Request) error {
 	return nil

diff --git a/manager/api/server.go b/manager/api/server.go
@@ -3,20 +3,18 @@
 package api
 
 import (
-	"context"
 	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/thoughtworks/maeve-csms/manager/config"
 	handlers "github.com/thoughtworks/maeve-csms/manager/handlers/ocpp201"
 	"github.com/thoughtworks/maeve-csms/manager/ocpi"
-
+	"net/http"
+	"time"
+	"context"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/go-chi/render"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
 	"github.com/thoughtworks/maeve-csms/manager/store"
+	"github.com/thoughtworks/maeve-csms/manager/config"
 	"golang.org/x/exp/slog"
 	"k8s.io/utils/clock"
 )

diff --git a/manager/handlers/call_maker.go b/manager/handlers/call_maker.go
@@ -5,12 +5,11 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"reflect"
-
 	"github.com/google/uuid"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	"github.com/thoughtworks/maeve-csms/manager/transport"
 	"golang.org/x/exp/slog"
+	"reflect"
 )
 
 // OcppCallMaker is an implementation of the CallMaker interface for a specific set of OCPP messages.

diff --git a/manager/handlers/ocpp201/request_start_transaction_result.go b/manager/handlers/ocpp201/request_start_transaction_result.go
@@ -4,7 +4,6 @@ package ocpp201
 
 import (
 	"context"
-
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	types "github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
 	"go.opentelemetry.io/otel/attribute"

diff --git a/manager/handlers/ocpp201/routing.go b/manager/handlers/ocpp201/routing.go
@@ -3,17 +3,16 @@
 package ocpp201
 
 import (
-	"io/fs"
-	"reflect"
-	"time"
-
 	"github.com/thoughtworks/maeve-csms/manager/handlers"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
 	"github.com/thoughtworks/maeve-csms/manager/services"
 	"github.com/thoughtworks/maeve-csms/manager/store"
 	"github.com/thoughtworks/maeve-csms/manager/transport"
+	"io/fs"
 	"k8s.io/utils/clock"
+	"reflect"
+	"time"
 )
 
 func NewRouter(emitter transport.Emitter,

diff --git a/manager/handlers/ocpp201/set_charging_profile_result.go b/manager/handlers/ocpp201/set_charging_profile_result.go
@@ -4,7 +4,6 @@ package ocpp201
 
 import (
 	"context"
-
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	types "github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
 	"golang.org/x/exp/slog"

diff --git a/manager/handlers/ocpp201/trigger_message_result.go b/manager/handlers/ocpp201/trigger_message_result.go
@@ -4,7 +4,6 @@ package ocpp201
 
 import (
 	"context"
-
 	"github.com/thoughtworks/maeve-csms/manager/ocpp"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
 	"github.com/thoughtworks/maeve-csms/manager/store"

diff --git a/manager/handlers/router.go b/manager/handlers/router.go
@@ -7,14 +7,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/fs"
-
 	"github.com/santhosh-tekuri/jsonschema"
 	"github.com/thoughtworks/maeve-csms/manager/schemas"
 	"github.com/thoughtworks/maeve-csms/manager/transport"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/slog"
+	"io/fs"
 )
 
 // Router is the primary implementation of the transport.Router interface.

diff --git a/manager/sync/triggers.go b/manager/sync/triggers.go
@@ -5,8 +5,6 @@ package sync
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/thoughtworks/maeve-csms/manager/handlers"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp16"
 	"github.com/thoughtworks/maeve-csms/manager/ocpp/ocpp201"
@@ -15,6 +13,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/slog"
 	"k8s.io/utils/clock"
+	"time"
 )
 
 func SyncTriggers(ctx context.Context,

diff --git a/manager/transport/mqtt/listener.go b/manager/transport/mqtt/listener.go
@@ -5,11 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"math/rand"
-	"net/url"
-	"strings"
-	"time"
-
 	"github.com/eclipse/paho.golang/autopaho"
 	"github.com/eclipse/paho.golang/paho"
 	"github.com/thoughtworks/maeve-csms/manager/transport"
@@ -21,6 +16,10 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
 	"golang.org/x/exp/slog"
+	"math/rand"
+	"net/url"
+	"strings"
+	"time"
 )
 
 type Listener struct {