From 6d01b2d853adfc6a3db6e80dcaa0efac7eb182e4 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 29 Dec 2022 15:08:49 +0100
Subject: [PATCH] Clean up CodegenExt

---
 .../kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt
index 832faf2..6851151 100644
--- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt
+++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/CodegenExt.kt
@@ -100,12 +100,9 @@ fun TypeSpec.Builder.annotation(annotation: ClassName, generate: Action<Annotati
 fun TypeSpec.Builder.modifiers(vararg modifiers: Modifier) = addModifiers(*modifiers)
 fun TypeSpec.Builder.typeVariable(typeVariable: TypeVariableName) = addTypeVariable(typeVariable)
 fun TypeSpec.Builder.superInterface(superInterface: TypeName) = addSuperinterface(superInterface)
-fun TypeSpec.Builder.superInterface(superInterface: Type) = addSuperinterface(superInterface)
-fun TypeSpec.Builder.superInterface(superInterface: Type, avoidNestedTypeNameClashes: Boolean) = addSuperinterface(superInterface, avoidNestedTypeNameClashes)
-fun TypeSpec.Builder.superInterface(superInterface: TypeMirror) = addSuperinterface(superInterface)
-fun TypeSpec.Builder.superInterface(superInterface: TypeMirror, avoidNestedTypeNameClashes: Boolean) = addSuperinterface(superInterface, avoidNestedTypeNameClashes)
-fun TypeSpec.Builder.enumConstant(name: String) = addEnumConstant(name)
-fun TypeSpec.Builder.enumConstant(name: String, typeSpec: TypeSpec) = addEnumConstant(name, typeSpec)
+fun TypeSpec.Builder.superInterface(superInterface: Type, avoidNestedTypeNameClashes: Boolean = true) = addSuperinterface(superInterface, avoidNestedTypeNameClashes)
+fun TypeSpec.Builder.superInterface(superInterface: TypeMirror, avoidNestedTypeNameClashes: Boolean = true) = addSuperinterface(superInterface, avoidNestedTypeNameClashes)
+fun TypeSpec.Builder.enumConstant(name: String, typeSpec: TypeSpec? = null) = if (typeSpec == null) addEnumConstant(name) else addEnumConstant(name, typeSpec)
 fun TypeSpec.Builder.field(type: Type, name: String, vararg modifiers: Modifier, generate: Action<FieldSpec.Builder>? = null) = addField(FieldSpec.builder(type, name, *modifiers).runAction(generate).build())
 fun TypeSpec.Builder.field(type: TypeName, name: String, vararg modifiers: Modifier, generate: Action<FieldSpec.Builder>? = null) = addField(FieldSpec.builder(type, name, *modifiers).runAction(generate).build())
 fun TypeSpec.Builder.field(name: String, value: Boolean, vararg modifiers: Modifier) = field(Boolean::class.java, name, *modifiers) { initializer("$value") }
@@ -145,8 +142,8 @@ fun MethodSpec.Builder.annotation(annotation: Class<*>, generate: Action<Annotat
 fun MethodSpec.Builder.annotation(annotation: ClassName, generate: Action<AnnotationSpec.Builder>? = null) = addAnnotation(AnnotationSpec.builder(annotation).runAction(generate).build())
 fun MethodSpec.Builder.modifiers(vararg modifiers: Modifier) = addModifiers(*modifiers)
 fun MethodSpec.Builder.typeVariable(typeVariable: TypeVariableName) = addTypeVariable(typeVariable)
-fun MethodSpec.Builder.parameter(type: Type, name: String, vararg modifiers: Modifier, generate: Action<ParameterSpec.Builder>) = addParameter(ParameterSpec.builder(type, name, *modifiers).runAction(generate).build())
-fun MethodSpec.Builder.parameter(type: TypeName, name: String, vararg modifiers: Modifier, generate: Action<ParameterSpec.Builder>) = addParameter(ParameterSpec.builder(type, name, *modifiers).runAction(generate).build())
+fun MethodSpec.Builder.parameter(type: Type, name: String, vararg modifiers: Modifier, generate: Action<ParameterSpec.Builder>? = null) = addParameter(ParameterSpec.builder(type, name, *modifiers).runAction(generate).build())
+fun MethodSpec.Builder.parameter(type: TypeName, name: String, vararg modifiers: Modifier, generate: Action<ParameterSpec.Builder>? = null) = addParameter(ParameterSpec.builder(type, name, *modifiers).runAction(generate).build())
 fun MethodSpec.Builder.exception(exception: Type) = addException(exception)
 fun MethodSpec.Builder.exception(exception: TypeName) = addException(exception)
 fun MethodSpec.Builder.code(generate: Action<CodeBlock.Builder>) = addCode(CodeBlock.builder().runAction(generate).build())