Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
dd780ad29d | |||
d2165d23bf | |||
d9d0f129b5 | |||
c8d56e62a2 | |||
67bd6ad36f | |||
1a924058a1 | |||
8f81b4d795 | |||
9edd3a53ce | |||
91a6164663 | |||
5a7e052ac4 |
5
.github/workflows/pr_checks.yml
vendored
5
.github/workflows/pr_checks.yml
vendored
@ -37,3 +37,8 @@ jobs:
|
|||||||
run: ./gradlew assemble
|
run: ./gradlew assemble
|
||||||
- name: Run Unit Tests
|
- name: Run Unit Tests
|
||||||
run: ./gradlew test
|
run: ./gradlew test
|
||||||
|
- name: Cache Coverage Results
|
||||||
|
uses: actions/cache@v2
|
||||||
|
with:
|
||||||
|
path: ./**/build/reports/jacoco
|
||||||
|
key: ${{ runner.os }}-unit-${{ env.GITHUB_SHA }}
|
||||||
|
20
.github/workflows/publish.yml
vendored
20
.github/workflows/publish.yml
vendored
@ -24,3 +24,23 @@ jobs:
|
|||||||
run: ./gradlew publishAllPublicationsToGithubPackagesRepository
|
run: ./gradlew publishAllPublicationsToGithubPackagesRepository
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
code-coverage:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: actions/setup-java@v2
|
||||||
|
with:
|
||||||
|
distribution: 'adopt'
|
||||||
|
java-version: '11'
|
||||||
|
- name: Cache Gradle packages
|
||||||
|
uses: actions/cache@v2
|
||||||
|
with:
|
||||||
|
path: ~/.gradle/caches
|
||||||
|
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
|
||||||
|
restore-keys: ${{ runner.os }}-gradle
|
||||||
|
- name: Run Unit Tests
|
||||||
|
run: ./gradlew test
|
||||||
|
- name: Publish code coverage to Codacy
|
||||||
|
uses: codacy/codacy-coverage-reporter-action@v1
|
||||||
|
with:
|
||||||
|
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
|
||||||
|
42
CHANGELOG.md
42
CHANGELOG.md
@ -1,5 +1,47 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.10.0] - November 25th, 2021
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Added `operationId` parameter to `MethodInfo`
|
||||||
|
|
||||||
|
## [1.9.2] - October 24th, 2021
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Jackson ObjectMapper passed by parameter to openapi module
|
||||||
|
- Added serializable annotation to ExceptionResponse
|
||||||
|
|
||||||
|
## [1.9.1] - October 17th, 2021
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Code Coverage removed from PR checks due to limitations with GitHub workflows
|
||||||
|
- Minor linting fixes
|
||||||
|
- Detekt now builds off of default config
|
||||||
|
|
||||||
|
## [1.9.0] - october 15th, 2021
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- ByteArray added to the set of default types
|
||||||
|
|
||||||
|
|
||||||
|
## [1.8.1] - October 4th, 2021
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Codacy integration
|
||||||
|
|
||||||
|
## [1.8.0] - October 4th, 2021
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Path calculation revamped to allow for simpler selector injection
|
||||||
|
- Kotlin version bumped to 1.5.31
|
||||||
|
- Ktor version bumped to 1.6.4
|
||||||
|
|
||||||
## [1.7.0] - August 14th, 2021
|
## [1.7.0] - August 14th, 2021
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
148
README.md
148
README.md
@ -1,16 +1,20 @@
|
|||||||
# Kompendium
|
# Kompendium
|
||||||
|
|
||||||
|
[](https://www.codacy.com/gh/bkbnio/kompendium/dashboard?utm_source=github.com&utm_medium=referral&utm_content=bkbnio/kompendium&utm_campaign=Badge_Grade)
|
||||||
|
[](https://www.codacy.com/gh/bkbnio/kompendium/dashboard?utm_source=github.com&utm_medium=referral&utm_content=bkbnio/kompendium&utm_campaign=Badge_Coverage)
|
||||||
[](https://search.maven.org/search?q=io.bkbn%20kompendium)
|
[](https://search.maven.org/search?q=io.bkbn%20kompendium)
|
||||||
|
|
||||||
## What is Kompendium
|
## What is Kompendium
|
||||||
|
|
||||||
Kompendium is intended to be a minimally invasive OpenApi Specification generator for [Ktor](https://ktor.io).
|
### ⚠️ For info on V2 please see [here](#V2)
|
||||||
Minimally invasive meaning that users will use only Ktor native functions when implementing their API, and will
|
|
||||||
supplement with Kompendium code in order to generate the appropriate spec.
|
Kompendium is intended to be a minimally invasive OpenApi Specification generator for [Ktor](https://ktor.io).
|
||||||
|
Minimally invasive meaning that users will use only Ktor native functions when implementing their API, and will
|
||||||
|
supplement with Kompendium code in order to generate the appropriate spec.
|
||||||
|
|
||||||
## How to install
|
## How to install
|
||||||
|
|
||||||
Kompendium publishes all releases to Maven Central. As such, using the stable version of `Kompendium` is as simple
|
Kompendium publishes all releases to Maven Central. As such, using the stable version of `Kompendium` is as simple
|
||||||
as declaring it as an implementation dependency in your `build.gradle.kts`
|
as declaring it as an implementation dependency in your `build.gradle.kts`
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
@ -19,17 +23,18 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// other (less cool) dependencies
|
implementation("io.bkbn:kompendium-core:1.8.1")
|
||||||
implementation("io.bkbn:kompendium-core:latest")
|
implementation("io.bkbn:kompendium-auth:1.8.1")
|
||||||
implementation("io.bkbn:kompendium-auth:latest")
|
implementation("io.bkbn:kompendium-swagger-ui:1.8.1")
|
||||||
implementation("io.bkbn:kompendium-swagger-ui:latest")
|
|
||||||
|
// Other dependencies...
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
The last two dependencies are optional.
|
The last two dependencies are optional.
|
||||||
|
|
||||||
If you want to get a little spicy 🤠 every merge of Kompendium is published to the GitHub package registry. Pulling
|
If you want to get a little spicy 🤠 every merge of Kompendium is published to the GitHub package registry. Pulling
|
||||||
from GitHub is slightly more involved, but such is the price you pay for bleeding edge fake data generation.
|
from GitHub is slightly more involved, but such is the price you pay for bleeding edge fake data generation.
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// 1 Setup a helper function to import any Github Repository Package
|
// 1 Setup a helper function to import any Github Repository Package
|
||||||
@ -50,17 +55,21 @@ repositories {
|
|||||||
|
|
||||||
// 3 Add the package like any normal dependency
|
// 3 Add the package like any normal dependency
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("io.bkbn:kompendium-core:1.0.0")
|
implementation("io.bkbn:kompendium-core:1.8.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Local Development
|
||||||
|
|
||||||
|
Kompendium should run locally right out of the box, no configuration necessary (assuming you have JDK 1.8+ installed). New features can be built locally and published to your local maven repository with the `./gradlew publishToMavenLocal` command!
|
||||||
|
|
||||||
## In depth
|
## In depth
|
||||||
|
|
||||||
### Notarized Routes
|
### Notarized Routes
|
||||||
|
|
||||||
Kompendium introduces the concept of `notarized` HTTP methods. That is, for all your `GET`, `POST`, `PUT`, and `DELETE`
|
Kompendium introduces the concept of `notarized` HTTP methods. That is, for all your `GET`, `POST`, `PUT`, and `DELETE`
|
||||||
operations, there is a corresponding `notarized` method. These operations are strongly typed, and use reification for
|
operations, there is a corresponding `notarized` method. These operations are strongly typed, and use reification for
|
||||||
a lot of the class based reflection that powers Kompendium. Generally speaking the three types that a `notarized` method
|
a lot of the class based reflection that powers Kompendium. Generally speaking the three types that a `notarized` method
|
||||||
will consume are
|
will consume are
|
||||||
|
|
||||||
@ -72,56 +81,106 @@ will consume are
|
|||||||
|
|
||||||
|
|
||||||
In addition to standard HTTP Methods, Kompendium also introduced the concept of `notarizedExceptions`. Using the `StatusPage`
|
In addition to standard HTTP Methods, Kompendium also introduced the concept of `notarizedExceptions`. Using the `StatusPage`
|
||||||
extension, users can notarize all handled exceptions, along with their respective HTTP codes and response types.
|
extension, users can notarize all handled exceptions, along with their respective HTTP codes and response types.
|
||||||
Exceptions that have been `notarized` require two types as supplemental information
|
Exceptions that have been `notarized` require two types as supplemental information
|
||||||
|
|
||||||
- `TErr`: Used to notarize the exception being handled by this use case. Used for matching responses at the route level.
|
- `TErr`: Used to notarize the exception being handled by this use case. Used for matching responses at the route level.
|
||||||
- `TResp`: Same as above, this dictates the expected return type of the error response.
|
- `TResp`: Same as above, this dictates the expected return type of the error response.
|
||||||
|
|
||||||
In keeping with minimal invasion, these extension methods all consume the same code block as a standard Ktor route method,
|
In keeping with minimal invasion, these extension methods all consume the same code block as a standard Ktor route method,
|
||||||
meaning that swapping in a default Ktor route and a Kompendium `notarized` route is as simple as a single method change.
|
meaning that swapping in a default Ktor route and a Kompendium `notarized` route is as simple as a single method change.
|
||||||
|
|
||||||
### Supplemental Annotations
|
### Supplemental Annotations
|
||||||
|
|
||||||
In general, Kompendium tries to limit the number of annotations that developers need to use in order to get an app
|
In general, Kompendium tries to limit the number of annotations that developers need to use in order to get an app
|
||||||
integrated.
|
integrated.
|
||||||
|
|
||||||
Currently, the annotations used by Kompendium are as follows
|
Currently, the annotations used by Kompendium are as follows
|
||||||
|
|
||||||
- `KompendiumField`
|
- `KompendiumField`
|
||||||
- `KompendiumParam`
|
- `KompendiumParam`
|
||||||
|
|
||||||
The intended purpose of `KompendiumField` is to offer field level overrides such as naming conventions (ie snake instead of camel).
|
The intended purpose of `KompendiumField` is to offer field level overrides such as naming conventions (ie snake instead of camel).
|
||||||
|
|
||||||
The purpose of `KompendiumParam` is to provide supplemental information needed to properly assign the type of parameter
|
The purpose of `KompendiumParam` is to provide supplemental information needed to properly assign the type of parameter
|
||||||
(cookie, header, query, path) as well as other parameter-level metadata.
|
(cookie, header, query, path) as well as other parameter-level metadata.
|
||||||
|
|
||||||
### Undeclared Field
|
### Undeclared Field
|
||||||
|
|
||||||
There is also a final `UndeclaredField` annotation. This should be used only in an absolutely emergency. This annotation
|
There is also a final `UndeclaredField` annotation. This should be used only in an absolutely emergency. This annotation
|
||||||
will allow you to inject a _single_ undeclared field that will be included as part of the schema.
|
will allow you to inject a _single_ undeclared field that will be included as part of the schema.
|
||||||
|
|
||||||
Due to limitations in using repeated annotations, this can only be used once per class
|
Due to limitations in using repeated annotations, this can only be used once per class
|
||||||
|
|
||||||
This is a complete hack, and is included for odd scenarios like kotlinx serialization polymorphic adapters that expect a
|
This is a complete hack, and is included for odd scenarios like kotlinx serialization polymorphic adapters that expect a
|
||||||
`type` field in order to perform their analysis.
|
`type` field in order to perform their analysis.
|
||||||
|
|
||||||
Use this _only_ when **all** else fails
|
Use this _only_ when **all** else fails
|
||||||
|
|
||||||
### Polymorphism
|
### Polymorphism
|
||||||
|
|
||||||
Speaking of polymorphism... out of the box, Kompendium has support for sealed classes and interfaces. At runtime, it will build a mapping of all available sub-classes
|
Speaking of polymorphism... out of the box, Kompendium has support for sealed classes and interfaces. At runtime, it will build a mapping of all available sub-classes
|
||||||
and build a spec that takes `anyOf` the implementations. This is currently a weak point of the entire library, and
|
and build a spec that takes `anyOf` the implementations. This is currently a weak point of the entire library, and
|
||||||
suggestions on better implementations are welcome 🤠
|
suggestions on better implementations are welcome 🤠
|
||||||
|
|
||||||
### Serialization
|
### Serialization
|
||||||
|
|
||||||
Under the hood, Kompendium uses Jackson to serialize the final api spec. However, this implementation detail
|
Under the hood, Kompendium uses Jackson to serialize the final api spec. However, this implementation detail
|
||||||
does not leak to the actual API, meaning that users are free to choose the serialization library of their choice.
|
does not leak to the actual API, meaning that users are free to choose the serialization library of their choice.
|
||||||
|
|
||||||
|
Added the possibility to add your own ObjectMapper for Jackson.
|
||||||
|
|
||||||
|
Added a default parameter with the following configuration:
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
ObjectMapper()
|
||||||
|
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
|
||||||
|
.enable(SerializationFeature.INDENT_OUTPUT)
|
||||||
|
```
|
||||||
|
|
||||||
|
If you want to change this default configuration and use your own ObjectMapper you only need to pass it as a second argument to the openApi module:
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
routing {
|
||||||
|
openApi(oas, objectMapper)
|
||||||
|
route("/potato/spud") {
|
||||||
|
notarizedGet(simpleGetInfo) {
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Route Handling
|
||||||
|
|
||||||
|
> ⚠️ Warning: Custom route handling is almost definitely an indication that either a new selector should be added to kompendium-core or that kompendium is in need of another module to handle a new ktor companion module. If you have encountered a route selector that is not already handled, please consider opening an [issue](https://github.com/bkbnio/kompendium/issues/new)
|
||||||
|
|
||||||
|
Kompendium does its best to handle all Ktor routes out of the gate. However, in keeping with the modular approach of
|
||||||
|
Ktor and Kompendium, this is not always possible.
|
||||||
|
|
||||||
|
Should you need to, custom route handlers can be registered via the
|
||||||
|
`Kompendium.addCustomRouteHandler` function.
|
||||||
|
|
||||||
|
The handler signature is as follows
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
fun <T : RouteSelector> addCustomRouteHandler(
|
||||||
|
selector: KClass<T>,
|
||||||
|
handler: PathCalculator.(Route, String) -> String
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
This function takes a selector, which _must_ be a KClass of the Ktor `RouteSelector` type. The handler is a function
|
||||||
|
that extends the Kompendium `PathCalculator`. This is necessary because it gives you access to `PathCalculator.calculate`,
|
||||||
|
which you are going to want in order to recursively calculate the remainder of the route :)
|
||||||
|
|
||||||
|
Its parameters are the `Route` itself, along with the "tail" of the Path (the path that has been calculated thus far).
|
||||||
|
|
||||||
|
Working examples `init` blocks of the `PathCalculator` and `KompendiumAuth` object.
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
The full source code can be found in the `kompendium-playground` module. Here is a simple get endpoint example
|
The full source code can be found in the `kompendium-playground` module. Here is a simple get endpoint example
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// Minimal API Example
|
// Minimal API Example
|
||||||
@ -151,6 +210,7 @@ fun Application.mainModule() {
|
|||||||
val simpleGetInfo = GetInfo<Unit, ExampleResponse>(
|
val simpleGetInfo = GetInfo<Unit, ExampleResponse>(
|
||||||
summary = "Example Parameters",
|
summary = "Example Parameters",
|
||||||
description = "A test for setting parameter examples",
|
description = "A test for setting parameter examples",
|
||||||
|
operationId = "getExamples",
|
||||||
responseInfo = ResponseInfo(
|
responseInfo = ResponseInfo(
|
||||||
status = 200,
|
status = 200,
|
||||||
description = "nice",
|
description = "nice",
|
||||||
@ -162,7 +222,7 @@ val simpleGetInfo = GetInfo<Unit, ExampleResponse>(
|
|||||||
|
|
||||||
### Kompendium Auth and security schemes
|
### Kompendium Auth and security schemes
|
||||||
|
|
||||||
There is a separate library to handle security schemes: `kompendium-auth`.
|
There is a separate library to handle security schemes: `kompendium-auth`.
|
||||||
This needs to be added to your project as dependency.
|
This needs to be added to your project as dependency.
|
||||||
|
|
||||||
At the moment, the basic and jwt authentication is only supported.
|
At the moment, the basic and jwt authentication is only supported.
|
||||||
@ -218,7 +278,7 @@ Minimal Example:
|
|||||||
```
|
```
|
||||||
|
|
||||||
### Enabling ReDoc
|
### Enabling ReDoc
|
||||||
Unlike swagger, redoc is provided (perhaps confusingly, in the `core` module). This means out of the box with `kompendium-core`, you can add
|
Unlike swagger, redoc is provided (perhaps confusingly, in the `core` module). This means out of the box with `kompendium-core`, you can add
|
||||||
[ReDoc](https://github.com/Redocly/redoc) as follows
|
[ReDoc](https://github.com/Redocly/redoc) as follows
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
@ -230,20 +290,20 @@ routing {
|
|||||||
|
|
||||||
## Custom Type Overrides
|
## Custom Type Overrides
|
||||||
|
|
||||||
Kompendium does its best to analyze types and to generate an OpenAPI format accordingly. However, there are certain
|
Kompendium does its best to analyze types and to generate an OpenAPI format accordingly. However, there are certain
|
||||||
classes that just don't play nice with the standard reflection analysis that Kompendium performs.
|
classes that just don't play nice with the standard reflection analysis that Kompendium performs.
|
||||||
Should you encounter a data type that Kompendium cannot comprehend, you will need to
|
Should you encounter a data type that Kompendium cannot comprehend, you will need to
|
||||||
add it explicitly. For example, adding the Joda Time `DateTime` object would be as simple as the following
|
add it explicitly. For example, adding the Joda Time `DateTime` object would be as simple as the following
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
Kompendium.addCustomTypeSchema(DateTime::class, FormatSchema("date-time", "string"))
|
Kompendium.addCustomTypeSchema(DateTime::class, FormatSchema("date-time", "string"))
|
||||||
```
|
```
|
||||||
|
|
||||||
Since `Kompendium` is an object, this needs to be declared once, ahead of the actual API instantiation. This way, this
|
Since `Kompendium` is an object, this needs to be declared once, ahead of the actual API instantiation. This way, this
|
||||||
type override can be cached ahead of reflection. Kompendium will then match all instances of this type and return the
|
type override can be cached ahead of reflection. Kompendium will then match all instances of this type and return the
|
||||||
specified schema.
|
specified schema.
|
||||||
|
|
||||||
So how do you know a type can and cannot be inferred? The safe bet is that it can be. So go ahead and give it a shot.
|
So how do you know a type can and cannot be inferred? The safe bet is that it can be. So go ahead and give it a shot.
|
||||||
However, in the very odd scenario (almost always having to do with date/time libraries 😤) where it can't, you can rest
|
However, in the very odd scenario (almost always having to do with date/time libraries 😤) where it can't, you can rest
|
||||||
safely knowing that you have the option to inject a custom override should you need to.
|
safely knowing that you have the option to inject a custom override should you need to.
|
||||||
|
|
||||||
@ -253,18 +313,24 @@ safely knowing that you have the option to inject a custom override should you n
|
|||||||
|
|
||||||
Currently, Kompendium exists as a Kotlin object. This comes with a couple perks, but a couple downsides. Primarily,
|
Currently, Kompendium exists as a Kotlin object. This comes with a couple perks, but a couple downsides. Primarily,
|
||||||
it offers a seriously clean UX where the implementer doesn't need to worry about what instance to send data to. The main
|
it offers a seriously clean UX where the implementer doesn't need to worry about what instance to send data to. The main
|
||||||
drawback, however, is that you are limited to a single API per classpath.
|
drawback, however, is that you are limited to a single API per classpath.
|
||||||
|
|
||||||
If this is a blocker, please open a GitHub issue, and we can start to think out solutions!
|
If this is a blocker, please open a GitHub issue, and we can start to think out solutions!
|
||||||
|
|
||||||
## Future Work
|
## Future Work
|
||||||
Work on V1 of Kompendium has come to a close. This, however, does not mean it has achieved complete
|
Work on V1 of Kompendium has come to a close. This, however, does not mean it has achieved complete
|
||||||
parity with the OpenAPI feature spec, nor does it have all-of-the nice to have features that a truly next-gen API spec
|
parity with the OpenAPI feature spec, nor does it have all-of-the nice to have features that a truly next-gen API spec
|
||||||
should have. There are several outstanding features that have been added to the
|
should have. There are several outstanding features that have been added to the
|
||||||
[V2 Milestone](https://github.com/bkbnio/kompendium/milestone/2). Among others, this includes
|
[V2 Milestone](https://github.com/bkbnio/kompendium/milestone/2). Among others, this includes
|
||||||
|
|
||||||
- AsyncAPI Integration
|
- AsyncAPI Integration
|
||||||
- Field Validation
|
- Field Validation
|
||||||
|
|
||||||
If you have a feature that you would like to see implemented that is not on this list, or discover a 🐞, please open
|
If you have a feature that you would like to see implemented that is not on this list, or discover a 🐞, please open
|
||||||
an issue [here](https://github.com/bkbnio/kompendium/issues/new)
|
an issue [here](https://github.com/bkbnio/kompendium/issues/new)
|
||||||
|
|
||||||
|
### V2
|
||||||
|
|
||||||
|
Due to the large number of breaking changes that will be made in version 2, development is currently being done on the
|
||||||
|
long-lived `v2` feature branch. If you are working on any feature in the `V2` milestone, please target that branch!
|
||||||
|
If you are unsure where your changes should be, please open an issue first :)
|
||||||
|
@ -4,8 +4,8 @@ import io.gitlab.arturbosch.detekt.extensions.DetektExtension
|
|||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("org.jetbrains.kotlin.jvm") version "1.5.0" apply false
|
id("org.jetbrains.kotlin.jvm") version "1.5.31" apply false
|
||||||
id("io.gitlab.arturbosch.detekt") version "1.17.0-RC3" apply false
|
id("io.gitlab.arturbosch.detekt") version "1.18.1" apply false
|
||||||
id("com.adarshr.test-logger") version "3.0.0" apply false
|
id("com.adarshr.test-logger") version "3.0.0" apply false
|
||||||
id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply true
|
id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply true
|
||||||
}
|
}
|
||||||
@ -30,6 +30,7 @@ allprojects {
|
|||||||
apply(plugin = "io.gitlab.arturbosch.detekt")
|
apply(plugin = "io.gitlab.arturbosch.detekt")
|
||||||
apply(plugin = "com.adarshr.test-logger")
|
apply(plugin = "com.adarshr.test-logger")
|
||||||
apply(plugin = "idea")
|
apply(plugin = "idea")
|
||||||
|
apply(plugin = "jacoco")
|
||||||
|
|
||||||
tasks.withType<KotlinCompile>().configureEach {
|
tasks.withType<KotlinCompile>().configureEach {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
@ -37,6 +38,22 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType<Test>() {
|
||||||
|
finalizedBy(tasks.withType(JacocoReport::class))
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType<JacocoReport>() {
|
||||||
|
reports {
|
||||||
|
html.required.set(true)
|
||||||
|
xml.required.set(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
configure<JacocoPluginExtension> {
|
||||||
|
toolVersion = "0.8.7"
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("MagicNumber")
|
||||||
configure<TestLoggerExtension> {
|
configure<TestLoggerExtension> {
|
||||||
theme = ThemeType.MOCHA
|
theme = ThemeType.MOCHA
|
||||||
setLogLevel("lifecycle")
|
setLogLevel("lifecycle")
|
||||||
@ -57,7 +74,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
configure<DetektExtension> {
|
configure<DetektExtension> {
|
||||||
toolVersion = "1.17.0-RC3"
|
toolVersion = "1.18.1"
|
||||||
config = files("${rootProject.projectDir}/detekt.yml")
|
config = files("${rootProject.projectDir}/detekt.yml")
|
||||||
buildUponDefaultConfig = true
|
buildUponDefaultConfig = true
|
||||||
}
|
}
|
||||||
|
702
detekt.yml
702
detekt.yml
@ -1,710 +1,20 @@
|
|||||||
build:
|
|
||||||
maxIssues: 0
|
|
||||||
excludeCorrectable: false
|
|
||||||
weights:
|
|
||||||
# complexity: 2
|
|
||||||
# LongParameterList: 1
|
|
||||||
# style: 1
|
|
||||||
# comments: 1
|
|
||||||
|
|
||||||
config:
|
|
||||||
validation: true
|
|
||||||
warningsAsErrors: false
|
|
||||||
# when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
|
|
||||||
excludes: ''
|
|
||||||
|
|
||||||
processors:
|
|
||||||
active: true
|
|
||||||
exclude:
|
|
||||||
- 'DetektProgressListener'
|
|
||||||
|
|
||||||
console-reports:
|
|
||||||
active: true
|
|
||||||
exclude:
|
|
||||||
- 'ProjectStatisticsReport'
|
|
||||||
- 'ComplexityReport'
|
|
||||||
- 'NotificationReport'
|
|
||||||
- 'FileBasedFindingsReport'
|
|
||||||
|
|
||||||
output-reports:
|
|
||||||
active: true
|
|
||||||
|
|
||||||
comments:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
AbsentOrWrongFileLicense:
|
|
||||||
active: false
|
|
||||||
licenseTemplateFile: 'license.template'
|
|
||||||
CommentOverPrivateFunction:
|
|
||||||
active: false
|
|
||||||
CommentOverPrivateProperty:
|
|
||||||
active: false
|
|
||||||
EndOfSentenceFormat:
|
|
||||||
active: false
|
|
||||||
endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
|
|
||||||
UndocumentedPublicClass:
|
|
||||||
active: false
|
|
||||||
searchInNestedClass: true
|
|
||||||
searchInInnerClass: true
|
|
||||||
searchInInnerObject: true
|
|
||||||
searchInInnerInterface: true
|
|
||||||
UndocumentedPublicFunction:
|
|
||||||
active: false
|
|
||||||
UndocumentedPublicProperty:
|
|
||||||
active: false
|
|
||||||
|
|
||||||
complexity:
|
complexity:
|
||||||
active: true
|
TooManyFunctions:
|
||||||
ComplexCondition:
|
|
||||||
active: true
|
|
||||||
threshold: 4
|
|
||||||
ComplexInterface:
|
|
||||||
active: false
|
active: false
|
||||||
threshold: 10
|
|
||||||
includeStaticDeclarations: false
|
|
||||||
includePrivateDeclarations: false
|
|
||||||
ComplexMethod:
|
|
||||||
active: true
|
|
||||||
threshold: 25
|
|
||||||
ignoreSingleWhenExpression: false
|
|
||||||
ignoreSimpleWhenEntries: false
|
|
||||||
ignoreNestingFunctions: false
|
|
||||||
nestingFunctions: [run, let, apply, with, also, use, forEach, isNotNull, ifNull]
|
|
||||||
LabeledExpression:
|
|
||||||
active: false
|
|
||||||
ignoredLabels: []
|
|
||||||
LargeClass:
|
|
||||||
active: true
|
|
||||||
threshold: 600
|
|
||||||
LongMethod:
|
|
||||||
active: true
|
|
||||||
threshold: 80
|
|
||||||
LongParameterList:
|
LongParameterList:
|
||||||
active: true
|
active: true
|
||||||
functionThreshold: 10
|
functionThreshold: 10
|
||||||
constructorThreshold: 10
|
constructorThreshold: 10
|
||||||
ignoreDefaultParameters: false
|
ComplexMethod:
|
||||||
ignoreDataClasses: true
|
threshold: 20
|
||||||
ignoreAnnotated: []
|
|
||||||
MethodOverloading:
|
|
||||||
active: false
|
|
||||||
threshold: 6
|
|
||||||
NamedArguments:
|
|
||||||
active: false
|
|
||||||
threshold: 3
|
|
||||||
NestedBlockDepth:
|
|
||||||
active: true
|
|
||||||
threshold: 6
|
|
||||||
ReplaceSafeCallChainWithRun:
|
|
||||||
active: false
|
|
||||||
StringLiteralDuplication:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
threshold: 3
|
|
||||||
ignoreAnnotation: true
|
|
||||||
excludeStringsWithLessThan5Characters: true
|
|
||||||
ignoreStringsRegex: '$^'
|
|
||||||
TooManyFunctions:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
thresholdInFiles: 11
|
|
||||||
thresholdInClasses: 11
|
|
||||||
thresholdInInterfaces: 11
|
|
||||||
thresholdInObjects: 11
|
|
||||||
thresholdInEnums: 11
|
|
||||||
ignoreDeprecated: false
|
|
||||||
ignorePrivate: false
|
|
||||||
ignoreOverridden: false
|
|
||||||
|
|
||||||
coroutines:
|
|
||||||
active: true
|
|
||||||
GlobalCoroutineUsage:
|
|
||||||
active: false
|
|
||||||
RedundantSuspendModifier:
|
|
||||||
active: false
|
|
||||||
SleepInsteadOfDelay:
|
|
||||||
active: false
|
|
||||||
SuspendFunWithFlowReturnType:
|
|
||||||
active: false
|
|
||||||
|
|
||||||
empty-blocks:
|
|
||||||
active: true
|
|
||||||
EmptyCatchBlock:
|
|
||||||
active: true
|
|
||||||
allowedExceptionNameRegex: '_|(ignore|expected).*'
|
|
||||||
EmptyClassBlock:
|
|
||||||
active: true
|
|
||||||
EmptyDefaultConstructor:
|
|
||||||
active: true
|
|
||||||
EmptyDoWhileBlock:
|
|
||||||
active: true
|
|
||||||
EmptyElseBlock:
|
|
||||||
active: true
|
|
||||||
EmptyFinallyBlock:
|
|
||||||
active: true
|
|
||||||
EmptyForBlock:
|
|
||||||
active: true
|
|
||||||
EmptyFunctionBlock:
|
|
||||||
active: true
|
|
||||||
ignoreOverridden: false
|
|
||||||
EmptyIfBlock:
|
|
||||||
active: true
|
|
||||||
EmptyInitBlock:
|
|
||||||
active: true
|
|
||||||
EmptyKtFile:
|
|
||||||
active: true
|
|
||||||
EmptySecondaryConstructor:
|
|
||||||
active: true
|
|
||||||
EmptyTryBlock:
|
|
||||||
active: true
|
|
||||||
EmptyWhenBlock:
|
|
||||||
active: true
|
|
||||||
EmptyWhileBlock:
|
|
||||||
active: true
|
|
||||||
|
|
||||||
exceptions:
|
|
||||||
active: true
|
|
||||||
ExceptionRaisedInUnexpectedLocation:
|
|
||||||
active: true
|
|
||||||
methodNames: [toString, hashCode, equals, finalize]
|
|
||||||
InstanceOfCheckForException:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
NotImplementedDeclaration:
|
|
||||||
active: false
|
|
||||||
ObjectExtendsThrowable:
|
|
||||||
active: false
|
|
||||||
PrintStackTrace:
|
|
||||||
active: true
|
|
||||||
RethrowCaughtException:
|
|
||||||
active: true
|
|
||||||
ReturnFromFinally:
|
|
||||||
active: true
|
|
||||||
ignoreLabeled: false
|
|
||||||
SwallowedException:
|
|
||||||
active: true
|
|
||||||
ignoredExceptionTypes:
|
|
||||||
- InterruptedException
|
|
||||||
- NumberFormatException
|
|
||||||
- ParseException
|
|
||||||
- MalformedURLException
|
|
||||||
allowedExceptionNameRegex: '_|(ignore|expected).*'
|
|
||||||
ThrowingExceptionFromFinally:
|
|
||||||
active: true
|
|
||||||
ThrowingExceptionInMain:
|
|
||||||
active: false
|
|
||||||
ThrowingExceptionsWithoutMessageOrCause:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
exceptions:
|
|
||||||
- IllegalArgumentException
|
|
||||||
- IllegalStateException
|
|
||||||
- IOException
|
|
||||||
ThrowingNewInstanceOfSameException:
|
|
||||||
active: true
|
|
||||||
TooGenericExceptionCaught:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
exceptionNames:
|
|
||||||
- ArrayIndexOutOfBoundsException
|
|
||||||
- Error
|
|
||||||
- Exception
|
|
||||||
- IllegalMonitorStateException
|
|
||||||
- NullPointerException
|
|
||||||
- IndexOutOfBoundsException
|
|
||||||
- RuntimeException
|
|
||||||
- Throwable
|
|
||||||
allowedExceptionNameRegex: '_|(ignore|expected).*'
|
|
||||||
TooGenericExceptionThrown:
|
|
||||||
active: true
|
|
||||||
exceptionNames:
|
|
||||||
- Error
|
|
||||||
- Exception
|
|
||||||
- Throwable
|
|
||||||
- RuntimeException
|
|
||||||
|
|
||||||
formatting:
|
formatting:
|
||||||
active: true
|
|
||||||
android: false
|
|
||||||
autoCorrect: true
|
|
||||||
AnnotationOnSeparateLine:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
AnnotationSpacing:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
ArgumentListWrapping:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
ChainWrapping:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
CommentSpacing:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
EnumEntryNameCase:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
Filename:
|
|
||||||
active: true
|
|
||||||
FinalNewline:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
insertFinalNewLine: true
|
|
||||||
ImportOrdering:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
layout: 'idea'
|
|
||||||
Indentation:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
indentSize: 4
|
|
||||||
continuationIndentSize: 4
|
|
||||||
MaximumLineLength:
|
|
||||||
active: true
|
|
||||||
maxLineLength: 120
|
|
||||||
ModifierOrdering:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
MultiLineIfElse:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoBlankLineBeforeRbrace:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoConsecutiveBlankLines:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoEmptyClassBody:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoEmptyFirstLineInMethodBlock:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
NoLineBreakAfterElse:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoLineBreakBeforeAssignment:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoMultipleSpaces:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoSemicolons:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoTrailingSpaces:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoUnitReturn:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoUnusedImports:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
NoWildcardImports:
|
|
||||||
active: true
|
|
||||||
PackageName:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
ParameterListWrapping:
|
ParameterListWrapping:
|
||||||
active: false
|
active: false
|
||||||
autoCorrect: true
|
|
||||||
indentSize: 4
|
|
||||||
SpacingAroundAngleBrackets:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundColon:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundComma:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundCurly:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundDot:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundDoubleColon:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundKeyword:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundOperators:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundParens:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundRangeOperator:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingAroundUnaryOperator:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingBetweenDeclarationsWithAnnotations:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
SpacingBetweenDeclarationsWithComments:
|
|
||||||
active: false
|
|
||||||
autoCorrect: true
|
|
||||||
StringTemplate:
|
|
||||||
active: true
|
|
||||||
autoCorrect: true
|
|
||||||
|
|
||||||
naming:
|
|
||||||
active: true
|
|
||||||
ClassNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
classPattern: '[A-Z][a-zA-Z0-9]*'
|
|
||||||
ConstructorParameterNaming:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
parameterPattern: '[a-z][A-Za-z0-9]*'
|
|
||||||
privateParameterPattern: '[a-z][A-Za-z0-9]*'
|
|
||||||
excludeClassPattern: '$^'
|
|
||||||
ignoreOverridden: true
|
|
||||||
EnumNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
|
|
||||||
ForbiddenClassName:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
forbiddenName: []
|
|
||||||
FunctionMaxLength:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
maximumFunctionNameLength: 30
|
|
||||||
FunctionMinLength:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
minimumFunctionNameLength: 3
|
|
||||||
FunctionNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)'
|
|
||||||
excludeClassPattern: '$^'
|
|
||||||
ignoreOverridden: true
|
|
||||||
ignoreAnnotated: ['Composable']
|
|
||||||
FunctionParameterNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
parameterPattern: '[a-z][A-Za-z0-9]*'
|
|
||||||
excludeClassPattern: '$^'
|
|
||||||
ignoreOverridden: true
|
|
||||||
InvalidPackageDeclaration:
|
|
||||||
active: false
|
|
||||||
excludes: ['*.kts']
|
|
||||||
rootPackage: ''
|
|
||||||
MatchingDeclarationName:
|
|
||||||
active: true
|
|
||||||
mustBeFirst: true
|
|
||||||
MemberNameEqualsClassName:
|
|
||||||
active: true
|
|
||||||
ignoreOverridden: true
|
|
||||||
NonBooleanPropertyPrefixedWithIs:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
ObjectPropertyNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
constantPattern: '[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
PackageNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
|
|
||||||
TopLevelPropertyNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
constantPattern: '[A-Z][_A-Z0-9]*'
|
|
||||||
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
VariableMaxLength:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
maximumVariableNameLength: 64
|
|
||||||
VariableMinLength:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
minimumVariableNameLength: 1
|
|
||||||
VariableNaming:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
variablePattern: '[a-z][A-Za-z0-9]*'
|
|
||||||
privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
|
|
||||||
excludeClassPattern: '$^'
|
|
||||||
ignoreOverridden: true
|
|
||||||
|
|
||||||
performance:
|
|
||||||
active: true
|
|
||||||
ArrayPrimitive:
|
|
||||||
active: true
|
|
||||||
ForEachOnRange:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
SpreadOperator:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
UnnecessaryTemporaryInstantiation:
|
|
||||||
active: true
|
|
||||||
|
|
||||||
potential-bugs:
|
|
||||||
active: true
|
|
||||||
Deprecation:
|
|
||||||
active: false
|
|
||||||
DontDowncastCollectionTypes:
|
|
||||||
active: false
|
|
||||||
DuplicateCaseInWhenExpression:
|
|
||||||
active: true
|
|
||||||
EqualsAlwaysReturnsTrueOrFalse:
|
|
||||||
active: true
|
|
||||||
EqualsWithHashCodeExist:
|
|
||||||
active: true
|
|
||||||
ExitOutsideMain:
|
|
||||||
active: false
|
|
||||||
ExplicitGarbageCollectionCall:
|
|
||||||
active: true
|
|
||||||
HasPlatformType:
|
|
||||||
active: false
|
|
||||||
IgnoredReturnValue:
|
|
||||||
active: false
|
|
||||||
restrictToAnnotatedMethods: true
|
|
||||||
returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult']
|
|
||||||
ImplicitDefaultLocale:
|
|
||||||
active: true
|
|
||||||
ImplicitUnitReturnType:
|
|
||||||
active: false
|
|
||||||
allowExplicitReturnType: true
|
|
||||||
InvalidRange:
|
|
||||||
active: true
|
|
||||||
IteratorHasNextCallsNextMethod:
|
|
||||||
active: true
|
|
||||||
IteratorNotThrowingNoSuchElementException:
|
|
||||||
active: true
|
|
||||||
LateinitUsage:
|
|
||||||
active: false
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
excludeAnnotatedProperties: []
|
|
||||||
ignoreOnClassesPattern: ''
|
|
||||||
MapGetWithNotNullAssertionOperator:
|
|
||||||
active: false
|
|
||||||
MissingWhenCase:
|
|
||||||
active: true
|
|
||||||
allowElseExpression: true
|
|
||||||
NullableToStringCall:
|
|
||||||
active: false
|
|
||||||
RedundantElseInWhen:
|
|
||||||
active: true
|
|
||||||
UnconditionalJumpStatementInLoop:
|
|
||||||
active: false
|
|
||||||
UnnecessaryNotNullOperator:
|
|
||||||
active: true
|
|
||||||
UnnecessarySafeCall:
|
|
||||||
active: true
|
|
||||||
UnreachableCatchBlock:
|
|
||||||
active: false
|
|
||||||
UnreachableCode:
|
|
||||||
active: true
|
|
||||||
UnsafeCallOnNullableType:
|
|
||||||
active: true
|
|
||||||
UnsafeCast:
|
|
||||||
active: true
|
|
||||||
UselessPostfixExpression:
|
|
||||||
active: false
|
|
||||||
WrongEqualsTypeParameter:
|
|
||||||
active: true
|
|
||||||
|
|
||||||
style:
|
style:
|
||||||
active: true
|
|
||||||
ClassOrdering:
|
|
||||||
active: false
|
|
||||||
CollapsibleIfStatements:
|
|
||||||
active: false
|
|
||||||
DataClassContainsFunctions:
|
|
||||||
active: false
|
|
||||||
conversionFunctionPrefix: 'to'
|
|
||||||
DataClassShouldBeImmutable:
|
|
||||||
active: false
|
|
||||||
DestructuringDeclarationWithTooManyEntries:
|
|
||||||
active: false
|
|
||||||
maxDestructuringEntries: 3
|
|
||||||
EqualsNullCall:
|
|
||||||
active: true
|
|
||||||
EqualsOnSignatureLine:
|
|
||||||
active: false
|
|
||||||
ExplicitCollectionElementAccessMethod:
|
|
||||||
active: false
|
|
||||||
ExplicitItLambdaParameter:
|
|
||||||
active: false
|
|
||||||
ExpressionBodySyntax:
|
|
||||||
active: false
|
|
||||||
includeLineWrapping: false
|
|
||||||
ForbiddenComment:
|
|
||||||
active: true
|
|
||||||
values: ['TODO:', 'FIXME:', 'STOPSHIP:']
|
|
||||||
allowedPatterns: ''
|
|
||||||
ForbiddenImport:
|
|
||||||
active: false
|
|
||||||
imports: []
|
|
||||||
forbiddenPatterns: ''
|
|
||||||
ForbiddenMethodCall:
|
|
||||||
active: false
|
|
||||||
methods: ['kotlin.io.println', 'kotlin.io.print']
|
|
||||||
ForbiddenPublicDataClass:
|
|
||||||
active: true
|
|
||||||
excludes: ['**']
|
|
||||||
ignorePackages: ['*.internal', '*.internal.*']
|
|
||||||
ForbiddenVoid:
|
|
||||||
active: false
|
|
||||||
ignoreOverridden: false
|
|
||||||
ignoreUsageInGenerics: false
|
|
||||||
FunctionOnlyReturningConstant:
|
|
||||||
active: true
|
|
||||||
ignoreOverridableFunction: true
|
|
||||||
ignoreActualFunction: true
|
|
||||||
excludedFunctions: 'describeContents'
|
|
||||||
excludeAnnotatedFunction: ['dagger.Provides']
|
|
||||||
LibraryCodeMustSpecifyReturnType:
|
|
||||||
active: true
|
|
||||||
excludes: ['**']
|
|
||||||
LibraryEntitiesShouldNotBePublic:
|
|
||||||
active: true
|
|
||||||
excludes: ['**']
|
|
||||||
LoopWithTooManyJumpStatements:
|
|
||||||
active: true
|
|
||||||
maxJumpCount: 1
|
|
||||||
MagicNumber:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
ignoreNumbers: ['-1', '0', '1', '2']
|
|
||||||
ignoreHashCodeFunction: true
|
|
||||||
ignorePropertyDeclaration: false
|
|
||||||
ignoreLocalVariableDeclaration: false
|
|
||||||
ignoreConstantDeclaration: true
|
|
||||||
ignoreCompanionObjectPropertyDeclaration: true
|
|
||||||
ignoreAnnotation: false
|
|
||||||
ignoreNamedArgument: true
|
|
||||||
ignoreEnums: false
|
|
||||||
ignoreRanges: false
|
|
||||||
ignoreExtensionFunctions: true
|
|
||||||
MandatoryBracesIfStatements:
|
|
||||||
active: false
|
|
||||||
MandatoryBracesLoops:
|
|
||||||
active: false
|
|
||||||
MaxLineLength:
|
MaxLineLength:
|
||||||
|
excludes: ['**/test/**/*', '**/testIntegration/**/*']
|
||||||
active: true
|
active: true
|
||||||
maxLineLength: 120
|
maxLineLength: 120
|
||||||
excludePackageStatements: true
|
naming:
|
||||||
excludeImportStatements: true
|
ConstructorParameterNaming:
|
||||||
excludeCommentStatements: false
|
|
||||||
MayBeConst:
|
|
||||||
active: true
|
|
||||||
ModifierOrder:
|
|
||||||
active: true
|
|
||||||
MultilineLambdaItParameter:
|
|
||||||
active: false
|
active: false
|
||||||
NestedClassesVisibility:
|
|
||||||
active: true
|
|
||||||
NewLineAtEndOfFile:
|
|
||||||
active: true
|
|
||||||
NoTabs:
|
|
||||||
active: false
|
|
||||||
OptionalAbstractKeyword:
|
|
||||||
active: true
|
|
||||||
OptionalUnit:
|
|
||||||
active: false
|
|
||||||
OptionalWhenBraces:
|
|
||||||
active: false
|
|
||||||
PreferToOverPairSyntax:
|
|
||||||
active: false
|
|
||||||
ProtectedMemberInFinalClass:
|
|
||||||
active: true
|
|
||||||
RedundantExplicitType:
|
|
||||||
active: false
|
|
||||||
RedundantHigherOrderMapUsage:
|
|
||||||
active: false
|
|
||||||
RedundantVisibilityModifierRule:
|
|
||||||
active: false
|
|
||||||
ReturnCount:
|
|
||||||
active: true
|
|
||||||
max: 2
|
|
||||||
excludedFunctions: 'equals'
|
|
||||||
excludeLabeled: false
|
|
||||||
excludeReturnFromLambda: true
|
|
||||||
excludeGuardClauses: false
|
|
||||||
SafeCast:
|
|
||||||
active: true
|
|
||||||
SerialVersionUIDInSerializableClass:
|
|
||||||
active: true
|
|
||||||
SpacingBetweenPackageAndImports:
|
|
||||||
active: false
|
|
||||||
ThrowsCount:
|
|
||||||
active: true
|
|
||||||
max: 2
|
|
||||||
TrailingWhitespace:
|
|
||||||
active: false
|
|
||||||
UnderscoresInNumericLiterals:
|
|
||||||
active: false
|
|
||||||
acceptableDecimalLength: 5
|
|
||||||
UnnecessaryAbstractClass:
|
|
||||||
active: true
|
|
||||||
excludeAnnotatedClasses: ['dagger.Module']
|
|
||||||
UnnecessaryAnnotationUseSiteTarget:
|
|
||||||
active: false
|
|
||||||
UnnecessaryApply:
|
|
||||||
active: true
|
|
||||||
UnnecessaryFilter:
|
|
||||||
active: false
|
|
||||||
UnnecessaryInheritance:
|
|
||||||
active: true
|
|
||||||
UnnecessaryLet:
|
|
||||||
active: false
|
|
||||||
UnnecessaryParentheses:
|
|
||||||
active: false
|
|
||||||
UntilInsteadOfRangeTo:
|
|
||||||
active: false
|
|
||||||
UnusedImports:
|
|
||||||
active: false
|
|
||||||
UnusedPrivateClass:
|
|
||||||
active: true
|
|
||||||
UnusedPrivateMember:
|
|
||||||
active: true
|
|
||||||
allowedNames: '(_|ignored|expected|serialVersionUID)'
|
|
||||||
UseArrayLiteralsInAnnotations:
|
|
||||||
active: false
|
|
||||||
UseCheckNotNull:
|
|
||||||
active: false
|
|
||||||
UseCheckOrError:
|
|
||||||
active: false
|
|
||||||
UseDataClass:
|
|
||||||
active: false
|
|
||||||
excludeAnnotatedClasses: []
|
|
||||||
allowVars: false
|
|
||||||
UseEmptyCounterpart:
|
|
||||||
active: false
|
|
||||||
UseIfEmptyOrIfBlank:
|
|
||||||
active: false
|
|
||||||
UseIfInsteadOfWhen:
|
|
||||||
active: false
|
|
||||||
UseIsNullOrEmpty:
|
|
||||||
active: false
|
|
||||||
UseRequire:
|
|
||||||
active: false
|
|
||||||
UseRequireNotNull:
|
|
||||||
active: false
|
|
||||||
UselessCallOnNotNull:
|
|
||||||
active: true
|
|
||||||
UtilityClassWithPublicConstructor:
|
|
||||||
active: true
|
|
||||||
VarCouldBeVal:
|
|
||||||
active: true
|
|
||||||
WildcardImport:
|
|
||||||
active: true
|
|
||||||
excludes: ['**/test/**', '**/testIntegration/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
|
|
||||||
excludeImports: ['java.util.*', 'kotlinx.android.synthetic.*']
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Kompendium
|
# Kompendium
|
||||||
project.version=1.7.0
|
project.version=1.10.0
|
||||||
# Kotlin
|
# Kotlin
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
# Gradle
|
# Gradle
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[versions]
|
[versions]
|
||||||
kotlin = "1.4.32"
|
kotlin = "1.4.32"
|
||||||
ktor = "1.5.3"
|
ktor = "1.6.4"
|
||||||
kotlinx-serialization = "1.2.1"
|
kotlinx-serialization = "1.2.1"
|
||||||
jackson-kotlin = "2.12.0"
|
jackson-kotlin = "2.12.0"
|
||||||
slf4j = "1.7.30"
|
slf4j = "1.7.30"
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
package io.bkbn.kompendium.auth
|
|
||||||
|
|
||||||
import io.ktor.auth.AuthenticationRouteSelector
|
|
||||||
import io.ktor.routing.Route
|
|
||||||
import io.bkbn.kompendium.path.CorePathCalculator
|
|
||||||
import org.slf4j.LoggerFactory
|
|
||||||
|
|
||||||
class AuthPathCalculator : CorePathCalculator() {
|
|
||||||
|
|
||||||
private val logger = LoggerFactory.getLogger(javaClass)
|
|
||||||
|
|
||||||
override fun handleCustomSelectors(route: Route, tail: String): String = when (route.selector) {
|
|
||||||
is AuthenticationRouteSelector -> {
|
|
||||||
logger.debug("Found authentication route selector ${route.selector}")
|
|
||||||
super.calculate(route.parent, tail)
|
|
||||||
}
|
|
||||||
else -> super.handleCustomSelectors(route, tail)
|
|
||||||
}
|
|
||||||
}
|
|
@ -7,11 +7,14 @@ import io.ktor.auth.jwt.jwt
|
|||||||
import io.ktor.auth.jwt.JWTAuthenticationProvider
|
import io.ktor.auth.jwt.JWTAuthenticationProvider
|
||||||
import io.bkbn.kompendium.Kompendium
|
import io.bkbn.kompendium.Kompendium
|
||||||
import io.bkbn.kompendium.models.oas.OpenApiSpecSchemaSecurity
|
import io.bkbn.kompendium.models.oas.OpenApiSpecSchemaSecurity
|
||||||
|
import io.ktor.auth.AuthenticationRouteSelector
|
||||||
|
|
||||||
object KompendiumAuth {
|
object KompendiumAuth {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
Kompendium.pathCalculator = AuthPathCalculator()
|
Kompendium.addCustomRouteHandler(AuthenticationRouteSelector::class) { route, tail ->
|
||||||
|
calculate(route.parent, tail)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Authentication.Configuration.notarizedBasic(
|
fun Authentication.Configuration.notarizedBasic(
|
||||||
|
@ -5,8 +5,10 @@ import io.bkbn.kompendium.models.meta.SchemaMap
|
|||||||
import io.bkbn.kompendium.models.oas.OpenApiSpec
|
import io.bkbn.kompendium.models.oas.OpenApiSpec
|
||||||
import io.bkbn.kompendium.models.oas.OpenApiSpecInfo
|
import io.bkbn.kompendium.models.oas.OpenApiSpecInfo
|
||||||
import io.bkbn.kompendium.models.oas.TypedSchema
|
import io.bkbn.kompendium.models.oas.TypedSchema
|
||||||
import io.bkbn.kompendium.path.CorePathCalculator
|
import io.bkbn.kompendium.path.IPathCalculator
|
||||||
import io.bkbn.kompendium.path.PathCalculator
|
import io.bkbn.kompendium.path.PathCalculator
|
||||||
|
import io.ktor.routing.Route
|
||||||
|
import io.ktor.routing.RouteSelector
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -23,7 +25,7 @@ object Kompendium {
|
|||||||
paths = mutableMapOf()
|
paths = mutableMapOf()
|
||||||
)
|
)
|
||||||
|
|
||||||
var pathCalculator: PathCalculator = CorePathCalculator()
|
fun calculatePath(route: Route) = PathCalculator.calculate(route)
|
||||||
|
|
||||||
fun resetSchema() {
|
fun resetSchema() {
|
||||||
openApiSpec = OpenApiSpec(
|
openApiSpec = OpenApiSpec(
|
||||||
@ -37,4 +39,11 @@ object Kompendium {
|
|||||||
fun addCustomTypeSchema(clazz: KClass<*>, schema: TypedSchema) {
|
fun addCustomTypeSchema(clazz: KClass<*>, schema: TypedSchema) {
|
||||||
cache = cache.plus(clazz.simpleName!! to schema)
|
cache = cache.plus(clazz.simpleName!! to schema)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun <T : RouteSelector> addCustomRouteHandler(
|
||||||
|
selector: KClass<T>,
|
||||||
|
handler: IPathCalculator.(Route, String) -> String
|
||||||
|
) {
|
||||||
|
PathCalculator.addCustomRouteHandler(selector, handler)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
package io.bkbn.kompendium
|
package io.bkbn.kompendium
|
||||||
|
|
||||||
import io.ktor.routing.Route
|
import io.ktor.routing.Route
|
||||||
import kotlin.reflect.KClass
|
|
||||||
import kotlin.reflect.KType
|
import kotlin.reflect.KType
|
||||||
import kotlin.reflect.full.createType
|
|
||||||
import kotlin.reflect.typeOf
|
import kotlin.reflect.typeOf
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,7 +8,6 @@ import io.bkbn.kompendium.models.oas.DictionarySchema
|
|||||||
import io.bkbn.kompendium.models.oas.EnumSchema
|
import io.bkbn.kompendium.models.oas.EnumSchema
|
||||||
import io.bkbn.kompendium.models.oas.FormatSchema
|
import io.bkbn.kompendium.models.oas.FormatSchema
|
||||||
import io.bkbn.kompendium.models.oas.ObjectSchema
|
import io.bkbn.kompendium.models.oas.ObjectSchema
|
||||||
import io.bkbn.kompendium.models.oas.OpenApiSpecComponentSchema
|
|
||||||
import io.bkbn.kompendium.models.oas.ReferencedSchema
|
import io.bkbn.kompendium.models.oas.ReferencedSchema
|
||||||
import io.bkbn.kompendium.models.oas.SimpleSchema
|
import io.bkbn.kompendium.models.oas.SimpleSchema
|
||||||
import io.bkbn.kompendium.util.Helpers.COMPONENT_SLUG
|
import io.bkbn.kompendium.util.Helpers.COMPONENT_SLUG
|
||||||
@ -16,6 +15,9 @@ import io.bkbn.kompendium.util.Helpers.genericNameAdapter
|
|||||||
import io.bkbn.kompendium.util.Helpers.getReferenceSlug
|
import io.bkbn.kompendium.util.Helpers.getReferenceSlug
|
||||||
import io.bkbn.kompendium.util.Helpers.getSimpleSlug
|
import io.bkbn.kompendium.util.Helpers.getSimpleSlug
|
||||||
import io.bkbn.kompendium.util.Helpers.logged
|
import io.bkbn.kompendium.util.Helpers.logged
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
import java.math.BigDecimal
|
||||||
|
import java.math.BigInteger
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
import kotlin.reflect.KType
|
import kotlin.reflect.KType
|
||||||
@ -24,9 +26,6 @@ import kotlin.reflect.full.isSubclassOf
|
|||||||
import kotlin.reflect.full.memberProperties
|
import kotlin.reflect.full.memberProperties
|
||||||
import kotlin.reflect.jvm.javaField
|
import kotlin.reflect.jvm.javaField
|
||||||
import kotlin.reflect.typeOf
|
import kotlin.reflect.typeOf
|
||||||
import org.slf4j.LoggerFactory
|
|
||||||
import java.math.BigDecimal
|
|
||||||
import java.math.BigInteger
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Responsible for generating the schema map that is used to power all object references across the API Spec.
|
* Responsible for generating the schema map that is used to power all object references across the API Spec.
|
||||||
@ -127,6 +126,7 @@ object Kontent {
|
|||||||
UUID::class -> cache.plus(clazz.simpleName!! to FormatSchema("uuid", "string"))
|
UUID::class -> cache.plus(clazz.simpleName!! to FormatSchema("uuid", "string"))
|
||||||
BigDecimal::class -> cache.plus(clazz.simpleName!! to FormatSchema("double", "number"))
|
BigDecimal::class -> cache.plus(clazz.simpleName!! to FormatSchema("double", "number"))
|
||||||
BigInteger::class -> cache.plus(clazz.simpleName!! to FormatSchema("int64", "integer"))
|
BigInteger::class -> cache.plus(clazz.simpleName!! to FormatSchema("int64", "integer"))
|
||||||
|
ByteArray::class -> cache.plus(clazz.simpleName!! to FormatSchema("byte", "string"))
|
||||||
else -> when {
|
else -> when {
|
||||||
clazz.isSubclassOf(Collection::class) -> handleCollectionType(type, clazz, cache)
|
clazz.isSubclassOf(Collection::class) -> handleCollectionType(type, clazz, cache)
|
||||||
clazz.isSubclassOf(Enum::class) -> handleEnumType(clazz, cache)
|
clazz.isSubclassOf(Enum::class) -> handleEnumType(clazz, cache)
|
||||||
@ -141,6 +141,8 @@ object Kontent {
|
|||||||
* @param clazz Class of the object to analyze
|
* @param clazz Class of the object to analyze
|
||||||
* @param cache Existing schema map to append to
|
* @param cache Existing schema map to append to
|
||||||
*/
|
*/
|
||||||
|
// TODO Fix as part of this issue https://github.com/bkbnio/kompendium/issues/80
|
||||||
|
@Suppress("LongMethod", "ComplexMethod")
|
||||||
private fun handleComplexType(type: KType, clazz: KClass<*>, cache: SchemaMap): SchemaMap {
|
private fun handleComplexType(type: KType, clazz: KClass<*>, cache: SchemaMap): SchemaMap {
|
||||||
// This needs to be simple because it will be stored under it's appropriate reference component implicitly
|
// This needs to be simple because it will be stored under it's appropriate reference component implicitly
|
||||||
val slug = type.getSimpleSlug()
|
val slug = type.getSimpleSlug()
|
||||||
@ -279,7 +281,7 @@ object Kontent {
|
|||||||
ReferencedSchema(("$COMPONENT_SLUG/${it.getSimpleSlug()}"))
|
ReferencedSchema(("$COMPONENT_SLUG/${it.getSimpleSlug()}"))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
false -> ReferencedSchema("${COMPONENT_SLUG}/${collectionClass.simpleName}")
|
false -> ReferencedSchema("$COMPONENT_SLUG/${collectionClass.simpleName}")
|
||||||
}
|
}
|
||||||
val schema = ArraySchema(items = valueReference)
|
val schema = ArraySchema(items = valueReference)
|
||||||
val updatedCache = generateKontent(collectionType, cache)
|
val updatedCache = generateKontent(collectionType, cache)
|
||||||
|
@ -49,6 +49,7 @@ object MethodParser {
|
|||||||
) = OpenApiSpecPathItemOperation(
|
) = OpenApiSpecPathItemOperation(
|
||||||
summary = info.summary,
|
summary = info.summary,
|
||||||
description = info.description,
|
description = info.description,
|
||||||
|
operationId = info.operationId,
|
||||||
tags = info.tags,
|
tags = info.tags,
|
||||||
deprecated = info.deprecated,
|
deprecated = info.deprecated,
|
||||||
parameters = paramType.toParameterSpec(),
|
parameters = paramType.toParameterSpec(),
|
||||||
|
@ -36,7 +36,7 @@ object Notarized {
|
|||||||
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
||||||
): Route =
|
): Route =
|
||||||
KompendiumPreFlight.methodNotarizationPreFlight<TParam, Unit, TResp>() { paramType, requestType, responseType ->
|
KompendiumPreFlight.methodNotarizationPreFlight<TParam, Unit, TResp>() { paramType, requestType, responseType ->
|
||||||
val path = Kompendium.pathCalculator.calculate(this)
|
val path = Kompendium.calculatePath(this)
|
||||||
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
||||||
Kompendium.openApiSpec.paths[path]?.get = parseMethodInfo(info, paramType, requestType, responseType)
|
Kompendium.openApiSpec.paths[path]?.get = parseMethodInfo(info, paramType, requestType, responseType)
|
||||||
return method(HttpMethod.Get) { handle(body) }
|
return method(HttpMethod.Get) { handle(body) }
|
||||||
@ -55,7 +55,7 @@ object Notarized {
|
|||||||
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
||||||
): Route =
|
): Route =
|
||||||
KompendiumPreFlight.methodNotarizationPreFlight<TParam, TReq, TResp>() { paramType, requestType, responseType ->
|
KompendiumPreFlight.methodNotarizationPreFlight<TParam, TReq, TResp>() { paramType, requestType, responseType ->
|
||||||
val path = Kompendium.pathCalculator.calculate(this)
|
val path = Kompendium.calculatePath(this)
|
||||||
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
||||||
Kompendium.openApiSpec.paths[path]?.post = parseMethodInfo(info, paramType, requestType, responseType)
|
Kompendium.openApiSpec.paths[path]?.post = parseMethodInfo(info, paramType, requestType, responseType)
|
||||||
return method(HttpMethod.Post) { handle(body) }
|
return method(HttpMethod.Post) { handle(body) }
|
||||||
@ -74,7 +74,7 @@ object Notarized {
|
|||||||
noinline body: PipelineInterceptor<Unit, ApplicationCall>,
|
noinline body: PipelineInterceptor<Unit, ApplicationCall>,
|
||||||
): Route =
|
): Route =
|
||||||
KompendiumPreFlight.methodNotarizationPreFlight<TParam, TReq, TResp>() { paramType, requestType, responseType ->
|
KompendiumPreFlight.methodNotarizationPreFlight<TParam, TReq, TResp>() { paramType, requestType, responseType ->
|
||||||
val path = Kompendium.pathCalculator.calculate(this)
|
val path = Kompendium.calculatePath(this)
|
||||||
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
||||||
Kompendium.openApiSpec.paths[path]?.put =
|
Kompendium.openApiSpec.paths[path]?.put =
|
||||||
parseMethodInfo(info, paramType, requestType, responseType)
|
parseMethodInfo(info, paramType, requestType, responseType)
|
||||||
@ -93,7 +93,7 @@ object Notarized {
|
|||||||
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
noinline body: PipelineInterceptor<Unit, ApplicationCall>
|
||||||
): Route =
|
): Route =
|
||||||
KompendiumPreFlight.methodNotarizationPreFlight<TParam, Unit, TResp> { paramType, requestType, responseType ->
|
KompendiumPreFlight.methodNotarizationPreFlight<TParam, Unit, TResp> { paramType, requestType, responseType ->
|
||||||
val path = Kompendium.pathCalculator.calculate(this)
|
val path = Kompendium.calculatePath(this)
|
||||||
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
Kompendium.openApiSpec.paths.getOrPut(path) { OpenApiSpecPathItem() }
|
||||||
Kompendium.openApiSpec.paths[path]?.delete = parseMethodInfo(info, paramType, requestType, responseType)
|
Kompendium.openApiSpec.paths[path]?.delete = parseMethodInfo(info, paramType, requestType, responseType)
|
||||||
return method(HttpMethod.Delete) { handle(body) }
|
return method(HttpMethod.Delete) { handle(body) }
|
||||||
@ -112,5 +112,4 @@ object Notarized {
|
|||||||
info.parseErrorInfo(errorType, responseType)
|
info.parseErrorInfo(errorType, responseType)
|
||||||
exception(handler)
|
exception(handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,7 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
open val canThrow: Set<KClass<*>> = emptySet(),
|
open val canThrow: Set<KClass<*>> = emptySet(),
|
||||||
open val responseInfo: ResponseInfo<TResp>? = null,
|
open val responseInfo: ResponseInfo<TResp>? = null,
|
||||||
open val parameterExamples: Map<String, TParam> = emptyMap(),
|
open val parameterExamples: Map<String, TParam> = emptyMap(),
|
||||||
|
open val operationId: String? = null
|
||||||
) {
|
) {
|
||||||
|
|
||||||
data class GetInfo<TParam, TResp>(
|
data class GetInfo<TParam, TResp>(
|
||||||
@ -21,7 +22,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
override val deprecated: Boolean = false,
|
override val deprecated: Boolean = false,
|
||||||
override val securitySchemes: Set<String> = emptySet(),
|
override val securitySchemes: Set<String> = emptySet(),
|
||||||
override val canThrow: Set<KClass<*>> = emptySet(),
|
override val canThrow: Set<KClass<*>> = emptySet(),
|
||||||
override val parameterExamples: Map<String, TParam> = emptyMap()
|
override val parameterExamples: Map<String, TParam> = emptyMap(),
|
||||||
|
override val operationId: String? = null
|
||||||
) : MethodInfo<TParam, TResp>(
|
) : MethodInfo<TParam, TResp>(
|
||||||
summary = summary,
|
summary = summary,
|
||||||
description = description,
|
description = description,
|
||||||
@ -30,7 +32,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
securitySchemes = securitySchemes,
|
securitySchemes = securitySchemes,
|
||||||
canThrow = canThrow,
|
canThrow = canThrow,
|
||||||
responseInfo = responseInfo,
|
responseInfo = responseInfo,
|
||||||
parameterExamples = parameterExamples
|
parameterExamples = parameterExamples,
|
||||||
|
operationId = operationId
|
||||||
)
|
)
|
||||||
|
|
||||||
data class PostInfo<TParam, TReq, TResp>(
|
data class PostInfo<TParam, TReq, TResp>(
|
||||||
@ -42,7 +45,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
override val deprecated: Boolean = false,
|
override val deprecated: Boolean = false,
|
||||||
override val securitySchemes: Set<String> = emptySet(),
|
override val securitySchemes: Set<String> = emptySet(),
|
||||||
override val canThrow: Set<KClass<*>> = emptySet(),
|
override val canThrow: Set<KClass<*>> = emptySet(),
|
||||||
override val parameterExamples: Map<String, TParam> = emptyMap()
|
override val parameterExamples: Map<String, TParam> = emptyMap(),
|
||||||
|
override val operationId: String? = null
|
||||||
) : MethodInfo<TParam, TResp>(
|
) : MethodInfo<TParam, TResp>(
|
||||||
summary = summary,
|
summary = summary,
|
||||||
description = description,
|
description = description,
|
||||||
@ -51,7 +55,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
securitySchemes = securitySchemes,
|
securitySchemes = securitySchemes,
|
||||||
canThrow = canThrow,
|
canThrow = canThrow,
|
||||||
responseInfo = responseInfo,
|
responseInfo = responseInfo,
|
||||||
parameterExamples = parameterExamples
|
parameterExamples = parameterExamples,
|
||||||
|
operationId = operationId
|
||||||
)
|
)
|
||||||
|
|
||||||
data class PutInfo<TParam, TReq, TResp>(
|
data class PutInfo<TParam, TReq, TResp>(
|
||||||
@ -63,7 +68,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
override val deprecated: Boolean = false,
|
override val deprecated: Boolean = false,
|
||||||
override val securitySchemes: Set<String> = emptySet(),
|
override val securitySchemes: Set<String> = emptySet(),
|
||||||
override val canThrow: Set<KClass<*>> = emptySet(),
|
override val canThrow: Set<KClass<*>> = emptySet(),
|
||||||
override val parameterExamples: Map<String, TParam> = emptyMap()
|
override val parameterExamples: Map<String, TParam> = emptyMap(),
|
||||||
|
override val operationId: String? = null
|
||||||
) : MethodInfo<TParam, TResp>(
|
) : MethodInfo<TParam, TResp>(
|
||||||
summary = summary,
|
summary = summary,
|
||||||
description = description,
|
description = description,
|
||||||
@ -71,7 +77,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
deprecated = deprecated,
|
deprecated = deprecated,
|
||||||
securitySchemes = securitySchemes,
|
securitySchemes = securitySchemes,
|
||||||
canThrow = canThrow,
|
canThrow = canThrow,
|
||||||
parameterExamples = parameterExamples
|
parameterExamples = parameterExamples,
|
||||||
|
operationId = operationId
|
||||||
)
|
)
|
||||||
|
|
||||||
data class DeleteInfo<TParam, TResp>(
|
data class DeleteInfo<TParam, TResp>(
|
||||||
@ -82,7 +89,8 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
override val deprecated: Boolean = false,
|
override val deprecated: Boolean = false,
|
||||||
override val securitySchemes: Set<String> = emptySet(),
|
override val securitySchemes: Set<String> = emptySet(),
|
||||||
override val canThrow: Set<KClass<*>> = emptySet(),
|
override val canThrow: Set<KClass<*>> = emptySet(),
|
||||||
override val parameterExamples: Map<String, TParam> = emptyMap()
|
override val parameterExamples: Map<String, TParam> = emptyMap(),
|
||||||
|
override val operationId: String? = null
|
||||||
) : MethodInfo<TParam, TResp>(
|
) : MethodInfo<TParam, TResp>(
|
||||||
summary = summary,
|
summary = summary,
|
||||||
description = description,
|
description = description,
|
||||||
@ -90,6 +98,7 @@ sealed class MethodInfo<TParam, TResp>(
|
|||||||
deprecated = deprecated,
|
deprecated = deprecated,
|
||||||
securitySchemes = securitySchemes,
|
securitySchemes = securitySchemes,
|
||||||
canThrow = canThrow,
|
canThrow = canThrow,
|
||||||
parameterExamples = parameterExamples
|
parameterExamples = parameterExamples,
|
||||||
|
operationId = operationId
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package io.bkbn.kompendium.models.oas
|
package io.bkbn.kompendium.models.oas
|
||||||
|
|
||||||
sealed class OpenApiSpecComponentSchema(open val default: Any? = null) {
|
sealed class OpenApiSpecComponentSchema(open val default: Any? = null) {
|
||||||
|
|
||||||
fun addDefault(default: Any?): OpenApiSpecComponentSchema = when (this) {
|
fun addDefault(default: Any?): OpenApiSpecComponentSchema = when (this) {
|
||||||
is AnyOfReferencedSchema -> error("Cannot add default to anyOf reference")
|
is AnyOfReferencedSchema -> error("Cannot add default to anyOf reference")
|
||||||
is ReferencedSchema -> this.copy(default = default)
|
is ReferencedSchema -> this.copy(default = default)
|
||||||
@ -12,7 +11,6 @@ sealed class OpenApiSpecComponentSchema(open val default: Any? = null) {
|
|||||||
is FormatSchema -> this.copy(default = default)
|
is FormatSchema -> this.copy(default = default)
|
||||||
is ArraySchema -> this.copy(default = default)
|
is ArraySchema -> this.copy(default = default)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sealed class TypedSchema(open val type: String, override val default: Any? = null) : OpenApiSpecComponentSchema(default)
|
sealed class TypedSchema(open val type: String, override val default: Any? = null) : OpenApiSpecComponentSchema(default)
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
package io.bkbn.kompendium.path
|
|
||||||
|
|
||||||
import io.ktor.routing.PathSegmentConstantRouteSelector
|
|
||||||
import io.ktor.routing.PathSegmentParameterRouteSelector
|
|
||||||
import io.ktor.routing.RootRouteSelector
|
|
||||||
import io.ktor.routing.Route
|
|
||||||
import io.ktor.util.InternalAPI
|
|
||||||
import org.slf4j.LoggerFactory
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default [PathCalculator] meant to be overridden as necessary
|
|
||||||
*/
|
|
||||||
open class CorePathCalculator : PathCalculator {
|
|
||||||
|
|
||||||
private val logger = LoggerFactory.getLogger(javaClass)
|
|
||||||
|
|
||||||
@OptIn(InternalAPI::class)
|
|
||||||
override fun calculate(
|
|
||||||
route: Route?,
|
|
||||||
tail: String
|
|
||||||
): String = when (route) {
|
|
||||||
null -> tail
|
|
||||||
else -> when (route.selector) {
|
|
||||||
is RootRouteSelector -> {
|
|
||||||
logger.debug("Root route detected, returning path: $tail")
|
|
||||||
tail
|
|
||||||
}
|
|
||||||
is PathSegmentParameterRouteSelector -> {
|
|
||||||
logger.debug("Found segment parameter ${route.selector}, continuing to parent")
|
|
||||||
val newTail = "/${route.selector}$tail"
|
|
||||||
calculate(route.parent, newTail)
|
|
||||||
}
|
|
||||||
is PathSegmentConstantRouteSelector -> {
|
|
||||||
logger.debug("Found segment constant ${route.selector}, continuing to parent")
|
|
||||||
val newTail = "/${route.selector}$tail"
|
|
||||||
calculate(route.parent, newTail)
|
|
||||||
}
|
|
||||||
else -> when (route.selector.javaClass.simpleName) {
|
|
||||||
"TrailingSlashRouteSelector" -> {
|
|
||||||
logger.debug("Found trailing slash route selector")
|
|
||||||
val newTail = tail.ifBlank { "/" }
|
|
||||||
calculate(route.parent, newTail)
|
|
||||||
}
|
|
||||||
else -> handleCustomSelectors(route, tail)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun handleCustomSelectors(route: Route, tail: String): String = error("Unknown selector ${route.selector}")
|
|
||||||
|
|
||||||
}
|
|
@ -0,0 +1,13 @@
|
|||||||
|
package io.bkbn.kompendium.path
|
||||||
|
|
||||||
|
import io.ktor.routing.Route
|
||||||
|
import io.ktor.routing.RouteSelector
|
||||||
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
|
interface IPathCalculator {
|
||||||
|
fun calculate(route: Route?, tail: String = ""): String
|
||||||
|
fun <T : RouteSelector> addCustomRouteHandler(
|
||||||
|
selector: KClass<T>,
|
||||||
|
handler: IPathCalculator.(Route, String) -> String
|
||||||
|
)
|
||||||
|
}
|
@ -1,20 +1,54 @@
|
|||||||
package io.bkbn.kompendium.path
|
package io.bkbn.kompendium.path
|
||||||
|
|
||||||
|
import io.ktor.routing.PathSegmentConstantRouteSelector
|
||||||
|
import io.ktor.routing.PathSegmentParameterRouteSelector
|
||||||
|
import io.ktor.routing.RootRouteSelector
|
||||||
import io.ktor.routing.Route
|
import io.ktor.routing.Route
|
||||||
|
import io.ktor.routing.RouteSelector
|
||||||
|
import io.ktor.routing.TrailingSlashRouteSelector
|
||||||
|
import io.ktor.util.InternalAPI
|
||||||
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extensible interface for calculating Ktor paths
|
* Responsible for calculating a url path from a provided [Route]
|
||||||
*/
|
*/
|
||||||
interface PathCalculator {
|
@OptIn(InternalAPI::class)
|
||||||
|
internal object PathCalculator: IPathCalculator {
|
||||||
|
|
||||||
/**
|
private val pathHandler: RouteHandlerMap = mutableMapOf()
|
||||||
* Core route calculation method
|
|
||||||
*/
|
|
||||||
fun calculate(route: Route?, tail: String = ""): String
|
|
||||||
|
|
||||||
/**
|
init {
|
||||||
* Used to handle any custom selectors that may be missed by the base route calculation
|
addCustomRouteHandler(RootRouteSelector::class) { _, tail -> tail }
|
||||||
*/
|
addCustomRouteHandler(PathSegmentParameterRouteSelector::class) { route, tail ->
|
||||||
fun handleCustomSelectors(route: Route, tail: String): String
|
val newTail = "/${route.selector}$tail"
|
||||||
|
calculate(route.parent, newTail)
|
||||||
|
}
|
||||||
|
addCustomRouteHandler(PathSegmentConstantRouteSelector::class) { route, tail ->
|
||||||
|
val newTail = "/${route.selector}$tail"
|
||||||
|
calculate(route.parent, newTail)
|
||||||
|
}
|
||||||
|
addCustomRouteHandler(TrailingSlashRouteSelector::class) { route, tail ->
|
||||||
|
val newTail = tail.ifBlank { "/" }
|
||||||
|
calculate(route.parent, newTail)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(InternalAPI::class)
|
||||||
|
override fun calculate(
|
||||||
|
route: Route?,
|
||||||
|
tail: String
|
||||||
|
): String = when (route) {
|
||||||
|
null -> tail
|
||||||
|
else -> when (pathHandler.containsKey(route.selector::class)) {
|
||||||
|
true -> pathHandler[route.selector::class]!!.invoke(this, route, tail)
|
||||||
|
else -> error("No handler has been registered for ${route.selector}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : RouteSelector> addCustomRouteHandler(
|
||||||
|
selector: KClass<T>,
|
||||||
|
handler: IPathCalculator.(Route, String) -> String
|
||||||
|
) {
|
||||||
|
pathHandler[selector] = handler
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
package io.bkbn.kompendium.path
|
||||||
|
|
||||||
|
import io.ktor.routing.Route
|
||||||
|
import io.ktor.routing.RouteSelector
|
||||||
|
import kotlin.reflect.KClass
|
||||||
|
|
||||||
|
typealias RouteHandlerMap = MutableMap<KClass<out RouteSelector>, IPathCalculator.(Route, String) -> String>
|
@ -13,14 +13,19 @@ import io.ktor.routing.route
|
|||||||
/**
|
/**
|
||||||
* Provides an out-of-the-box route to return the generated [OpenApiSpec]
|
* Provides an out-of-the-box route to return the generated [OpenApiSpec]
|
||||||
* @param oas spec that is returned
|
* @param oas spec that is returned
|
||||||
|
* @param om provider for Jackson
|
||||||
*/
|
*/
|
||||||
fun Routing.openApi(oas: OpenApiSpec) {
|
fun Routing.openApi(
|
||||||
val om = ObjectMapper()
|
oas: OpenApiSpec,
|
||||||
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
|
om: ObjectMapper = objectMapper
|
||||||
.enable(SerializationFeature.INDENT_OUTPUT)
|
) {
|
||||||
route("/openapi.json") {
|
route("/openapi.json") {
|
||||||
get {
|
get {
|
||||||
call.respondText { om.writeValueAsString(oas) }
|
call.respondText { om.writeValueAsString(oas) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val objectMapper = ObjectMapper()
|
||||||
|
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
|
||||||
|
.enable(SerializationFeature.INDENT_OUTPUT)
|
||||||
|
@ -46,6 +46,7 @@ import io.bkbn.kompendium.util.trailingSlash
|
|||||||
import io.bkbn.kompendium.util.undeclaredType
|
import io.bkbn.kompendium.util.undeclaredType
|
||||||
import io.bkbn.kompendium.util.withDefaultParameter
|
import io.bkbn.kompendium.util.withDefaultParameter
|
||||||
import io.bkbn.kompendium.util.withExamples
|
import io.bkbn.kompendium.util.withExamples
|
||||||
|
import io.bkbn.kompendium.util.withOperationId
|
||||||
|
|
||||||
internal class KompendiumTest {
|
internal class KompendiumTest {
|
||||||
|
|
||||||
@ -139,7 +140,6 @@ internal class KompendiumTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Notarized put does not interrupt the pipeline`() {
|
fun `Notarized put does not interrupt the pipeline`() {
|
||||||
withTestApplication({
|
withTestApplication({
|
||||||
@ -363,6 +363,22 @@ internal class KompendiumTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Can add operationId`() {
|
||||||
|
withTestApplication({
|
||||||
|
jacksonConfigModule()
|
||||||
|
docs()
|
||||||
|
withOperationId()
|
||||||
|
}) {
|
||||||
|
// do
|
||||||
|
val json = handleRequest(HttpMethod.Get, "/openapi.json").response.content
|
||||||
|
|
||||||
|
// expect
|
||||||
|
val expected = getFileSnapshot("notarized_get_with_operation_id.json").trim()
|
||||||
|
assertEquals(expected, json, "The received json spec should match the expected content")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Generates the expected redoc`() {
|
fun `Generates the expected redoc`() {
|
||||||
withTestApplication({
|
withTestApplication({
|
||||||
@ -607,5 +623,4 @@ internal class KompendiumTest {
|
|||||||
redoc(oas)
|
redoc(oas)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -49,6 +49,17 @@ internal class KontentTest {
|
|||||||
assertEquals(FormatSchema("int64", "integer"), result["BigInteger"])
|
assertEquals(FormatSchema("int64", "integer"), result["BigInteger"])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Object with ByteArray type`() {
|
||||||
|
// do
|
||||||
|
val result = generateKontent<TestByteArrayModel>()
|
||||||
|
|
||||||
|
// expect
|
||||||
|
assertEquals(2, result.count())
|
||||||
|
assertTrue { result.containsKey(TestByteArrayModel::class.simpleName) }
|
||||||
|
assertEquals(FormatSchema("byte", "string"), result["ByteArray"])
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Objects reference their base types in the cache`() {
|
fun `Objects reference their base types in the cache`() {
|
||||||
// do
|
// do
|
||||||
|
@ -12,6 +12,8 @@ data class TestSimpleModel(val a: String, val b: Int)
|
|||||||
|
|
||||||
data class TestBigNumberModel(val a: BigDecimal, val b: BigInteger)
|
data class TestBigNumberModel(val a: BigDecimal, val b: BigInteger)
|
||||||
|
|
||||||
|
data class TestByteArrayModel(val a: ByteArray)
|
||||||
|
|
||||||
data class TestNestedModel(val inner: TestSimpleModel)
|
data class TestNestedModel(val inner: TestSimpleModel)
|
||||||
|
|
||||||
data class TestSimpleWithEnums(val a: String, val b: SimpleEnum)
|
data class TestSimpleWithEnums(val a: String, val b: SimpleEnum)
|
||||||
@ -93,7 +95,7 @@ data class AnothaJamma(val b: Float) : SlammaJamma
|
|||||||
|
|
||||||
sealed interface Flibbity<T>
|
sealed interface Flibbity<T>
|
||||||
|
|
||||||
data class Gibbity<T>(val a: T): Flibbity<T>
|
data class Gibbity<T>(val a: T) : Flibbity<T>
|
||||||
data class Bibbity<T>(val b: String, val f: T) : Flibbity<T>
|
data class Bibbity<T>(val b: String, val f: T) : Flibbity<T>
|
||||||
|
|
||||||
enum class Hehe {
|
enum class Hehe {
|
||||||
|
@ -265,6 +265,18 @@ fun Application.withDefaultParameter() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun Application.withOperationId(){
|
||||||
|
routing {
|
||||||
|
route("/test") {
|
||||||
|
notarizedGet(
|
||||||
|
info = TestResponseInfo.testGetInfo.copy(operationId = "getTest")
|
||||||
|
){
|
||||||
|
call.respond(HttpStatusCode.OK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun Application.nonRequiredParamsGet() {
|
fun Application.nonRequiredParamsGet() {
|
||||||
routing {
|
routing {
|
||||||
route("/test/optional") {
|
route("/test/optional") {
|
||||||
|
@ -0,0 +1,88 @@
|
|||||||
|
{
|
||||||
|
"openapi" : "3.0.3",
|
||||||
|
"info" : {
|
||||||
|
"title" : "Test API",
|
||||||
|
"version" : "1.33.7",
|
||||||
|
"description" : "An amazing, fully-ish 😉 generated API spec",
|
||||||
|
"termsOfService" : "https://example.com",
|
||||||
|
"contact" : {
|
||||||
|
"name" : "Homer Simpson",
|
||||||
|
"url" : "https://gph.is/1NPUDiM",
|
||||||
|
"email" : "chunkylover53@aol.com"
|
||||||
|
},
|
||||||
|
"license" : {
|
||||||
|
"name" : "MIT",
|
||||||
|
"url" : "https://github.com/bkbnio/kompendium/blob/main/LICENSE"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"servers" : [ {
|
||||||
|
"url" : "https://myawesomeapi.com",
|
||||||
|
"description" : "Production instance of my API"
|
||||||
|
}, {
|
||||||
|
"url" : "https://staging.myawesomeapi.com",
|
||||||
|
"description" : "Where the fun stuff happens"
|
||||||
|
} ],
|
||||||
|
"paths" : {
|
||||||
|
"/test" : {
|
||||||
|
"get" : {
|
||||||
|
"tags" : [ ],
|
||||||
|
"summary" : "Another get test",
|
||||||
|
"description" : "testing more",
|
||||||
|
"operationId" : "getTest",
|
||||||
|
"parameters" : [ {
|
||||||
|
"name" : "a",
|
||||||
|
"in" : "path",
|
||||||
|
"schema" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"required" : true,
|
||||||
|
"deprecated" : false
|
||||||
|
}, {
|
||||||
|
"name" : "aa",
|
||||||
|
"in" : "query",
|
||||||
|
"schema" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int32"
|
||||||
|
},
|
||||||
|
"required" : true,
|
||||||
|
"deprecated" : false
|
||||||
|
} ],
|
||||||
|
"responses" : {
|
||||||
|
"200" : {
|
||||||
|
"description" : "A Successful Endeavor",
|
||||||
|
"content" : {
|
||||||
|
"application/json" : {
|
||||||
|
"schema" : {
|
||||||
|
"$ref" : "#/components/schemas/TestResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"deprecated" : false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"components" : {
|
||||||
|
"schemas" : {
|
||||||
|
"String" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"TestResponse" : {
|
||||||
|
"type" : "object",
|
||||||
|
"properties" : {
|
||||||
|
"c" : {
|
||||||
|
"$ref" : "#/components/schemas/String"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Int" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int32"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"securitySchemes" : { }
|
||||||
|
},
|
||||||
|
"security" : [ ],
|
||||||
|
"tags" : [ ]
|
||||||
|
}
|
@ -4,6 +4,7 @@ import io.bkbn.kompendium.annotations.KompendiumField
|
|||||||
import io.bkbn.kompendium.annotations.KompendiumParam
|
import io.bkbn.kompendium.annotations.KompendiumParam
|
||||||
import io.bkbn.kompendium.annotations.ParamType
|
import io.bkbn.kompendium.annotations.ParamType
|
||||||
import io.bkbn.kompendium.annotations.UndeclaredField
|
import io.bkbn.kompendium.annotations.UndeclaredField
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
|
||||||
data class ExampleParams(
|
data class ExampleParams(
|
||||||
@ -27,6 +28,7 @@ data class ExampleRequest(
|
|||||||
val aaa: List<Long>
|
val aaa: List<Long>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
data class ExampleResponse(val c: String)
|
data class ExampleResponse(val c: String)
|
||||||
|
|
||||||
data class ExceptionResponse(val message: String)
|
data class ExceptionResponse(val message: String)
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
rootProject.name = "kompendium"
|
rootProject.name = "kompendium"
|
||||||
|
|
||||||
include("kompendium-core")
|
include("kompendium-core")
|
||||||
include("kompendium-auth")
|
include("kompendium-auth")
|
||||||
include("kompendium-swagger-ui")
|
include("kompendium-swagger-ui")
|
||||||
|
Reference in New Issue
Block a user