Skip to content

Commit cf56697

Browse files
simonredfernsimonredfern
authored
Merge pull request #2748 from hongwei1/develop
bugfix/Fix empty Operation ID for resource-docs and swagger endpoints
2 parents 2c329a8 + d912a11 commit cf56697

1 file changed

Lines changed: 26 additions & 56 deletions

File tree

‎obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala‎

Lines changed: 26 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,151 +17,121 @@ import net.liftweb.http.{GetRequest, InMemoryResponse, PlainTextResponse, Req, S
1717
object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
1818
val version = ApiVersion.v1_4_0 // "1.4.0" // We match other api versions so API explorer can easily use the path.
1919
val versionStatus = ApiVersionStatus.STABLE.toString
20-
val routes: Seq[OBPEndpoint] = List(
20+
val routes: List[OBPEndpoint] = List(
2121
ImplementationsResourceDocs.getResourceDocsObp,
2222
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
2323
ImplementationsResourceDocs.getResourceDocsSwagger,
2424
)
25-
routes.foreach(route => {
26-
oauthServe(apiPrefix{route})
27-
})
25+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
2826
}
2927

3028

3129
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
3230
object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
3331
val version = ApiVersion.v2_0_0 // "2.0.0" // We match other api versions so API explorer can easily use the path.
3432
val versionStatus = ApiVersionStatus.STABLE.toString
35-
val routes: Seq[OBPEndpoint] = List(
33+
val routes: List[OBPEndpoint] = List(
3634
ImplementationsResourceDocs.getResourceDocsObp,
3735
ImplementationsResourceDocs.getResourceDocsSwagger,
3836
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
3937
)
40-
routes.foreach(route => {
41-
oauthServe(apiPrefix{route})
42-
})
38+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
4339
}
4440

4541

4642
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
4743
object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
4844
val version: ApiVersion = ApiVersion.v2_1_0 // "2.1.0" // We match other api versions so API explorer can easily use the path.
4945
val versionStatus = ApiVersionStatus.STABLE.toString
50-
val routes: Seq[OBPEndpoint] = List(
46+
val routes: List[OBPEndpoint] = List(
5147
ImplementationsResourceDocs.getResourceDocsObp,
5248
ImplementationsResourceDocs.getResourceDocsSwagger,
5349
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
5450
)
55-
routes.foreach(route => {
56-
oauthServe(apiPrefix{route})
57-
})
51+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
5852
}
5953

6054
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
6155
object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
6256
val version: ApiVersion = ApiVersion.v2_2_0 // "2.2.0" // We match other api versions so API explorer can easily use the path.
6357
val versionStatus = ApiVersionStatus.STABLE.toString
64-
val routes: Seq[OBPEndpoint] = List(
58+
val routes: List[OBPEndpoint] = List(
6559
ImplementationsResourceDocs.getResourceDocsObp,
6660
ImplementationsResourceDocs.getResourceDocsSwagger,
6761
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
6862
)
69-
routes.foreach(route => {
70-
oauthServe(apiPrefix{route})
71-
})
63+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
7264
}
7365

7466
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
7567
object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
7668
val version : ApiVersion = ApiVersion.v3_0_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
7769
val versionStatus = ApiVersionStatus.STABLE.toString
78-
val routes: Seq[OBPEndpoint] = List(
70+
val routes: List[OBPEndpoint] = List(
7971
ImplementationsResourceDocs.getResourceDocsObp,
8072
ImplementationsResourceDocs.getResourceDocsSwagger,
8173
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
8274
)
83-
routes.foreach(route => {
84-
oauthServe(apiPrefix{route})
85-
})
75+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
8676

8777
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
8878
object ResourceDocs310 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
8979
val version: ApiVersion = ApiVersion.v3_1_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
9080
val versionStatus = ApiVersionStatus.STABLE.toString
91-
val routes: Seq[OBPEndpoint] = List(
81+
val routes: List[OBPEndpoint] = List(
9282
ImplementationsResourceDocs.getResourceDocsObp,
9383
ImplementationsResourceDocs.getResourceDocsSwagger,
9484
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
9585
)
96-
routes.foreach(route => {
97-
oauthServe(apiPrefix {
98-
route
99-
})
100-
})
86+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
10187
}
10288
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
10389
object ResourceDocs400 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
10490
val version: ApiVersion = ApiVersion.v4_0_0 // = "4.0.0" // We match other api versions so API explorer can easily use the path.
10591
val versionStatus = ApiVersionStatus.STABLE.toString
106-
val routes: Seq[OBPEndpoint] = List(
92+
val routes: List[OBPEndpoint] = List(
10793
ImplementationsResourceDocs.getResourceDocsObpV400,
10894
ImplementationsResourceDocs.getResourceDocsSwagger,
10995
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
11096
)
111-
routes.foreach(route => {
112-
oauthServe(apiPrefix {
113-
route
114-
})
115-
})
97+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
11698
}
11799
// Hack to provide Resource Docs / Swagger on endpoints other than 1.4.0 where it is defined.
118100
object ResourceDocs500 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
119-
val version: ApiVersion = ApiVersion.v5_0_0
101+
val version: ApiVersion = ApiVersion.v5_0_0
120102
val versionStatus = ApiVersionStatus.STABLE.toString
121-
val routes: Seq[OBPEndpoint] = List(
103+
val routes: List[OBPEndpoint] = List(
122104
ImplementationsResourceDocs.getResourceDocsObpV400,
123105
ImplementationsResourceDocs.getResourceDocsSwagger,
124106
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
125107
)
126-
routes.foreach(route => {
127-
oauthServe(apiPrefix {
128-
route
129-
})
130-
})
131-
}
132-
108+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
109+
}
110+
133111
object ResourceDocs510 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
134-
val version: ApiVersion = ApiVersion.v5_1_0
112+
val version: ApiVersion = ApiVersion.v5_1_0
135113
val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
136-
val routes: Seq[OBPEndpoint] = List(
114+
val routes: List[OBPEndpoint] = List(
137115
ImplementationsResourceDocs.getResourceDocsObpV400,
138116
ImplementationsResourceDocs.getResourceDocsSwagger,
139117
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
140118
// ImplementationsResourceDocs.getStaticResourceDocsObp
141119
)
142-
routes.foreach(route => {
143-
oauthServe(apiPrefix {
144-
route
145-
})
146-
})
120+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
147121
}
148-
122+
149123
object ResourceDocs600 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
150-
val version: ApiVersion = ApiVersion.v6_0_0
124+
val version: ApiVersion = ApiVersion.v6_0_0
151125
val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
152126
override def includeTechnologyInResponse: Boolean = true
153-
val routes: Seq[OBPEndpoint] = List(
127+
val routes: List[OBPEndpoint] = List(
154128
ImplementationsResourceDocs.getResourceDocsObpV400,
155129
ImplementationsResourceDocs.getResourceDocsSwagger,
156130
ImplementationsResourceDocs.getResourceDocsOpenAPI31,
157131
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
158132
// ImplementationsResourceDocs.getStaticResourceDocsObp
159133
)
160-
routes.foreach(route => {
161-
oauthServe(apiPrefix {
162-
route
163-
})
164-
})
134+
registerRoutes(routes, ImplementationsResourceDocs.localResourceDocs, apiPrefix)
165135

166136
// Register YAML endpoint using standard RestHelper approach
167137
serve {

0 commit comments

Comments
 (0)