rename and simplify

7 files changed, 35 insertions, 43 deletions

diff --git a/client/go/jvm/container.go b/client/go/jvm/container.go
index 5e37e402593..c755672da86 100644
--- a/client/go/jvm/container.go
+++ b/client/go/jvm/container.go
@@ -60,7 +60,7 @@ func readableEnv(env map[string]string) string {
 }
 
 func (cb *containerBase) Exec() {
-	argv := util.ArrayOf(cb.JvmOptions().Args())
+	argv := util.ArrayListOf(cb.JvmOptions().Args())
 	argv.Insert(0, "java")
 	p := prog.NewSpec(argv)
 	p.ConfigureNumaCtl()
diff --git a/client/go/jvm/options.go b/client/go/jvm/options.go
index 6588a365bbd..55749e86709 100644
--- a/client/go/jvm/options.go
+++ b/client/go/jvm/options.go
@@ -17,7 +17,7 @@ import (
 type Options struct {
 	container Container
 	classPath []string
-	jvmArgs   util.Array[string]
+	jvmArgs   util.ArrayList[string]
 	mainClass string
 	fixSpec   util.FixSpec
 }
diff --git a/client/go/script-utils/configserver/runserver.go b/client/go/script-utils/configserver/runserver.go
index 29bd4476ae1..38bee956321 100644
--- a/client/go/script-utils/configserver/runserver.go
+++ b/client/go/script-utils/configserver/runserver.go
@@ -45,7 +45,7 @@ func (rs *RunServer) WouldRun() bool {
 }
 
 func (rs *RunServer) Exec(prog string) {
-	argv := util.Array[string]{
+	argv := util.ArrayList[string]{
 		PROG_NAME,
 		"-s", rs.ServiceName,
 		"-r", "30",
@@ -53,7 +53,7 @@ func (rs *RunServer) Exec(prog string) {
 		"--",
 		prog,
 	}
-	argv.AppendAll(argv)
+	argv.AppendAll(argv...)
 	err := util.Execvp(rs.ProgPath(), argv)
 	util.JustExitWith(err)
 }
diff --git a/client/go/script-utils/startcbinary/numactl.go b/client/go/script-utils/startcbinary/numactl.go
index e60612ccf24..1585d8ddf81 100644
--- a/client/go/script-utils/startcbinary/numactl.go
+++ b/client/go/script-utils/startcbinary/numactl.go
@@ -58,7 +58,7 @@ func (p *ProgSpec) numaCtlBinary() string {
 }
 
 func (p *ProgSpec) prependNumaCtl(args []string) []string {
-	v := util.NewArray[string](5 + len(args))
+	v := util.NewArrayList[string](5 + len(args))
 	v.Append("numactl")
 	if p.numaSocket >= 0 {
 		v.Append(fmt.Sprintf("--cpunodebind=%d", p.numaSocket))
@@ -67,6 +67,6 @@ func (p *ProgSpec) prependNumaCtl(args []string) []string {
 		v.Append("--interleave")
 		v.Append("all")
 	}
-	v.AppendAll(args)
+	v.AppendAll(args...)
 	return v
 }
diff --git a/client/go/script-utils/startcbinary/valgrind.go b/client/go/script-utils/startcbinary/valgrind.go
index 301b8b3986a..ffbbd8cca8d 100644
--- a/client/go/script-utils/startcbinary/valgrind.go
+++ b/client/go/script-utils/startcbinary/valgrind.go
@@ -73,10 +73,10 @@ func (p *ProgSpec) valgrindLogOption() string {
 }
 
 func (p *ProgSpec) prependValgrind(args []string) []string {
-	v := util.NewArray[string](15 + len(args))
+	v := util.NewArrayList[string](15 + len(args))
 	v.Append(p.valgrindBinary())
-	v.AppendAll(p.valgrindOptions())
+	v.AppendAll(p.valgrindOptions()...)
 	v.Append(p.valgrindLogOption())
-	v.AppendAll(args)
+	v.AppendAll(args...)
 	return v
 }
diff --git a/client/go/util/array.go b/client/go/util/array_list.go
index d88f7481b5f..2e74d30fcec 100644
--- a/client/go/util/array.go
+++ b/client/go/util/array_list.go
@@ -4,25 +4,21 @@
 // generic utilities
 package util
 
-type Array[E comparable] []E
+type ArrayList[E comparable] []E
 
-func NewArray[E comparable](initialCapacity int) Array[E] {
+func NewArrayList[E comparable](initialCapacity int) ArrayList[E] {
 	return make([]E, 0, initialCapacity)
 }
 
-func ArrayOf[E comparable](elems []E) Array[E] {
-	return Array[E](elems)
+func ArrayListOf[E comparable](elems []E) ArrayList[E] {
+	return ArrayList[E](elems)
 }
 
-func (arrayP *Array[E]) Append(elem E) {
+func (arrayP *ArrayList[E]) Append(elem E) {
 	*arrayP = append(*arrayP, elem)
 }
 
-func (arrayP *Array[E]) AppendElements(elems ...E) {
-	arrayP.AppendAll(elems)
-}
-
-func (arrayP *Array[E]) AppendAll(elemsToAppend []E) {
+func (arrayP *ArrayList[E]) AppendAll(elemsToAppend ...E) {
 	firstLen := len(*arrayP)
 	secondLen := len(elemsToAppend)
 	totLen := firstLen + secondLen
@@ -38,7 +34,7 @@ func (arrayP *Array[E]) AppendAll(elemsToAppend []E) {
 	}
 }
 
-func (arrayP *Array[E]) Insert(index int, elem E) {
+func (arrayP *ArrayList[E]) Insert(index int, elem E) {
 	cur := *arrayP
 	oldLen := len(cur)
 	result := append(cur, elem)
@@ -49,11 +45,7 @@ func (arrayP *Array[E]) Insert(index int, elem E) {
 	*arrayP = result
 }
 
-func (arrayP *Array[E]) InsertElements(index int, elems ...E) {
-	arrayP.InsertAll(index, elems)
-}
-
-func (arrayP *Array[E]) InsertAll(index int, elemsToInsert []E) {
+func (arrayP *ArrayList[E]) InsertAll(index int, elemsToInsert ...E) {
 	firstLen := len(*arrayP)
 	secondLen := len(elemsToInsert)
 	totLen := firstLen + secondLen
@@ -73,7 +65,7 @@ func (arrayP *Array[E]) InsertAll(index int, elemsToInsert []E) {
 	*arrayP = res
 }
 
-func (arrayP *Array[E]) Contains(elem E) bool {
+func (arrayP *ArrayList[E]) Contains(elem E) bool {
 	for _, old := range *arrayP {
 		if elem == old {
 			return true
@@ -82,7 +74,7 @@ func (arrayP *Array[E]) Contains(elem E) bool {
 	return false
 }
 
-func (arrayP *Array[E]) ForEach(f func(E)) {
+func (arrayP *ArrayList[E]) Each(f func(E)) {
 	for _, elem := range *arrayP {
 		f(elem)
 	}
diff --git a/client/go/util/array_test.go b/client/go/util/array_list_test.go
index 1bf7910ce92..79eab4f8ef2 100644
--- a/client/go/util/array_test.go
+++ b/client/go/util/array_list_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestArrayApi1(t *testing.T) {
-	v := Array[string]{"x", "y", "z"}
+	v := ArrayList[string]{"x", "y", "z"}
 	assert.Equal(t, 3, len(v))
 	v.Append("a")
 	assert.Equal(t, 4, len(v))
@@ -26,37 +26,37 @@ func TestArrayApi1(t *testing.T) {
 
 func TestArrayApi2(t *testing.T) {
 	tmp := []string{"i", "j", "k"}
-	v := NewArray[string](10)
+	v := NewArrayList[string](10)
 	assert.Equal(t, 0, len(v))
 	assert.Equal(t, 10, cap(v))
-	v.AppendAll(tmp)
+	v.AppendAll(tmp...)
 	assert.Equal(t, 3, len(v))
 	assert.Equal(t, 10, cap(v))
-	v.AppendAll(tmp)
+	v.AppendAll(tmp...)
 	assert.Equal(t, 6, len(v))
 	assert.Equal(t, 10, cap(v))
-	v.AppendAll(tmp)
+	v.AppendAll(tmp...)
 	assert.Equal(t, 9, len(v))
 	assert.Equal(t, 10, cap(v))
-	v.AppendAll(tmp)
+	v.AppendAll(tmp...)
 	assert.Equal(t, 12, len(v))
 	assert.Less(t, 11, cap(v))
 }
 
 func TestArrayApi3(t *testing.T) {
 	tmp := []string{"i", "j", "k"}
-	v := Array[string]{
+	v := ArrayList[string]{
 		"foo", "bar",
 		"baz", "qux",
 	}
 	assert.Equal(t, 4, len(v))
-	v.InsertElements(0, "a", "b")
+	v.InsertAll(0, "a", "b")
 	assert.Equal(t, 6, len(v))
-	v.AppendAll(tmp)
+	v.AppendAll(tmp...)
 	assert.Equal(t, 9, len(v))
-	v.AppendElements("x", "y")
+	v.AppendAll("x", "y")
 	assert.Equal(t, 11, len(v))
-	v.InsertElements(4, "foobar", "barfoo")
+	v.InsertAll(4, "foobar", "barfoo")
 	assert.Equal(t, 13, len(v))
 	assert.Equal(t, "a", v[0])
 	assert.Equal(t, "b", v[1])
@@ -74,12 +74,12 @@ func TestArrayApi3(t *testing.T) {
 }
 
 func TestArrayApi4(t *testing.T) {
-	v := NewArray[string](12)
+	v := NewArrayList[string](12)
 	arr := v[0:10]
-	v.InsertAll(0, []string{"a", "b", "e"})
-	v.InsertAll(3, []string{"f", "g", "o"})
-	v.InsertAll(2, []string{"c", "d"})
-	v.InsertAll(7, []string{"h", "i", "j", "k", "l", "m", "n"})
+	v.InsertAll(0, "a", "b", "e")
+	v.InsertAll(3, "f", "g", "o")
+	v.InsertAll(2, "c", "d")
+	v.InsertAll(7, "h", "i", "j", "k", "l", "m", "n")
 	assert.Equal(t, 15, len(v))
 	assert.Equal(t, "a", v[0])
 	assert.Equal(t, "b", v[1])