Merge pull request #200 from notflorian/bugfix/route-rule-package-name

frantuma · web-flow · commit 9ba21765ce4f · 2019-04-18T08:27:42.000+02:00
Fix route rule with optional package name for controllers
diff --git a/play-2.7/swagger-play2/app/play/modules/swagger/SwaggerPlugin.scala b/play-2.7/swagger-play2/app/play/modules/swagger/SwaggerPlugin.scala
@@ -136,7 +136,7 @@ class SwaggerPluginImpl @Inject()(lifecycle: ApplicationLifecycle, router: Route
     parseRoutesHelper(routesFile, "")
   }
 
-  val routesRules = routes.map(route => s"${route.call.packageName}.${route.call.controller}$$.${route.call.method}" -> route).toMap
+  val routesRules = routes.map(route => s"${route.call.packageName.map(_ + ".").getOrElse("")}${route.call.controller}$$.${route.call.method}" -> route).toMap
 
   val route = new RouteWrapper(routesRules.asJava)
   RouteFactory.setRoute(route)

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ class SwaggerPluginImpl @Inject()(lifecycle: ApplicationLifecycle, router: Route`
`136`	`136`	`parseRoutesHelper(routesFile, "")`
`137`	`137`	`}`
`138`	`138`
`139`		`- val routesRules = routes.map(route => s"${route.call.packageName}.${route.call.controller}$$.${route.call.method}" -> route).toMap`
	`139`	`+ val routesRules = routes.map(route => s"${route.call.packageName.map(_ + ".").getOrElse("")}${route.call.controller}$$.${route.call.method}" -> route).toMap`
`140`	`140`
`141`	`141`	`val route = new RouteWrapper(routesRules.asJava)`
`142`	`142`	`RouteFactory.setRoute(route)`