Apply review comments

Author: lukasz-antoniak

helpers.go

@@ -285,35 +285,25 @@ func apacheToCassandraType(t string) string {
 		// Do not override hex encoded field names
 		idx := strings.Index(class, ":")
 		class = class[idx+1:]
-		act := getApacheCassandraType(class)
-		val := act.String()
-		switch act {
-		case TypeUDT:
-			i += 2 // skip next two parameters (keyspace and type ID), do not attempt to resolve their type
-		case TypeCustom:
-			if isDigitsOnly(class) {
-				// vector types include dimension (digits) as second type parameter
-				// getApacheCassandraType() returns "custom" by default, but we need to leave digits intact
-				val = class
-			} else {
+		val := ""
+		if strings.HasPrefix(class, apacheCassandraTypePrefix) {
+			act := getApacheCassandraType(class)
+			val = act.String()
+			switch act {
+			case TypeUDT:
+				i += 2 // skip next two parameters (keyspace and type ID), do not attempt to resolve their type
+			case TypeCustom:
 				val = getApacheCassandraCustomSubType(class)
 			}
+		} else {
+			val = class
 		}
 		t = strings.Replace(t, class, val, -1)
 	}
 	// This is done so it exactly matches what Cassandra returns
 	return strings.Replace(t, ",", ", ", -1)
 }
 
-func isDigitsOnly(s string) bool {
-	for _, c := range s {
-		if c < '0' || c > '9' {
-			return false
-		}
-	}
-	return true
-}
-
 func getApacheCassandraType(class string) Type {
 	switch strings.TrimPrefix(class, apacheCassandraTypePrefix) {
 	case "AsciiType":

vector_test.go

@@ -369,6 +369,23 @@ func TestVector_SubTypeParsing(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:   "set_map_vector_text_text",
+			custom: "org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.VectorType(org.apache.cassandra.db.marshal.Int32Type, 10),org.apache.cassandra.db.marshal.UTF8Type))",
+			expected: CollectionType{
+				NativeType{typ: TypeSet},
+				nil,
+				CollectionType{
+					NativeType{typ: TypeMap},
+					VectorType{
+						NativeType{typ: TypeCustom, custom: VECTOR_TYPE},
+						NativeType{typ: TypeInt},
+						10,
+					},
+					NativeType{typ: TypeVarchar},
+				},
+			},
+		},
 	}
 
 	for _, test := range tests {