refactor: remove outdated PythonParameterAssignment values

Author: lars-reimann

server/src/main/kotlin/com/larsreimann/api_editor/codegen/PythonCodeGenerator.kt

@@ -1,8 +1,6 @@
 package com.larsreimann.api_editor.codegen
 
 import com.larsreimann.api_editor.model.ComparisonOperator
-import com.larsreimann.api_editor.model.PythonParameterAssignment.ENUM
-import com.larsreimann.api_editor.model.PythonParameterAssignment.GROUP
 import com.larsreimann.api_editor.model.PythonParameterAssignment.IMPLICIT
 import com.larsreimann.api_editor.model.PythonParameterAssignment.NAME_ONLY
 import com.larsreimann.api_editor.model.PythonParameterAssignment.POSITION_ONLY
@@ -191,10 +189,7 @@ private fun buildParameters(parameters: List<PythonParameter>): String {
             IMPLICIT -> implicitParameters.add(pythonParameter.toPythonCode())
             POSITION_ONLY -> positionOnlyParameters.add(pythonParameter.toPythonCode())
             POSITION_OR_NAME -> positionOrNameParameters.add(pythonParameter.toPythonCode())
-            ENUM -> positionOrNameParameters.add(pythonParameter.toPythonCode())
-            GROUP -> positionOrNameParameters.add(pythonParameter.toPythonCode())
             NAME_ONLY -> nameOnlyParameters.add(pythonParameter.toPythonCode())
-            else -> {}
         }
     }
     assert(implicitParameters.size < 2)

server/src/main/kotlin/com/larsreimann/api_editor/codegen/StubCodeGenerator.kt

@@ -1,10 +1,6 @@
 package com.larsreimann.api_editor.codegen
 
-import com.larsreimann.api_editor.model.PythonParameterAssignment.ENUM
-import com.larsreimann.api_editor.model.PythonParameterAssignment.GROUP
-import com.larsreimann.api_editor.model.PythonParameterAssignment.NAME_ONLY
-import com.larsreimann.api_editor.model.PythonParameterAssignment.POSITION_ONLY
-import com.larsreimann.api_editor.model.PythonParameterAssignment.POSITION_OR_NAME
+import com.larsreimann.api_editor.model.PythonParameterAssignment.IMPLICIT
 import com.larsreimann.api_editor.mutable_model.PythonAttribute
 import com.larsreimann.api_editor.mutable_model.PythonClass
 import com.larsreimann.api_editor.mutable_model.PythonEnum
