Fix golangci-lint error

free5gc · Aug 2, 2021 · fb08751 · fb08751
1 parent e67bca0
commit fb08751
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/ngapConvert/AmfId.go b/ngapConvert/AmfId.go
@@ -1,9 +1,10 @@
 package ngapConvert
 
 import (
+	"encoding/hex"
+
 	"github.com/free5gc/aper"
 	"github.com/free5gc/ngap/logger"
-	"encoding/hex"
 )
 
 func AmfIdToNgap(amfId string) (regionId, setId, ptrId aper.BitString) {

diff --git a/ngapConvert/BitString.go b/ngapConvert/BitString.go
@@ -1,9 +1,10 @@
 package ngapConvert
 
 import (
+	"encoding/hex"
+
 	"github.com/free5gc/aper"
 	"github.com/free5gc/ngap/logger"
-	"encoding/hex"
 )
 
 func BitStringToHex(bitString *aper.BitString) (hexString string) {

diff --git a/ngapConvert/PlmnId.go b/ngapConvert/PlmnId.go
@@ -1,11 +1,12 @@
 package ngapConvert
 
 import (
+	"encoding/hex"
+	"strings"
+
 	"github.com/free5gc/ngap/logger"
 	"github.com/free5gc/ngap/ngapType"
 	"github.com/free5gc/openapi/models"
-	"encoding/hex"
-	"strings"
 )
 
 func PlmnIdToModels(ngapPlmnId ngapType.PLMNIdentity) (modelsPlmnid models.PlmnId) {
@@ -19,6 +20,7 @@ func PlmnIdToModels(ngapPlmnId ngapType.PLMNIdentity) (modelsPlmnid models.PlmnI
 	}
 	return
 }
+
 func PlmnIdToNgap(modelsPlmnid models.PlmnId) ngapType.PLMNIdentity {
 	var hexString string
 	mcc := strings.Split(modelsPlmnid.Mcc, "")

diff --git a/ngapConvert/PortNumber.go b/ngapConvert/PortNumber.go
@@ -1,8 +1,9 @@
 package ngapConvert
 
 import (
-	"github.com/free5gc/ngap/ngapType"
 	"encoding/binary"
+
+	"github.com/free5gc/ngap/ngapType"
 )
 
 func PortNumberToInt(port ngapType.PortNumber) (portInt32 int32) {

diff --git a/ngapConvert/TimeStamp.go b/ngapConvert/TimeStamp.go
@@ -1,9 +1,10 @@
 package ngapConvert
 
 import (
+	"encoding/binary"
+
 	"github.com/free5gc/aper"
 	"github.com/free5gc/ngap/logger"
-	"encoding/binary"
 )
 
 /*
@@ -36,7 +37,6 @@ RFC 5905 Section 6 https://tools.ietf.org/html/rfc5905#section-6
 
 */
 func TimeStampToInt32(timeStampNgap aper.OctetString) (timeStamp int32) {
-
 	if len(timeStampNgap) != 4 {
 		logger.NgapLog.Error("TimeStampToInt32: the size of OctetString is not 4")
 	}

diff --git a/ngapConvert/TraceData.go b/ngapConvert/TraceData.go
@@ -1,12 +1,13 @@
 package ngapConvert
 
 import (
+	"encoding/hex"
+	"strings"
+
 	"github.com/free5gc/aper"
 	"github.com/free5gc/ngap/logger"
 	"github.com/free5gc/ngap/ngapType"
 	"github.com/free5gc/openapi/models"
-	"encoding/hex"
-	"strings"
 )
 
 func TraceDataToModels(traceActivation ngapType.TraceActivation) (traceData models.TraceData) {
@@ -22,7 +23,7 @@ func TraceDataToNgap(traceData models.TraceData, trsr string) ngapType.TraceActi
 		return traceActivation
 	}
 
-	//NG-RAN Trace ID (left most 6 octet Trace Reference + last 2 octet Trace Recoding Session Reference)
+	// NG-RAN Trace ID (left most 6 octet Trace Reference + last 2 octet Trace Recoding Session Reference)
 	subStringSlice := strings.Split(traceData.TraceRef, "-")
 
 	if len(subStringSlice) != 2 {