From 034c00ca5b93a49cd92ac5abe4a149f967b3e2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Thu, 7 May 2020 15:01:29 +0200 Subject: [PATCH] Add new types: - Category - Classification - Design - Layout - Order - Page - Status - Thrill --- .../dataMappings/category/Category.kt | 73 +++++++++++++++++++ .../dataMappings/category/CategoryBuilder.kt | 37 ++++++++++ .../dataMappings/category/paramBuilder.kt | 10 +++ .../classification/Classification.kt | 14 ++-- .../classification/ClassificationBuilder.kt | 2 +- .../classification/paramBuilder.kt | 2 +- .../rcdbquery/dataMappings/design/Design.kt | 37 ++++++++++ .../dataMappings/design/DesignBuilder.kt | 19 +++++ .../dataMappings/design/paramBuilder.kt | 10 +++ .../dataMappings/internal/ParamKey.kt | 5 ++ .../dataMappings/internal/RcdbItem.kt | 7 ++ .../internal/StringGeneratable.kt | 5 ++ .../rcdbquery/dataMappings/layout/Layout.kt | 45 ++++++++++++ .../dataMappings/layout/LayoutBuilder.kt | 39 ++++++++++ .../dataMappings/layout/paramBuilder.kt | 10 +++ .../rcdbquery/dataMappings/order/Order.kt | 12 +-- .../dataMappings/order/OrderBuilder.kt | 2 +- .../dataMappings/order/paramBuilder.kt | 2 +- .../rcdbquery/dataMappings/page/Page.kt | 9 ++- .../dataMappings/page/paramBuilder.kt | 4 +- .../dataMappings/searchTerm/SearchTerm.kt | 5 +- .../dataMappings/searchTerm/paramBuilder.kt | 2 +- .../dataMappings/searchType/SearchType.kt | 9 ++- .../dataMappings/searchType/paramBuilder.kt | 2 +- .../dataMappings/startsWith/StartsWith.kt | 5 +- .../dataMappings/startsWith/paramBuilder.kt | 2 +- .../rcdbquery/dataMappings/status/Status.kt | 21 +++--- .../dataMappings/status/StatusBuilder.kt | 2 +- .../dataMappings/status/paramBuilder.kt | 2 +- .../rcdbquery/dataMappings/thrill/Thrill.kt | 30 ++++++++ .../dataMappings/thrill/ThrillBuilder.kt | 15 ++++ .../dataMappings/thrill/paramBuilder.kt | 10 +++ .../rcdbquery/dataMappings/type/Type.kt | 26 +++++++ .../dataMappings/type/TypeBuilder.kt | 13 ++++ .../dataMappings/type/paramBuilder.kt | 12 +++ .../rcdbquery/dataMappings/vendor/Vendor.kt | 19 +++-- .../dataMappings/vendor/VendorBuilder.kt | 2 +- .../dataMappings/vendor/paramBuilder.kt | 3 +- .../de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt | 2 +- src/main/kotlin/module-info.java | 5 ++ 40 files changed, 477 insertions(+), 54 deletions(-) create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/Category.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/CategoryBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/paramBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/Design.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/DesignBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/paramBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/ParamKey.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbItem.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/StringGeneratable.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/Layout.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/LayoutBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/paramBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/Thrill.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/ThrillBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/paramBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/Type.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/TypeBuilder.kt create mode 100644 src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/paramBuilder.kt diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/Category.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/Category.kt new file mode 100644 index 0000000..89ed396 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/Category.kt @@ -0,0 +1,73 @@ +package de.pheerai.rcdbquery.dataMappings.category + +import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable + +enum class Category( + override val prettyName: String, + override val fullName: String, + override val paramValue: Long +) : RcdbParamOption { + FOURTH_DIMENSION("4th Dimension", 24), + BRAKEMAN("Brakeman", 290), + BUILT_INHOUSE("Built In-House", 28), + DARK_RIDE("Dark Ride", 74), + DUAL_STATION("Dual Station", 147), + ENCLOSED("Enclosed", 114), + FLOORLESS("Floorless", 111), + HYBRID("Hybrid", 219), + INDOOR("Indoor", 113), + MIRROR("Mirror", 27), + MOEBIUS("Möbius", 108), + ONBOARD_SOUND("Onboard Sound", 309), + PENDULUM("Pendulum", 82), + QUASI_MOEBIUS("Quasi Möbius", 37), + ROCKING_CARS("Rocking Cars", 34), + SCENIC_RAILWAY("Scenic Railway", 25), + SHUTTLE("Shuttle", 115), + SIDE_FRICTION("Side Friction", 106), + SINGLE_RAIL("Single Rail", 41), + SLIDING_STATION("Sliding Station", 26), + SPINNING_CARS("Spinning Cars", 105), + STACKED_STORAGE("Stacked Storage", 88), + TURNTABLE_STATION("Turntable Station", 42), + TWIN("Twin", 104), + VIRTUAL_REALITY("Virtual Reality", 32), + WATER_COASTER("Water Coaster", 103) + ; + + constructor(name: String, paramValue: Long) : this(name, name, paramValue) + + companion object : StringGeneratable { + override val paramKey = "ca" + override fun of(input: String): Category? = when (input) { + "4th Dimension" -> FOURTH_DIMENSION + "Brakeman" -> BRAKEMAN + "Built In-House" -> BUILT_INHOUSE + "Dark Ride" -> DARK_RIDE + "Dual Station" -> DUAL_STATION + "Enclosed" -> ENCLOSED + "Floorless" -> FLOORLESS + "Hybrid" -> HYBRID + "Indoor" -> INDOOR + "Mirror" -> MIRROR + "Möbius" -> MOEBIUS + "Onboard Sound" -> ONBOARD_SOUND + "Pendulum" -> PENDULUM + "Quasi Möbius" -> QUASI_MOEBIUS + "Rocking Cars" -> ROCKING_CARS + "Scenic Railway" -> SCENIC_RAILWAY + "Shuttle" -> SHUTTLE + "Side Friction" -> SIDE_FRICTION + "Single Rail" -> SINGLE_RAIL + "Sliding Station" -> SLIDING_STATION + "Spinning Cars" -> SPINNING_CARS + "Stacked Storage" -> STACKED_STORAGE + "Turntable Station" -> TURNTABLE_STATION + "Twin" -> TWIN + "Virtual Reality" -> VIRTUAL_REALITY + "Water Coaster" -> WATER_COASTER + else -> null + } + } +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/CategoryBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/CategoryBuilder.kt new file mode 100644 index 0000000..2332b46 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/CategoryBuilder.kt @@ -0,0 +1,37 @@ +package de.pheerai.rcdbquery.dataMappings.category + +import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder + +class CategoryBuilder: MultiParamBuilder() { + override fun add(param: Category): CategoryBuilder { + super.add(param) + return this + } + + fun fourthDimension() = this.add(Category.FOURTH_DIMENSION) + fun brakeman() = this.add(Category.BRAKEMAN) + fun builtInhouse() = this.add(Category.BUILT_INHOUSE) + fun darkride() = this.add(Category.DARK_RIDE) + fun dualStation() = this.add(Category.DUAL_STATION) + fun enclosed() = this.add(Category.ENCLOSED) + fun floorless() = this.add(Category.FLOORLESS) + fun hybrid() = this.add(Category.HYBRID) + fun indoor() = this.add(Category.INDOOR) + fun mirror() = this.add(Category.MIRROR) + fun moebius() = this.add(Category.MOEBIUS) + fun onboardSound() = this.add(Category.ONBOARD_SOUND) + fun pendulum() = this.add(Category.PENDULUM) + fun quasiMoebius() = this.add(Category.QUASI_MOEBIUS) + fun rockingCars() = this.add(Category.ROCKING_CARS) + fun scenicRailway() = this.add(Category.SCENIC_RAILWAY) + fun shuttle() = this.add(Category.SHUTTLE) + fun sideFriction() = this.add(Category.SIDE_FRICTION) + fun singleRail() = this.add(Category.SINGLE_RAIL) + fun slidingStation() = this.add(Category.SLIDING_STATION) + fun spinningCars() = this.add(Category.SPINNING_CARS) + fun stackedStorage() = this.add(Category.STACKED_STORAGE) + fun turntableStation() = this.add(Category.TURNTABLE_STATION) + fun twin() = this.add(Category.TWIN) + fun virtualReality() = this.add(Category.VIRTUAL_REALITY) + fun waterCoaster() = this.add(Category.WATER_COASTER) +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/paramBuilder.kt new file mode 100644 index 0000000..883c4fc --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/category/paramBuilder.kt @@ -0,0 +1,10 @@ +package de.pheerai.rcdbquery.dataMappings.category + +import de.pheerai.rcdbquery.dsl.ParamsCollector + +fun ParamsCollector.category(body: CategoryBuilder.() -> CategoryBuilder): ParamsCollector { + val builder = CategoryBuilder() + builder.body() + this[Category.paramKey] = builder.build() + return this +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/Classification.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/Classification.kt index c0f8b29..6d471b9 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/Classification.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/Classification.kt @@ -1,20 +1,22 @@ package de.pheerai.rcdbquery.dataMappings.classification import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable enum class Classification( override val prettyName: String, override val fullName: String, - override val paramValue: Int -) : RcdbParamOption { + override val paramValue: Long +) : RcdbParamOption { ROLLER_COASTER("Roller Coaster", 277), POWERED_COASTER("Powered Coaster", 278), - MOUNTAIN_COASTER("Mountain Coaster", 279) + MOUNTAIN_COASTER("Mountain Coaster", 279), ; - constructor(name: String, paramValue: Int) : this(name, name, paramValue) + constructor(name: String, paramValue: Long) : this(name, name, paramValue) - companion object { - const val staticParamName = "cs" + companion object: StringGeneratable { + override fun of(input: String) = values().find { it.fullName == input } + override val paramKey = "cs" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/ClassificationBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/ClassificationBuilder.kt index d89f614..1b41907 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/ClassificationBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/ClassificationBuilder.kt @@ -2,7 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.classification import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder -class ClassificationBuilder : MultiParamBuilder() { +class ClassificationBuilder : MultiParamBuilder() { override fun add(param: Classification): ClassificationBuilder { super.add(param) return this diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/paramBuilder.kt index 220596b..e79c401 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/classification/paramBuilder.kt @@ -5,6 +5,6 @@ import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.classification(body: ClassificationBuilder.() -> ClassificationBuilder): ParamsCollector { val builder = ClassificationBuilder() builder.body() - this[Classification.staticParamName] = builder.build() + this[Classification.paramKey] = builder.build() return this } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/Design.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/Design.kt new file mode 100644 index 0000000..2ac4369 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/Design.kt @@ -0,0 +1,37 @@ +package de.pheerai.rcdbquery.dataMappings.design + +import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable + +enum class Design( + override val prettyName: String, + override val fullName: String, + override val paramValue: Long +) : RcdbParamOption { + SIT_DOWN("Sit Down", 6), + INVERTED("Inverted", 5), + SUSPENDED("Suspended", 8), + WING("Wing", 67), + FLYING("Flying", 4), + STAND_UP("Stand Up", 7), + BOBSLED("Bobsled", 3), + PIPELINE("Pipeline", 73) + ; + + constructor(name: String, paramValue: Long) : this(name, name, paramValue) + + companion object : StringGeneratable { + override val paramKey = "de" + override fun of(input: String): Design? = when (input) { + "Sit Down" -> SIT_DOWN + "Inverted" -> INVERTED + "Suspended" -> SUSPENDED + "Wing" -> WING + "Flying" -> FLYING + "Stand Up" -> STAND_UP + "Bobsled" -> BOBSLED + "Pipeline" -> PIPELINE + else -> null + } + } +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/DesignBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/DesignBuilder.kt new file mode 100644 index 0000000..b340276 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/DesignBuilder.kt @@ -0,0 +1,19 @@ +package de.pheerai.rcdbquery.dataMappings.design + +import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder + +class DesignBuilder : MultiParamBuilder() { + override fun add(param: Design): DesignBuilder { + super.add(param) + return this + } + + fun sitDown() = Design.SIT_DOWN + fun inverted() = Design.INVERTED + fun suspended() = Design.SUSPENDED + fun wing() = Design.WING + fun flying() = Design.FLYING + fun standUp() = Design.STAND_UP + fun bobsled() = Design.BOBSLED + fun pipeline() = Design.PIPELINE +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/paramBuilder.kt new file mode 100644 index 0000000..5fbd84c --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/design/paramBuilder.kt @@ -0,0 +1,10 @@ +package de.pheerai.rcdbquery.dataMappings.design + +import de.pheerai.rcdbquery.dsl.ParamsCollector + +fun ParamsCollector.design(body: DesignBuilder.() -> DesignBuilder): ParamsCollector { + val builder = DesignBuilder() + builder.body() + this[Design.paramKey] = builder.build() + return this +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/ParamKey.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/ParamKey.kt new file mode 100644 index 0000000..2e32fc6 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/ParamKey.kt @@ -0,0 +1,5 @@ +package de.pheerai.rcdbquery.dataMappings.internal + +interface ParamKey { + val paramKey: String +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbItem.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbItem.kt new file mode 100644 index 0000000..575408f --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/RcdbItem.kt @@ -0,0 +1,7 @@ +package de.pheerai.rcdbquery.dataMappings.internal + +interface RcdbItem { + val url: String + get() ="https://www.rcdb.com/${id}.htm" + val id: Long +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/StringGeneratable.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/StringGeneratable.kt new file mode 100644 index 0000000..56762a5 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/internal/StringGeneratable.kt @@ -0,0 +1,5 @@ +package de.pheerai.rcdbquery.dataMappings.internal + +interface StringGeneratable: ParamKey { + fun of(input: String): T? +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/Layout.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/Layout.kt new file mode 100644 index 0000000..f6bf566 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/Layout.kt @@ -0,0 +1,45 @@ +package de.pheerai.rcdbquery.dataMappings.layout + +import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable + +enum class Layout( + override val prettyName: String, + override val fullName: String, + override val paramValue: Long +) : RcdbParamOption { + BIG_APPLE("Big Apple / Wacky Worm", 282), + CIRCLE_DIP("Circle Dip", 36), + CIRCULAR_GRAVIY_RAILWAY("Circular Gravity Railway", 269), + CYCLONE("Cyclone", 96), + DOUBLE_FIGURE_EIGHT("Double Figure Eight", 123), + DOUBLE_OUT_AND_BACK("Double Out and Back", 121), + FIGURE_EIGHT("Figure Eight", 102), + JUNGLE_MOUSE("Jungle Mouse", 305), + L_SHAPED_OUT_AND_BACK("L-Shaped Out and Back", 254), + MITE_MOUSE("Mite Mouse", 206), + OUT_AND_BACK("Out and Back", 99), + OVAL("Oval", 124), + SHUTTLE_LOOP("Shuttle Loop", 97), + SINGLE_HELIX_CENTER("Single Helix (center)", 142), + SINGLE_HELIX_LEFT("Single Helix (left)", 141), + SINGLE_HELIX_REAR("Single Helix (rear)", 83), + SINGLE_HELIX_RIGHT("Single Helix (right)", 139), + TERRAIN("Terrain", 125), + TRIANGLE("Triangle", 90), + TRIPLE_OUT_AND_BACK("Triple Out and Back", 301), + TWIN_HELIX("Twin Helix", 140), + TWISTER("Twister", 122), + U_SHUTTLE("U Shuttle", 81), + WILD_MOUSE("Wild Mouse", 95), + ZYKLON("Zyklon / Galaxy", 294) + ; + + constructor(name: String, paramValue: Long) : this(name, name, paramValue) + + companion object : StringGeneratable { + override val paramKey = "lo" + + override fun of(input: String): Layout? = values().find { input == it.fullName } + } +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/LayoutBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/LayoutBuilder.kt new file mode 100644 index 0000000..c07957e --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/LayoutBuilder.kt @@ -0,0 +1,39 @@ +package de.pheerai.rcdbquery.dataMappings.layout + +import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder + +class LayoutBuilder : MultiParamBuilder() { + override fun add(param: Layout): LayoutBuilder { + super.add(param) + return this + } + + fun bigApple() = this.add(Layout.BIG_APPLE) + fun wackyWorm() = this.add(Layout.BIG_APPLE) + + fun circleDip() = this.add(Layout.CIRCLE_DIP) + fun circularGravityRailway() = this.add(Layout.CIRCULAR_GRAVIY_RAILWAY) + fun cyclone() = this.add(Layout.CYCLONE) + fun doubleFigureEight() = this.add(Layout.DOUBLE_FIGURE_EIGHT) + fun doubleOutAndBack() = this.add(Layout.DOUBLE_OUT_AND_BACK) + fun figureEight() = this.add(Layout.FIGURE_EIGHT) + fun jungleMouse() = this.add(Layout.JUNGLE_MOUSE) + fun lShapedOutAndBack() = this.add(Layout.L_SHAPED_OUT_AND_BACK) + fun miteMouse() = this.add(Layout.MITE_MOUSE) + fun outAndBack() = this.add(Layout.OUT_AND_BACK) + fun oval() = this.add(Layout.OVAL) + fun shuttleLoop() = this.add(Layout.SHUTTLE_LOOP) + fun singleHelixCenter() = this.add(Layout.SINGLE_HELIX_CENTER) + fun singleHelixLeft() = this.add(Layout.SINGLE_HELIX_LEFT) + fun singleHelixRear() = this.add(Layout.SINGLE_HELIX_REAR) + fun singleHelixRight() = this.add(Layout.SINGLE_HELIX_RIGHT) + fun terrain() = this.add(Layout.TERRAIN) + fun triangle() = this.add(Layout.TRIANGLE) + fun tripleOutAndBack() = this.add(Layout.TRIPLE_OUT_AND_BACK) + fun twinHelix() = this.add(Layout.TWIN_HELIX) + fun twister() = this.add(Layout.TWISTER) + fun uShuttle() = this.add(Layout.U_SHUTTLE) + fun wildMouse() = this.add(Layout.WILD_MOUSE) + fun zyklon() = this.add(Layout.ZYKLON) + fun galaxy() = this.add(Layout.ZYKLON) +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/paramBuilder.kt new file mode 100644 index 0000000..2acab17 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/layout/paramBuilder.kt @@ -0,0 +1,10 @@ +package de.pheerai.rcdbquery.dataMappings.layout + +import de.pheerai.rcdbquery.dsl.ParamsCollector + +fun ParamsCollector.layout(body: LayoutBuilder.() -> LayoutBuilder): ParamsCollector { + val builder = LayoutBuilder() + builder.body() + this[Layout.paramKey] = builder.build() + return this +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/Order.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/Order.kt index f4dd8a6..fee5bdf 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/Order.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/Order.kt @@ -1,15 +1,17 @@ package de.pheerai.rcdbquery.dataMappings.order +import de.pheerai.rcdbquery.dataMappings.internal.ParamKey import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption import de.pheerai.rcdbquery.dataMappings.internal.RelevantForAll +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable @Suppress("unused") enum class Order( override val prettyName: String, override val fullName: String, - override val paramValue: Int, + override val paramValue: Long, override val relevantForAll: Boolean = true -) : RcdbParamOption, +) : RcdbParamOption, RelevantForAll { IMAGES("Images", "Amount of Images", 0), NAME("Name", "Name of the Coaster", 1), @@ -46,9 +48,9 @@ enum class Order( CLOSING("Closing", "(Future) closign date for temporary installations", 31) ; - constructor(name: String, paramId: Int) : this(name, name, paramId) + constructor(name: String, paramId: Long) : this(name, name, paramId) - companion object { - const val staticParamName = "order" + companion object: ParamKey { + override val paramKey = "order" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/OrderBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/OrderBuilder.kt index 24ca0a3..3bc4bff 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/OrderBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/OrderBuilder.kt @@ -2,7 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.order import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder -class OrderBuilder : MultiParamBuilder() { +class OrderBuilder : MultiParamBuilder() { override fun add(param: Order): OrderBuilder { super.add(param) return this diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/paramBuilder.kt index 1622e47..5d6a094 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/order/paramBuilder.kt @@ -5,6 +5,6 @@ import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.sortBy(body: OrderBuilder.() -> OrderBuilder): ParamsCollector { val builder = OrderBuilder() builder.body() - this[Order.staticParamName] = builder.build() + this[Order.paramKey] = builder.build() return this } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/Page.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/Page.kt index dcc40a5..d54ba1b 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/Page.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/Page.kt @@ -1,13 +1,14 @@ package de.pheerai.rcdbquery.dataMappings.page +import de.pheerai.rcdbquery.dataMappings.internal.ParamKey import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption -class Page(override val paramValue: Int) : - RcdbParamOption { +class Page(override val paramValue: Long) : + RcdbParamOption { override val fullName = "The page to show" override val prettyName = "Page" - companion object { - const val staticParamName = "page" + companion object: ParamKey { + override val paramKey = "page" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt index 325ca96..1848292 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/page/paramBuilder.kt @@ -2,7 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.page import de.pheerai.rcdbquery.dsl.ParamsCollector -fun ParamsCollector.page(page: Int) = also { - this[Page.staticParamName] = +fun ParamsCollector.page(page: Long) = also { + this[Page.paramKey] = Page(page) } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/SearchTerm.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/SearchTerm.kt index 6206e1d..37e4694 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/SearchTerm.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/SearchTerm.kt @@ -1,5 +1,6 @@ package de.pheerai.rcdbquery.dataMappings.searchTerm +import de.pheerai.rcdbquery.dataMappings.internal.ParamKey import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption class SearchTerm(override val paramValue: String) : @@ -7,7 +8,7 @@ class SearchTerm(override val paramValue: String) : override val prettyName = "Search Term" override val fullName = "Search for elements whose name contain this term" - companion object { - const val staticParamName = "nc" + companion object: ParamKey { + override val paramKey = "nc" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/paramBuilder.kt index 522a627..e4127ae 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchTerm/paramBuilder.kt @@ -3,7 +3,7 @@ package de.pheerai.rcdbquery.dataMappings.searchTerm import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.searchTerm(term: String) = also { - it[SearchTerm.staticParamName] = listOf( + it[SearchTerm.paramKey] = listOf( SearchTerm(term) ) } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/SearchType.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/SearchType.kt index e12ef9c..3ef74f4 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/SearchType.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/SearchType.kt @@ -1,20 +1,21 @@ package de.pheerai.rcdbquery.dataMappings.searchType +import de.pheerai.rcdbquery.dataMappings.internal.ParamKey import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption @Suppress("unused") enum class SearchType( override val prettyName: String, override val fullName: String, - override val paramValue: Int -) : RcdbParamOption { + override val paramValue: Long +) : RcdbParamOption { COASTER("Coaster", "Search for Roller Coaster", 2), AMUSEMENT_PARK("Amusement Parks", "Searh for an amusement park", 3), COMPANY("Company", "Search for company (manufacturer, engineering,...)", 12), PERSON("Person", "Search for a person (designer, engineer,...)", 13) ; - companion object { - const val staticParamName = "ot" + companion object: ParamKey { + override val paramKey = "ot" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/paramBuilder.kt index 343ead7..a5e1711 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/searchType/paramBuilder.kt @@ -3,5 +3,5 @@ package de.pheerai.rcdbquery.dataMappings.searchType import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.searchType(searchType: SearchType) = also { - it[SearchType.staticParamName] = searchType + it[SearchType.paramKey] = searchType } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/StartsWith.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/StartsWith.kt index 2faac58..42eb629 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/StartsWith.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/StartsWith.kt @@ -2,6 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.startsWith +import de.pheerai.rcdbquery.dataMappings.internal.ParamKey import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption class StartsWith(override val paramValue: String) : @@ -9,8 +10,8 @@ class StartsWith(override val paramValue: String) : override val prettyName = "Starts with" override val fullName = "Name starting with term" - companion object { - const val staticParamName = "nl" + companion object: ParamKey { + override val paramKey = "nl" } } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/paramBuilder.kt index 1004e45..70e04f8 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/startsWith/paramBuilder.kt @@ -3,6 +3,6 @@ package de.pheerai.rcdbquery.dataMappings.startsWith import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.startsWith(term: String) = also { - this[StartsWith.staticParamName] = + this[StartsWith.paramKey] = StartsWith(term) } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt index 615245d..8462287 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/Status.kt @@ -1,25 +1,27 @@ package de.pheerai.rcdbquery.dataMappings.status import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable @Suppress("unused") enum class Status( override val prettyName: String, override val fullName: String, - override val paramValue: Int -) : RcdbParamOption { - SBNO("SBNO", "Standing, but not operating", 311), - OPERATING("Operating", "In operation", 93), + override val paramValue: Long +) : RcdbParamOption { + SBNO("SBNO", 311), + OPERATING("Operating", 93), UNDER_CONSTRUCTION("Under Construction", 310), - STORED("Stored", "In storage", 312) + STORED("Stored", "In Storage", 312), + RELOCATED("Relocated", -1), ; - constructor(name: String, paramId: Int) : this(name, name, paramId) + constructor(name: String, paramId: Long) : this(name, name, paramId) - companion object { - const val staticParamName = "st" + companion object: StringGeneratable { + override val paramKey = "st" - fun of(input: String) = when (input) { + override fun of(input: String) = when (input) { "SBNO" -> SBNO "Operating" -> OPERATING "Under Construction" -> UNDER_CONSTRUCTION @@ -28,4 +30,3 @@ enum class Status( } } } - diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/StatusBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/StatusBuilder.kt index 448a3c8..4a27274 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/StatusBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/StatusBuilder.kt @@ -2,7 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.status import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder -class StatusBuilder : MultiParamBuilder() { +class StatusBuilder : MultiParamBuilder() { override fun add(param: Status): StatusBuilder { super.add(param) return this diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/paramBuilder.kt index 7ef7c0d..9d133b0 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/status/paramBuilder.kt @@ -5,6 +5,6 @@ import de.pheerai.rcdbquery.dsl.ParamsCollector fun ParamsCollector.status(body: StatusBuilder.() -> StatusBuilder): ParamsCollector { val builder = StatusBuilder() builder.body() - this[Status.staticParamName] = builder.build() + this[Status.paramKey] = builder.build() return this } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/Thrill.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/Thrill.kt new file mode 100644 index 0000000..940ec2b --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/Thrill.kt @@ -0,0 +1,30 @@ +package de.pheerai.rcdbquery.dataMappings.thrill + +import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable + +enum class Thrill( + override val prettyName: String, + override val fullName: String, + override val paramValue: Long +) : RcdbParamOption { + KIDDIE("Kiddie", 21), + FAMILY("Family", 22), + THRILL("Thrill", 23), + EXTREME("Extreme", 20) + ; + + constructor(name: String, paramValue: Long) : this(name, name, paramValue) + + companion object : StringGeneratable { + override val paramKey = "sc" + + override fun of(input: String): Thrill? = when (input) { + "Kiddie" -> KIDDIE + "Family" -> FAMILY + "Thrill" -> THRILL + "Extreme" -> EXTREME + else -> null + } + } +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/ThrillBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/ThrillBuilder.kt new file mode 100644 index 0000000..7352839 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/ThrillBuilder.kt @@ -0,0 +1,15 @@ +package de.pheerai.rcdbquery.dataMappings.thrill + +import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder + +class ThrillBuilder : MultiParamBuilder() { + override fun add(param: Thrill): ThrillBuilder { + super.add(param) + return this + } + + fun kiddie() = this.add(Thrill.KIDDIE) + fun family() = this.add(Thrill.FAMILY) + fun thrill() = this.add(Thrill.THRILL) + fun extreme() = this.add(Thrill.EXTREME) +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/paramBuilder.kt new file mode 100644 index 0000000..bfac7c2 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/thrill/paramBuilder.kt @@ -0,0 +1,10 @@ +package de.pheerai.rcdbquery.dataMappings.thrill + +import de.pheerai.rcdbquery.dsl.ParamsCollector + +fun ParamsCollector.type(body: ThrillBuilder.() -> ThrillBuilder): ParamsCollector { + val builder = ThrillBuilder() + builder.body() + this[Thrill.paramKey] = builder.build() + return this +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/Type.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/Type.kt new file mode 100644 index 0000000..620c801 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/Type.kt @@ -0,0 +1,26 @@ +package de.pheerai.rcdbquery.dataMappings.type + +import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable + +enum class Type( + override val prettyName: String, + override val fullName: String, + override val paramValue: Long +): RcdbParamOption { + STEEL("Steel", 1), + WOOD("Wood", 2), + ; + + constructor(name: String, paramValue: Long): this(name, name, paramValue) + + companion object: StringGeneratable { + override val paramKey = "ty" + + override fun of(input: String) = when(input) { + "Steel" -> STEEL + "Wood" -> WOOD + else -> null + } + } +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/TypeBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/TypeBuilder.kt new file mode 100644 index 0000000..7d85e8f --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/TypeBuilder.kt @@ -0,0 +1,13 @@ +package de.pheerai.rcdbquery.dataMappings.type + +import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder + +class TypeBuilder : MultiParamBuilder() { + override fun add(param: Type): TypeBuilder { + super.add(param) + return this + } + + fun steel() = this.add(Type.STEEL) + fun wood() = this.add(Type.WOOD) +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/paramBuilder.kt new file mode 100644 index 0000000..56b1895 --- /dev/null +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/type/paramBuilder.kt @@ -0,0 +1,12 @@ +package de.pheerai.rcdbquery.dataMappings.type + +import de.pheerai.rcdbquery.dataMappings.thrill.Thrill +import de.pheerai.rcdbquery.dataMappings.thrill.ThrillBuilder +import de.pheerai.rcdbquery.dsl.ParamsCollector + +fun ParamsCollector.thrill(body: ThrillBuilder.() -> ThrillBuilder): ParamsCollector { + val builder = ThrillBuilder() + builder.body() + this[Thrill.paramKey] = builder.build() + return this +} diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/Vendor.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/Vendor.kt index abb6b12..0d72ac7 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/Vendor.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/Vendor.kt @@ -1,13 +1,15 @@ package de.pheerai.rcdbquery.dataMappings.vendor +import de.pheerai.rcdbquery.dataMappings.internal.RcdbItem import de.pheerai.rcdbquery.dataMappings.internal.RcdbParamOption +import de.pheerai.rcdbquery.dataMappings.internal.StringGeneratable @Suppress("unused") enum class Vendor( override val prettyName: String, override val fullName: String, - override val paramValue: Int -) : RcdbParamOption { + override val paramValue: Long +) : RcdbParamOption, RcdbItem { YAQIAO_MACHINE("Yaqiao", "Yaqiao Machine", 6471), CREDIBLE("Credible", 6584), ARROW("Arrow", "Arrow Dynamics", 6835), @@ -239,15 +241,18 @@ enum class Vendor( SBF_VISA("SBF Visa", "SBF Visa Group", 7028), ZAMPERLA("Zamperla", 6892), GCI("GCI", "Great Coasters International", 6860), - RMC("RMC", "Rocky Mountain Construction", 10583) + RMC("RMC", "Rocky Mountain Construction", 10583), ; - constructor(name: String, paramId: Int) : this(name, name, paramId) + override val id: Long + get() = this.paramValue - companion object { - const val staticParamName = "mk" + constructor(name: String, paramId: Long) : this(name, name, paramId) + + companion object: StringGeneratable { + override val paramKey = "mk" + override fun of(input: String) = values().find { input == it.prettyName } - fun getByName(name: String) = values().firstOrNull { it.prettyName == name } fun searchByName(name: String): List { val searchName = name.toLowerCase() return values().filter { diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/VendorBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/VendorBuilder.kt index 35b0153..66b866a 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/VendorBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/VendorBuilder.kt @@ -2,7 +2,7 @@ package de.pheerai.rcdbquery.dataMappings.vendor import de.pheerai.rcdbquery.dataMappings.internal.MultiParamBuilder -class VendorBuilder : MultiParamBuilder() { +class VendorBuilder : MultiParamBuilder() { override fun add(param: Vendor): VendorBuilder { super.add(param) return this diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/paramBuilder.kt b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/paramBuilder.kt index ac07339..0fe5f20 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/paramBuilder.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dataMappings/vendor/paramBuilder.kt @@ -2,9 +2,10 @@ package de.pheerai.rcdbquery.dataMappings.vendor import de.pheerai.rcdbquery.dsl.ParamsCollector +// TODO: Try to generify. This is currently lacking some sort of "This interface requires a companion implementing that interface" fun ParamsCollector.vendors(body: VendorBuilder.() -> VendorBuilder): ParamsCollector { val builder = VendorBuilder() builder.body() - this[Vendor.staticParamName] = builder.build() + this[Vendor.paramKey] = builder.build() return this } diff --git a/src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt b/src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt index 82498fb..0ca5f9d 100644 --- a/src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt +++ b/src/main/kotlin/de/pheerai/rcdbquery/dsl/rcdbQueryDsl.kt @@ -51,7 +51,7 @@ class ParamsCollector { .let { MultiParams(it) } private fun buildSingle() = singleParams.apply { - putIfAbsent(SearchType.staticParamName, SearchType.COASTER) + putIfAbsent(SearchType.paramKey, SearchType.COASTER) } .mapValues { e -> e.value.paramValue.toString() } .let { SingleParams(it) } diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java index 9a3ae1b..4025e2e 100644 --- a/src/main/kotlin/module-info.java +++ b/src/main/kotlin/module-info.java @@ -1,11 +1,16 @@ module rcdbquery.main { + exports de.pheerai.rcdbquery.dataMappings.category; exports de.pheerai.rcdbquery.dataMappings.classification; + exports de.pheerai.rcdbquery.dataMappings.design; + exports de.pheerai.rcdbquery.dataMappings.layout; exports de.pheerai.rcdbquery.dataMappings.order; exports de.pheerai.rcdbquery.dataMappings.page; exports de.pheerai.rcdbquery.dataMappings.searchTerm; exports de.pheerai.rcdbquery.dataMappings.searchType; exports de.pheerai.rcdbquery.dataMappings.startsWith; exports de.pheerai.rcdbquery.dataMappings.status; + exports de.pheerai.rcdbquery.dataMappings.thrill; + exports de.pheerai.rcdbquery.dataMappings.type; exports de.pheerai.rcdbquery.dataMappings.vendor; exports de.pheerai.rcdbquery.dsl;