Skip to content

Identifier #96

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 2 commits into from
Mar 15, 2020
Merged

Identifier #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f1a9d4
better identifier creation
hauner Mar 14, 2020
265dece
replace deprecated
hauner Mar 15, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
replace deprecated
  • Loading branch information
@hauner
hauner committed Mar 15, 2020
commit 265deceac2d23e993f076e97409fec3151e53f7c
2 changes: 1 addition & 1 deletion src/main/groovy/com/github/hauner/openapi/spring/model/Interface.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Interface {
}

String getInterfaceName() {
Identifier.toClass (name) + "Api"
!name.isEmpty () ? Identifier.toClass (name) + "Api" : "Api"
}

String toString () {
Expand Down
11 changes: 6 additions & 5 deletions src/main/groovy/com/github/hauner/openapi/spring/writer/ApiWriter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ class ApiWriter {

Formatter formatter

ApiWriter (ApiOptions options,
InterfaceWriter interfaceWriter,
DataTypeWriter dataTypeWriter,
StringEnumWriter enumWriter,
boolean enableFormatter = true) {
ApiWriter (
ApiOptions options,
InterfaceWriter interfaceWriter,
DataTypeWriter dataTypeWriter,
StringEnumWriter enumWriter,
boolean enableFormatter = true) {
this.options = options
this.interfaceWriter = interfaceWriter
this.dataTypeWriter = dataTypeWriter
Expand Down
3 changes: 1 addition & 2 deletions src/main/groovy/com/github/hauner/openapi/spring/writer/MethodWriter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import com.github.hauner.openapi.spring.model.EndpointResponse
import com.github.hauner.openapi.spring.model.RequestBody
import com.github.hauner.openapi.spring.model.parameters.Parameter
import com.github.hauner.openapi.support.Identifier
import com.github.hauner.openapi.support.IdentifierKt

/**
* Writer for Java interface methods, i.e. endpoints.
Expand Down Expand Up @@ -106,7 +105,7 @@ class MethodWriter {

private String createMethodName (Endpoint endpoint, EndpointResponse endpointResponse) {
if (endpoint.operationId != null) {
return IdentifierKt.toCamelCase (endpoint.operationId)
return Identifier.toCamelCase (endpoint.operationId)
}

def tokens = endpoint.path.tokenize ('/')
Expand Down
141 changes: 0 additions & 141 deletions src/main/groovy/com/github/hauner/openapi/support/Identifier.groovy
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/hauner/openapi/support/Identifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

//@file:JvmName("Identifiers")
@file:JvmName("Identifier")

package com.github.hauner.openapi.support

Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/com/github/hauner/openapi/support/IdentifierSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class IdentifierSpec extends Specification {
@Unroll
void "convert source string '#src' to valid identifiers: #identifier/#clazz/#enumn" () {
expect:
IdentifierKt.toCamelCase (src) == identifier
IdentifierKt.toClass (src) == clazz
IdentifierKt.toEnum (src) == enumn
Identifier.toCamelCase (src) == identifier
Identifier.toClass (src) == clazz
Identifier.toEnum (src) == enumn

where:
src | identifier | clazz | enumn
Expand Down