Skip to content

Add KotlinType companion object and KotlinProperty const #878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2022
Merged

Add KotlinType companion object and KotlinProperty const #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...tis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2020 the original author or authors.
* Copyright 2006-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,8 @@ public enum KotlinModifier {
PUBLIC("public"), //$NON-NLS-1$
PRIVATE("private"), //$NON-NLS-1$
DATA("data"), //$NON-NLS-1$
LATE_INIT("lateinit"); //$NON-NLS-1$
LATE_INIT("lateinit"), //$NON-NLS-1$
CONST("const"); //$NON-NLS-1$

private final String value;

Expand Down
13 changes: 11 additions & 2 deletions ...mybatis-generator-core/src/main/java/org/mybatis/generator/api/dom/kotlin/KotlinType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2021 the original author or authors.
* Copyright 2006-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,14 +23,16 @@

public class KotlinType extends KotlinNamedItemContainer {

public static final String DEFAULT_COMPANION_OBJECT_NAME = "companion";
private final List<KotlinProperty> constructorProperties = new ArrayList<>();
private final Type type;
private final Set<String> superTypes = new HashSet<>();

public enum Type {
CLASS("class"), //$NON-NLS-1$
INTERFACE("interface"), //$NON-NLS-1$
OBJECT("object"); //$NON-NLS-1$
OBJECT("object"), //$NON-NLS-1$
COMPANION_OBJECT("companion object"); //$NON-NLS-1$

private final String value;

Expand Down Expand Up @@ -87,6 +89,13 @@ public static Builder newObject(String name) {
return new Builder(Type.OBJECT, name);
}

public static Builder newCompanionObject() {
return new Builder(Type.COMPANION_OBJECT, DEFAULT_COMPANION_OBJECT_NAME);
}
public static Builder newCompanionObject(String name) {
return new Builder(Type.COMPANION_OBJECT, name);
}

public static class Builder extends NamedItemContainerBuilder<Builder> {
private final Type type;
private final List<KotlinProperty> constructorProperties = new ArrayList<>();
Expand Down
13 changes: 10 additions & 3 deletions ...or-core/src/main/java/org/mybatis/generator/api/dom/kotlin/render/KotlinTypeRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,16 @@ public List<String> render(KotlinType kotlinType) {

List<String> answer = new ArrayList<>(kotlinType.getAnnotations());

String renderedModifiersAndName = KotlinRenderingUtilities.renderModifiers(kotlinType.getModifiers())
+ kotlinType.getType().getValue() + " " //$NON-NLS-1$
+ kotlinType.getName();
String renderedModifiers = KotlinRenderingUtilities.renderModifiers(kotlinType.getModifiers())
+ kotlinType.getType().getValue(); //$NON-NLS-1$

String renderedModifiersAndName;
if (kotlinType.getType() == KotlinType.Type.COMPANION_OBJECT && kotlinType.getName().equals(KotlinType.DEFAULT_COMPANION_OBJECT_NAME)) {
renderedModifiersAndName = renderedModifiers;
} else {
renderedModifiersAndName = renderedModifiers + " " + kotlinType.getName(); //$NON-NLS-1$
}

String renderedSuperTypes = kotlinType.getSuperTypes().stream()
.sorted()
.collect(CustomCollectors.joining(", ", " : ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Expand Down
135 changes: 135 additions & 0 deletions ...erator-core/src/test/kotlin/org/mybatis/generator/api/dom/kotlin/render/KotlinTypeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,4 +326,139 @@ class KotlinTypeTest {
|class Adder : Serializable
""".trimMargin())
}

@Test
fun testDataClassWithCompanionObjectAndConstVal() {
val obj = KotlinType.newClass("Adder")
.withModifier(KotlinModifier.DATA)
.withConstructorProperty(KotlinProperty.newVal("a")
.withDataType("Int")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("adjustWithConstant")
.withCodeLine("addConstant(a)")
.build())
.withNamedItem(KotlinType.newCompanionObject()
.withNamedItem(KotlinProperty.newVal("VALUE_TO_ADD")
.withModifier(KotlinModifier.CONST)
.withDataType("Int")
.withInitializationString("42")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("addConstant")
.withArgument(KotlinArg.newArg("a").withDataType("Int").build())
.withExplicitReturnType("Int")
.withCodeLine("VALUE_TO_ADD + a")
.build())
.build()
)
.build()

val renderedType = KotlinTypeRenderer().render(obj).stream()
.collect(Collectors.joining(System.getProperty("line.separator")))

assertThat(renderedType).isEqualToNormalizingNewlines("""
|data class Adder(
| val a: Int
|) {
| fun adjustWithConstant() =
| addConstant(a)
|
| companion object {
| const val VALUE_TO_ADD: Int = 42
|
| fun addConstant(a: Int): Int =
| VALUE_TO_ADD + a
| }
|}
""".trimMargin())
}

@Test
fun testRegularClassWithCompanionObjectAndConstVal() {
val obj = KotlinType.newClass("Adder")
.withConstructorProperty(KotlinProperty.newVal("a")
.withDataType("Int")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("adjustWithConstant")
.withCodeLine("addConstant(a)")
.build())
.withNamedItem(KotlinType.newCompanionObject()
.withNamedItem(KotlinProperty.newVal("VALUE_TO_ADD")
.withModifier(KotlinModifier.CONST)
.withDataType("Int")
.withInitializationString("42")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("addConstant")
.withArgument(KotlinArg.newArg("a").withDataType("Int").build())
.withExplicitReturnType("Int")
.withCodeLine("VALUE_TO_ADD + a")
.build())
.build()
)
.build()

val renderedType = KotlinTypeRenderer().render(obj).stream()
.collect(Collectors.joining(System.getProperty("line.separator")))

assertThat(renderedType).isEqualToNormalizingNewlines("""
|class Adder(
| val a: Int
|) {
| fun adjustWithConstant() =
| addConstant(a)
|
| companion object {
| const val VALUE_TO_ADD: Int = 42
|
| fun addConstant(a: Int): Int =
| VALUE_TO_ADD + a
| }
|}
""".trimMargin())
}

@Test
fun testRegularClassWithNamedCompanionObjectAndConstVal() {
val obj = KotlinType.newClass("Adder")
.withConstructorProperty(KotlinProperty.newVal("a")
.withDataType("Int")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("adjustWithConstant")
.withCodeLine("addConstant(a)")
.build())
.withNamedItem(KotlinType.newCompanionObject("Util")
.withNamedItem(KotlinProperty.newVal("VALUE_TO_ADD")
.withModifier(KotlinModifier.CONST)
.withDataType("Int")
.withInitializationString("42")
.build())
.withNamedItem(KotlinFunction.newOneLineFunction("addConstant")
.withAnnotation("@JvmStatic")
.withArgument(KotlinArg.newArg("a").withDataType("Int").build())
.withExplicitReturnType("Int")
.withCodeLine("VALUE_TO_ADD + a")
.build())
.build()
)
.build()

val renderedType = KotlinTypeRenderer().render(obj).stream()
.collect(Collectors.joining(System.getProperty("line.separator")))

assertThat(renderedType).isEqualToNormalizingNewlines("""
|class Adder(
| val a: Int
|) {
| fun adjustWithConstant() =
| addConstant(a)
|
| companion object Util {
| const val VALUE_TO_ADD: Int = 42
|
| @JvmStatic
| fun addConstant(a: Int): Int =
| VALUE_TO_ADD + a
| }
|}
""".trimMargin())
}
}