diff pkg/imports/wfsjob.go @ 5712:6270951dda28 revive-cleanup

/interface{}/any/
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 20 Feb 2024 22:37:51 +0100
parents 2dd155cc95ec
children
line wrap: on
line diff
--- a/pkg/imports/wfsjob.go	Tue Feb 20 22:22:57 2024 +0100
+++ b/pkg/imports/wfsjob.go	Tue Feb 20 22:37:51 2024 +0100
@@ -43,9 +43,9 @@
 		Commit() error
 		Rollback() error
 
-		NewFeature() (kind string, properties interface{})
+		NewFeature() (kind string, properties any)
 
-		Consume(geom, properties interface{}, epsg int) error
+		Consume(geom, properties any, epsg int) error
 	}
 
 	// WFSFeatureJobCreator is a factory to create feature consumers.
@@ -66,16 +66,16 @@
 )
 
 var (
-	kindToGeometry = map[string]func() interface{}{
+	kindToGeometry = map[string]func() any{
 		// TODO: extend me!
-		"Point":           func() interface{} { return new(pointSlice) },
-		"LineString":      func() interface{} { return new(lineSlice) },
-		"MultiLineString": func() interface{} { return new(multiLineSlice) },
+		"Point":           func() any { return new(pointSlice) },
+		"LineString":      func() any { return new(lineSlice) },
+		"MultiLineString": func() any { return new(multiLineSlice) },
 	}
 
-	wrapGeomKind = map[[2]string]func(interface{}) interface{}{
+	wrapGeomKind = map[[2]string]func(any) any{
 		// TODO: extend me!
-		{"LineString", "MultiLineString"}: func(x interface{}) interface{} {
+		{"LineString", "MultiLineString"}: func(x any) any {
 			return &multiLineSlice{*x.(*lineSlice)}
 		},
 	}
@@ -131,7 +131,7 @@
 	_ int64,
 	conn *sql.Conn,
 	feedback Feedback,
-) (interface{}, error) {
+) (any, error) {
 
 	start := time.Now()
 
@@ -226,7 +226,7 @@
 			}
 
 			// Optional wrapping
-			wrap := func(x interface{}) interface{} { return x }
+			wrap := func(x any) any { return x }
 			if feature.Geometry.Type != kind {
 				// Look if we can wrap it
 				if wrap = wrapGeomKind[[2]string{feature.Geometry.Type, kind}]; wrap == nil {
@@ -298,8 +298,8 @@
 	ctx        context.Context
 	tx         *sql.Tx
 	feedback   Feedback
-	consume    func(*SQLGeometryConsumer, interface{}, interface{}, int) error
-	newFeature func() (string, interface{})
+	consume    func(*SQLGeometryConsumer, any, any, int) error
+	newFeature func() (string, any)
 	preCommit  func(*SQLGeometryConsumer) error
 	savepoint  func(func() error) error
 	stmts      []*sql.Stmt
@@ -337,13 +337,13 @@
 }
 
 // NewFeature forwards the feature creation.
-func (sgc *SQLGeometryConsumer) NewFeature() (string, interface{}) {
+func (sgc *SQLGeometryConsumer) NewFeature() (string, any) {
 	return sgc.newFeature()
 }
 
 // Consume forwards the consumption of the given feature.
 func (sgc *SQLGeometryConsumer) Consume(
-	geom, properties interface{},
+	geom, properties any,
 	epsg int,
 ) error {
 	return sgc.consume(sgc, geom, properties, epsg)
@@ -352,7 +352,7 @@
 // ConsumePolygon forwards the consumption of a polygon.
 func (sgc *SQLGeometryConsumer) ConsumePolygon(
 	polygon polygonSlice,
-	properties interface{},
+	properties any,
 	epsg int,
 ) error {
 	return sgc.consume(sgc, polygon, properties, epsg)
@@ -360,9 +360,9 @@
 
 func newSQLConsumer(
 	init func(*SQLGeometryConsumer) error,
-	consume func(*SQLGeometryConsumer, interface{}, interface{}, int) error,
+	consume func(*SQLGeometryConsumer, any, any, int) error,
 	preCommit func(*SQLGeometryConsumer) error,
-	newFeature func() (string, interface{}),
+	newFeature func() (string, any),
 
 ) func(context.Context, *sql.Conn, Feedback) (WFSFeatureConsumer, error) {
 	return func(ctx context.Context, conn *sql.Conn, feedback Feedback) (WFSFeatureConsumer, error) {