feat: add pom metadata toggle, fix plugin id in subprojects

Author: PhilippHeuer

pkg/openapi/openapigenerator/template_properties.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 )
 
@@ -12,6 +13,7 @@ type TemplatePropertyDef struct {
 	Description  string
 	DefaultValue string
 	EnvVar       string
+	Boolean      bool
 }
 
 var templatePropertyRegistry = map[string][]TemplatePropertyDef{
@@ -40,6 +42,13 @@ var templatePropertyRegistry = map[string][]TemplatePropertyDef{
 			DefaultValue: "",
 			EnvVar:       "PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_PLUGINMANAGEMENT_REPOSITORYURL",
 		},
+		{
+			Key:          "gradle.pomMetadata.enabled",
+			Description:  "Enable writing custom pom metadata block in root build.gradle.kts",
+			DefaultValue: "true",
+			EnvVar:       "PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_POMMETADATA_ENABLED",
+			Boolean:      true,
+		},
 	},
 	"openapi-kotlin-httpclient": {
 		{
@@ -66,6 +75,13 @@ var templatePropertyRegistry = map[string][]TemplatePropertyDef{
 			DefaultValue: "",
 			EnvVar:       "PRIMECODEGEN_TPL_OPENAPI_KOTLIN_HTTPCLIENT_GRADLE_PLUGINMANAGEMENT_REPOSITORYURL",
 		},
+		{
+			Key:          "gradle.pomMetadata.enabled",
+			Description:  "Enable writing custom pom metadata block in root build.gradle.kts",
+			DefaultValue: "true",
+			EnvVar:       "PRIMECODEGEN_TPL_OPENAPI_KOTLIN_HTTPCLIENT_GRADLE_POMMETADATA_ENABLED",
+			Boolean:      true,
+		},
 	},
 }
 
@@ -110,12 +126,32 @@ func ResolveTemplateProperties(templateId string, provided map[string]string) (m
 	}
 
 	for key, value := range provided {
-		if _, ok := byKey[key]; !ok {
+		def, ok := byKey[key]
+		if !ok {
 			return nil, fmt.Errorf("unknown --tpl-prop key %q for template %s (allowed: %s)", key, templateId, strings.Join(AllowedTemplatePropertyKeys(templateId), ", "))
 		}
+		if def.Boolean {
+			parsedValue, parseErr := strconv.ParseBool(value)
+			if parseErr != nil {
+				return nil, fmt.Errorf("invalid boolean value %q for --tpl-prop key %q", value, key)
+			}
+			value = strconv.FormatBool(parsedValue)
+		}
 		out[key] = value
 	}
 
+	for _, def := range defs {
+		if !def.Boolean {
+			continue
+		}
+		value := out[def.Key]
+		parsedValue, err := strconv.ParseBool(value)
+		if err != nil {
+			return nil, fmt.Errorf("invalid boolean value %q for key %q from default/env/cli", value, def.Key)
+		}
+		out[def.Key] = strconv.FormatBool(parsedValue)
+	}
+
 	return out, nil
 }
 

pkg/openapi/openapigenerator/template_properties_test.go

@@ -33,20 +33,35 @@ func TestResolveTemplatePropertiesDefaults(t *testing.T) {
 	assert.Equal(t, "0.20.1", resolved["gradle.configurationPlugin.version"])
 	assert.Equal(t, "projectConfiguration", resolved["gradle.projectConfiguration.blockName"])
 	assert.Equal(t, "", resolved["gradle.pluginManagement.repositoryUrl"])
+	assert.Equal(t, "true", resolved["gradle.pomMetadata.enabled"])
 }
 
 func TestResolveTemplatePropertiesEnvAndCliPrecedence(t *testing.T) {
 	t.Setenv("PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_CONFIGURATIONPLUGIN_ID", "com.env.configuration")
 	t.Setenv("PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_PLUGINMANAGEMENT_REPOSITORYURL", "https://env.example/maven")
+	t.Setenv("PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_POMMETADATA_ENABLED", "false")
 
 	resolved, err := ResolveTemplateProperties("openapi-java-httpclient", map[string]string{
 		"gradle.configurationPlugin.id":         "com.cli.configuration",
 		"gradle.pluginManagement.repositoryUrl": "https://cli.example/maven",
+		"gradle.pomMetadata.enabled":            "TRUE",
 	})
 	require.NoError(t, err)
 
 	assert.Equal(t, "com.cli.configuration", resolved["gradle.configurationPlugin.id"])
 	assert.Equal(t, "https://cli.example/maven", resolved["gradle.pluginManagement.repositoryUrl"])
+	assert.Equal(t, "true", resolved["gradle.pomMetadata.enabled"])
+}
+
+func TestResolveTemplatePropertiesBooleanValidation(t *testing.T) {
+	t.Setenv("PRIMECODEGEN_TPL_OPENAPI_JAVA_HTTPCLIENT_GRADLE_POMMETADATA_ENABLED", "not-bool")
+	_, err := ResolveTemplateProperties("openapi-java-httpclient", map[string]string{})
+	assert.ErrorContains(t, err, "invalid boolean value")
+
+	_, err = ResolveTemplateProperties("openapi-java-httpclient", map[string]string{
+		"gradle.pomMetadata.enabled": "invalid",
+	})
+	assert.ErrorContains(t, err, "invalid boolean value")
 }
 
 func TestResolveTemplatePropertiesUnknownKey(t *testing.T) {

pkg/template/templates/openapi-java-httpclient/build.gradle.kts.root.gohtml

@@ -5,8 +5,10 @@ plugins {
     alias(libs.plugins.configuration)
 }
 
+val configurationPluginId = libs.plugins.configuration.get().pluginId
+
 subprojects {
-    apply(plugin = libs.plugins.configuration.get().pluginId)
+    apply(plugin = configurationPluginId)
 
     {{ index .Common.GeneratorProperties "gradle.projectConfiguration.blockName" }} {
         type.set(me.philippheuer.projectcfg.domain.ProjectType.LIBRARY)
@@ -22,6 +24,7 @@ subprojects {
 {{- end }}
         javadocLint.set(listOf("none"))
 
+{{- if eq (index .Common.GeneratorProperties "gradle.pomMetadata.enabled") "true" }}
         pom = { pom ->
 {{- if .Metadata.RepositoryUrl }}
             pom.url.set("https://{{ .Metadata.RepositoryUrl }}")
@@ -56,5 +59,6 @@ subprojects {
             }
 {{- end }}
         }
+{{- end }}
     }
 }

pkg/template/templates/openapi-kotlin-httpclient/build.gradle.kts.root.gohtml

@@ -5,8 +5,10 @@ plugins {
     alias(libs.plugins.configuration)
 }
 
+val configurationPluginId = libs.plugins.configuration.get().pluginId
+
 subprojects {
-    apply(plugin = libs.plugins.configuration.get().pluginId)
+    apply(plugin = configurationPluginId)
 
     {{ index .Common.GeneratorProperties "gradle.projectConfiguration.blockName" }} {
         type.set(me.philippheuer.projectcfg.domain.ProjectType.LIBRARY)
@@ -22,6 +24,7 @@ subprojects {
 {{- end }}
         javadocLint.set(listOf("none"))
 
+{{- if eq (index .Common.GeneratorProperties "gradle.pomMetadata.enabled") "true" }}
         pom = { pom ->
 {{- if .Metadata.RepositoryUrl }}
             pom.url.set("https://{{ .Metadata.RepositoryUrl }}")
@@ -56,5 +59,6 @@ subprojects {
             }
 {{- end }}
         }
+{{- end }}
     }
 }