sunset MapKeys and MapValues

Signed-off-by: Ziv Nevo <nevo@il.ibm.com>

Author: zivnevo

pkg/common/genericSet.go

@@ -42,7 +42,7 @@ func (s GenericSet[T]) AsKey() SetAsKey {
 }
 
 func (s GenericSet[T]) AsList() []T {
-	return MapKeys(s)
+	return slices.Collect(maps.Keys(s))
 }
 
 func FromList[T comparable](l []T) GenericSet[T] {
@@ -76,10 +76,3 @@ func AnyMapEntry[K comparable, V any](m map[K]V) (k K, v V) {
 	}
 	return k, v
 }
-
-func MapValues[K comparable, V any](m map[K]V) []V {
-	return slices.Collect(maps.Values(m))
-}
-func MapKeys[K comparable, V any](m map[K]V) []K {
-	return slices.Collect(maps.Keys(m))
-}

pkg/drawio/layout.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package drawio
 
 import (
+	"maps"
 	"slices"
 	"sort"
 
@@ -466,7 +467,7 @@ func sortIconsBySGs(sgs []SquareTreeNodeInterface) [][]TreeNodeInterface {
 		sgsToIcons[sgsAsKey] = append(sgsToIcons[sgsAsKey], icon)
 	}
 	// covert to list:
-	return common.MapValues(sgsToIcons)
+	return slices.Collect(maps.Values(sgsToIcons))
 }
 
 // ///////////////////////////////////////////////////////////

pkg/linter/linterExecute.go

@@ -8,11 +8,11 @@ package linter
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 	"sort"
 	"strings"
 
-	"github.com/np-guard/vpc-network-config-analyzer/pkg/common"
 	"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
 )
 
@@ -37,7 +37,7 @@ var linterGenerators = map[string]linterGenerator{
 }
 
 func ValidLintersNames() string {
-	return strings.Join(common.MapKeys(linterGenerators), ",")
+	return strings.Join(slices.Collect(maps.Keys(linterGenerators)), ",")
 }
 func IsValidLintersNames(name string) bool {
 	_, ok := linterGenerators[name]