@@ -169,7 +165,7 @@ private fun createSmlPythonNameAnnotationUse(name: String): SmlAnnotationUse {
 }
 
 internal fun PythonParameter.toSmlParameterOrNull(): SmlParameter? {
-    if (assignedBy !in setOf(POSITION_ONLY, POSITION_OR_NAME, ENUM, GROUP, NAME_ONLY)) {
+    if (assignedBy == IMPLICIT) {
         return null
     }
 

server/src/main/kotlin/com/larsreimann/api_editor/model/packageData.kt

@@ -207,10 +207,6 @@ enum class PythonParameterAssignment {
     POSITION_ONLY,
     POSITION_OR_NAME,
     NAME_ONLY,
-    ATTRIBUTE,
-    CONSTANT,
-    ENUM,
-    GROUP
 }
 
 @Serializable

server/src/main/kotlin/com/larsreimann/api_editor/transformation/Postprocessor.kt

@@ -37,8 +37,6 @@ private fun PythonFunction.reorderParameters() {
     this.parameters.addAll(groups[PythonParameterAssignment.POSITION_ONLY].orEmpty())
     this.parameters.addAll(groups[PythonParameterAssignment.POSITION_OR_NAME].orEmpty())
     this.parameters.addAll(groups[PythonParameterAssignment.NAME_ONLY].orEmpty())
-    this.parameters.addAll(groups[PythonParameterAssignment.ATTRIBUTE].orEmpty())
-    this.parameters.addAll(groups[PythonParameterAssignment.CONSTANT].orEmpty())
 }
 
 /**
@@ -85,7 +83,7 @@ fun PythonPackage.createAttributesForParametersOfConstructor() {
 private fun PythonClass.createAttributesForParametersOfConstructor() {
     this.constructor
         ?.parameters
-        ?.filter { it.assignedBy !in setOf(PythonParameterAssignment.IMPLICIT, PythonParameterAssignment.CONSTANT) }
+        ?.filter { it.assignedBy != PythonParameterAssignment.IMPLICIT }
         ?.forEach {
             this.attributes += PythonAttribute(
                 name = it.name,

server/src/test/kotlin/com/larsreimann/api_editor/codegen/StubCodeGeneratorTest.kt

@@ -49,7 +49,6 @@ import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
-import org.junit.jupiter.params.provider.EnumSource
 
 class StubCodeGeneratorTest {
 
@@ -321,14 +320,6 @@ class StubCodeGeneratorTest {
                         PythonParameter(
                             name = "nameOnly",
                             assignedBy = PythonParameterAssignment.NAME_ONLY
-                        ),
-                        PythonParameter(
-                            name = "attribute",
-                            assignedBy = PythonParameterAssignment.ATTRIBUTE
-                        ),
-                        PythonParameter(
-                            name = "constant",
-                            assignedBy = PythonParameterAssignment.CONSTANT
                         )
                     )
                 )
@@ -611,25 +602,9 @@ class StubCodeGeneratorTest {
                         name = "positionOrName",
                         assignedBy = PythonParameterAssignment.POSITION_OR_NAME
                     ),
-                    PythonParameter(
-                        name = "enum",
-                        assignedBy = PythonParameterAssignment.ENUM
-                    ),
-                    PythonParameter(
-                        name = "group",
-                        assignedBy = PythonParameterAssignment.GROUP
-                    ),
                     PythonParameter(
                         name = "nameOnly",
                         assignedBy = PythonParameterAssignment.NAME_ONLY
-                    ),
-                    PythonParameter(
-                        name = "attribute",
-                        assignedBy = PythonParameterAssignment.ATTRIBUTE
-                    ),
-                    PythonParameter(
-                        name = "constant",
-                        assignedBy = PythonParameterAssignment.CONSTANT
                     )
                 )
             )
@@ -639,8 +614,6 @@ class StubCodeGeneratorTest {
                 .shouldContainExactly(
                     "positionOnly",
                     "positionOrName",
-                    "enum",
-                    "group",
                     "nameOnly"
                 )
         }
@@ -665,12 +638,11 @@ class StubCodeGeneratorTest {
     @Nested
     inner class ToSmlParameter {
 
-        @ParameterizedTest
-        @EnumSource(PythonParameterAssignment::class, names = ["IMPLICIT", "ATTRIBUTE", "CONSTANT"])
-        fun `should return null for invisible parameters`(assignedBy: PythonParameterAssignment) {
+        @Test
+        fun `should return null for implicit parameters`() {
             val pythonParameter = PythonParameter(
                 name = "testParameter",
-                assignedBy = assignedBy
+                assignedBy = PythonParameterAssignment.IMPLICIT
             )
 
             pythonParameter.toSmlParameterOrNull().shouldBeNull()

server/src/test/kotlin/com/larsreimann/api_editor/transformation/EnumAnnotationProcessorTest.kt

@@ -2,7 +2,6 @@ package com.larsreimann.api_editor.transformation
 
 import com.larsreimann.api_editor.model.EnumAnnotation
 import com.larsreimann.api_editor.model.EnumPair
-import com.larsreimann.api_editor.model.PythonParameterAssignment
 import com.larsreimann.api_editor.mutable_model.PythonArgument
 import com.larsreimann.api_editor.mutable_model.PythonCall
 import com.larsreimann.api_editor.mutable_model.PythonDeclaration

server/src/test/kotlin/com/larsreimann/api_editor/transformation/PostprocessorTest.kt

@@ -50,10 +50,6 @@ class PostprocessorTest {
                     PythonParameter(
                         name = "positionOrName",
                         assignedBy = PythonParameterAssignment.POSITION_OR_NAME
-                    ),
-                    PythonParameter(
-                        name = "constant",
-                        assignedBy = PythonParameterAssignment.CONSTANT
                     )
                 )
             ),
@@ -126,18 +122,8 @@ class PostprocessorTest {
                 name = "nameOnly",
                 assignedBy = PythonParameterAssignment.NAME_ONLY
             )
-            val attribute = PythonParameter(
-                name = "attribute",
-                assignedBy = PythonParameterAssignment.ATTRIBUTE
-            )
-            val constant = PythonParameter(
-                name = "constant",
-                assignedBy = PythonParameterAssignment.CONSTANT
-            )
 
             testFunction.parameters += listOf(
-                constant,
-                attribute,
                 nameOnly,
                 positionOrName,
                 positionOnly,
@@ -151,9 +137,7 @@ class PostprocessorTest {
                     implicit,
                     positionOnly,
                     positionOrName,
-                    nameOnly,
-                    attribute,
-                    constant
+                    nameOnly
                 )
             )
         }