Fix stutter when project name includes "operator" (#12)

Signed-off-by: jesus m. rodriguez <[email protected]>

Author: jmrodri

pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go

@@ -39,12 +39,12 @@ func (f *OperatorFile) SetTemplateDefaults() error {
 		return fmt.Errorf("invalid operator name")
 	}
 
+	if strings.HasSuffix(f.OperatorName, "Operator") {
+		f.OperatorName = strings.TrimSuffix(f.OperatorName, "Operator")
+	}
+
 	if f.Path == "" {
-		if strings.HasSuffix(strings.ToLower(f.OperatorName), "operator") {
-			f.Path = util.PrependJavaPath(f.OperatorName+".java", util.AsPath(f.Package))
-		} else {
-			f.Path = util.PrependJavaPath(f.OperatorName+"Operator.java", util.AsPath(f.Package))
-		}
+		f.Path = util.PrependJavaPath(f.OperatorName+"Operator.java", util.AsPath(f.Package))
 	}
 
 	f.TemplateBody = operatorTemplate

pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile_test.go

@@ -0,0 +1,33 @@
+package templates
+
+import (
+	"bytes"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"text/template"
+)
+
+var _ = Describe("operatorfile", func() {
+
+	Describe("SetTemplateDefaults", func() {
+		It("Should not stutter operator", func() {
+
+			of := OperatorFile{
+				OperatorName: "MemcachedQuarkusOperator",
+			}
+
+			err := of.SetTemplateDefaults()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(of.Path).To(HaveSuffix("MemcachedQuarkusOperator.java"))
+
+			tmpl, err := template.New("operatorfile").Parse(of.TemplateBody)
+			Expect(err).ToNot(HaveOccurred())
+			buf := new(bytes.Buffer)
+			err = tmpl.Execute(buf, of)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(buf.String()).To(ContainSubstring("public class MemcachedQuarkusOperator "))
+		})
+	})
+})

pkg/quarkus/v1alpha/scaffolds/internal/templates/templates_suite_test.go

@@ -0,0 +1,13 @@
+package templates
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestTemplates(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "operatorfile")
+}