Skip to content

Commit a536db8

Browse files
haunerhauner
committed
fix duplicate onOf interface (openapi-processor/openapi-processor-spring#392)
1 parent 47420d7 commit a536db8

11 files changed

Lines changed: 84 additions & 54 deletions

File tree

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/AllOfObjectDataType.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class AllOfObjectDataType(
1414
private val items: List<DataType> = emptyList(),
1515
override val deprecated: Boolean = false
1616
): ModelDataType {
17-
private val _implementsDataTypes: MutableCollection<InterfaceDataType> = mutableListOf()
18-
override val implementsDataTypes: Collection<InterfaceDataType>
19-
get() = _implementsDataTypes.toList()
17+
private val _implementsDataTypes: MutableSet<InterfaceDataType> = mutableSetOf()
18+
override val implementsDataTypes: Set<InterfaceDataType>
19+
get() = _implementsDataTypes
2020

2121
override fun getName(): String {
2222
return name.id

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/DataTypeName.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Copyright © 2021 https://github.com/openapi-processor/openapi-processor-core
2+
* Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
33
* PDX-License-Identifier: Apache-2.0
44
*/
55

66
package io.openapiprocessor.core.model.datatypes
77

8-
open class DataTypeName(val id: String, val type: String = id)
8+
data class DataTypeName(val id: String, val type: String = id)

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/InterfaceDataType.kt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,25 @@ class InterfaceDataType(
4949
override fun getImports(): Set<String> {
5050
return setOf("${getPackageName()}.${getTypeName()}")
5151
}
52+
53+
override fun equals(other: Any?): Boolean {
54+
if (this === other)
55+
return true
56+
57+
if (javaClass != other?.javaClass)
58+
return false
59+
60+
other as InterfaceDataType
61+
62+
if (name != other.name) return false
63+
if (pkg != other.pkg) return false
64+
65+
return true
66+
}
67+
68+
override fun hashCode(): Int {
69+
var result = name.hashCode()
70+
result = 31 * result + pkg.hashCode()
71+
return result
72+
}
5273
}

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/ModelDataType.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface ModelDataType: DataType {
99
/**
1010
* implements interfaces.
1111
*/
12-
val implementsDataTypes: Collection<InterfaceDataType>
12+
val implementsDataTypes: Set<InterfaceDataType>
1313

1414
/**
1515
* loop object properties.

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/ObjectDataType.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ open class ObjectDataType(
1919
override val deprecated: Boolean = false,
2020
override val documentation: Documentation? = null
2121
): ModelDataType {
22-
private val _implementsDataTypes: MutableCollection<InterfaceDataType> = mutableListOf()
23-
override val implementsDataTypes: Collection<InterfaceDataType>
24-
get() = _implementsDataTypes.toList()
22+
private val _implementsDataTypes: MutableSet<InterfaceDataType> = mutableSetOf()
23+
override val implementsDataTypes: Set<InterfaceDataType>
24+
get() = _implementsDataTypes
2525

2626
override fun getName(): String {
2727
return name.id
@@ -79,8 +79,7 @@ open class ObjectDataType(
7979
private val implementsImports: Set<String>
8080
get() {
8181
return implementsDataTypes
82-
.map { it.getImports() }
83-
.flatten()
82+
.flatMap { it.getImports() }
8483
.toSet()
8584
}
8685
}

‎openapi-processor-core/src/test/groovy/io/openapiprocessor/core/support/datatypes/DataTypeName.groovy‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎openapi-processor-core/src/test/groovy/io/openapiprocessor/core/writer/java/StringEnumWriterSpec.groovy‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package io.openapiprocessor.core.writer.java
77

88
import io.openapiprocessor.core.converter.ApiOptions
99
import io.openapiprocessor.core.model.Documentation
10+
import io.openapiprocessor.core.model.datatypes.DataTypeName
1011
import io.openapiprocessor.core.model.datatypes.StringEnumDataType
11-
import io.openapiprocessor.core.support.datatypes.DataTypeName
1212
import spock.lang.Specification
1313

1414
class StringEnumWriterSpec extends Specification {
@@ -19,10 +19,18 @@ class StringEnumWriterSpec extends Specification {
1919
def writer = new StringEnumWriter(options, identifier, generatedWriter, javadocWriter)
2020
def target = new StringWriter ()
2121

22+
private DataTypeName dataTypeName(String id) {
23+
return new DataTypeName(id, id)
24+
}
25+
26+
private DataTypeName dataTypeName(String id, String type) {
27+
return new DataTypeName(id, type)
28+
}
29+
2230
void "writes 'package'" () {
2331
def pkg = 'com.github.hauner.openapi'
2432
def dataType = new StringEnumDataType(
25-
new DataTypeName('Foo'), pkg, [], null, false, null)
33+
dataTypeName('Foo'), pkg, [], null, false, null)
2634

2735
when:
2836
writer.write (target, dataType)
@@ -36,7 +44,7 @@ package $pkg;
3644

3745
void "writes javadoc comment" () {
3846
def dataType = new StringEnumDataType(
39-
new DataTypeName('Foo'), 'pkg', [], null, false,
47+
dataTypeName('Foo'), 'pkg', [], null, false,
4048
new Documentation(null, "description"))
4149

4250
when:
@@ -53,7 +61,7 @@ package $pkg;
5361

5462
void "writes @Generated import" () {
5563
def dataType = new StringEnumDataType(
56-
new DataTypeName('Foo'), 'pkg', [], null, false, null)
64+
dataTypeName('Foo'), 'pkg', [], null, false, null)
5765

5866
when:
5967
writer.write (target, dataType)
@@ -67,7 +75,7 @@ import io.openapiprocessor.generated.support.Generated;
6775
void "writes enum class"() {
6876
def pkg = 'com.github.hauner.openapi'
6977
def dataType = new StringEnumDataType(
70-
new DataTypeName(id, type), pkg, [], null, false, null)
78+
dataTypeName(id, type), pkg, [], null, false, null)
7179

7280
when:
7381
writer.write (target, dataType)
@@ -91,7 +99,7 @@ public enum $type {
9199
options.enumType = "framework"
92100

93101
def dataType = new StringEnumDataType(
94-
new DataTypeName('Foo'), 'pkg', [], null, false, null)
102+
dataTypeName('Foo'), 'pkg', [], null, false, null)
95103

96104
when:
97105
writer.write (target, dataType)
@@ -107,7 +115,7 @@ import java.util.function.Supplier;
107115

108116
def pkg = 'com.github.hauner.openapi'
109117
def dataType = new StringEnumDataType(
110-
new DataTypeName(id, type), pkg, [], null, false, null)
118+
dataTypeName(id, type), pkg, [], null, false, null)
111119

112120
when:
113121
writer.write (target, dataType)
@@ -130,7 +138,7 @@ public enum $type implements Supplier<String> {
130138
void "writes enum values"() {
131139
def pkg = 'com.github.hauner.openapi'
132140
def dataType = new StringEnumDataType(
133-
new DataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
141+
dataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
134142

135143
when:
136144
writer.write (target, dataType)
@@ -148,7 +156,7 @@ public enum Foo {
148156
void "writes value member"() {
149157
def pkg = 'com.github.hauner.openapi'
150158
def dataType = new StringEnumDataType(
151-
new DataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
159+
dataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
152160

153161
when:
154162
writer.write (target, dataType)
@@ -163,7 +171,7 @@ public enum Foo {
163171
void "writes enum constructor"() {
164172
def pkg = 'com.github.hauner.openapi'
165173
def dataType = new StringEnumDataType (
166-
new DataTypeName(id, type), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
174+
dataTypeName(id, type), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
167175

168176
when:
169177
writer.write (target, dataType)
@@ -186,7 +194,7 @@ public enum Foo {
186194
void "writes @JsonValue method for serialization"() {
187195
def pkg = 'com.github.hauner.openapi'
188196
def dataType = new StringEnumDataType (
189-
new DataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
197+
dataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
190198

191199
when:
192200
writer.write (target, dataType)
@@ -207,7 +215,7 @@ public enum Foo {
207215

208216
def pkg = 'com.github.hauner.openapi'
209217
def dataType = new StringEnumDataType (
210-
new DataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
218+
dataTypeName('Foo'), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
211219

212220
when:
213221
writer.write (target, dataType)
@@ -226,7 +234,7 @@ public enum Foo {
226234
void "writes @JsonCreator method for de-serialization"() {
227235
def pkg = 'com.github.hauner.openapi'
228236
def dataType = new StringEnumDataType (
229-
new DataTypeName(id, type), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
237+
dataTypeName(id, type), pkg, ['foo', '_foo-2', 'foo-foo'], null, false, null)
230238

231239
when:
232240
writer.write (target, dataType)
@@ -254,7 +262,7 @@ public enum Foo {
254262
void "writes jackson imports" () {
255263
def pkg = 'com.github.hauner.openapi'
256264
def dataType = new StringEnumDataType(
257-
new DataTypeName('Foo'), pkg, [], null, false, null)
265+
dataTypeName('Foo'), pkg, [], null, false, null)
258266

259267
when:
260268
writer.write (target, dataType)
@@ -265,8 +273,4 @@ import com.fasterxml.jackson.annotation.JsonCreator;
265273
import com.fasterxml.jackson.annotation.JsonValue;
266274
""")
267275
}
268-
269276
}
270-
271-
272-

‎openapi-processor-core/src/testInt/resources/tests/schema-composed-oneof-interface/inputs/openapi30.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ paths:
1414
application/json:
1515
schema:
1616
$ref: '#/components/schemas/Foo'
17-
17+
/bar:
18+
get:
19+
responses:
20+
'200':
21+
description: the bar result
22+
content:
23+
application/json:
24+
schema:
25+
$ref: '#/components/schemas/Foo'
1826
components:
1927
schemas:
2028

‎openapi-processor-core/src/testInt/resources/tests/schema-composed-oneof-interface/inputs/openapi31.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ paths:
1515
schema:
1616
$ref: '#/components/schemas/Foo'
1717

18+
/bar:
19+
get:
20+
responses:
21+
'200':
22+
description: the bar result
23+
content:
24+
application/json:
25+
schema:
26+
$ref: '#/components/schemas/Foo'
27+
1828
components:
1929
schemas:
2030

‎openapi-processor-core/src/testInt/resources/tests/schema-composed-oneof-interface/inputs/openapi32.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ paths:
1212
application/json:
1313
schema:
1414
$ref: "#/components/schemas/Foo"
15+
/bar:
16+
get:
17+
responses:
18+
'200':
19+
description: the bar result
20+
content:
21+
application/json:
22+
schema:
23+
$ref: '#/components/schemas/Foo'
1524
components:
1625
schemas:
1726
Foo:

0 commit comments

Comments
 (0)