Skip to content

Commit

Permalink
Make warnings fatal
Browse files Browse the repository at this point in the history
And fix a bunch of them.
  • Loading branch information
tmccombs committed Feb 19, 2025
1 parent 46ee4f3 commit 1589447
Show file tree
Hide file tree
Showing 27 changed files with 480 additions and 393 deletions.
52 changes: 31 additions & 21 deletions admin/app/Application.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.lucidchart.piezo.admin

import com.lucidchart.piezo.util.DummyClassGenerator
import com.softwaremill.macwire._
import play.api.ApplicationLoader.Context
import play.api._
Expand All @@ -12,18 +11,22 @@ import play.api.Mode
import play.api.routing.Router
import router.Routes
import scala.concurrent.Future
import com.lucidchart.piezo.admin.models._
import com.lucidchart.piezo.admin.controllers._
import com.lucidchart.piezo.admin.models.MonitoringTeams
import com.lucidchart.piezo.WorkerSchedulerFactory
import _root_.controllers.AssetsComponents

/**
* Application loader that wires up the application dependencies using Macwire
*/
class PiezoAdminApplicationLoader extends ApplicationLoader {
def load(context: Context): Application = new PiezoAdminComponents(context).application
}

class PiezoAdminComponents(context: Context) extends BuiltInComponentsFromContext(context) with I18nComponents with AssetsComponents {
class PiezoAdminComponents(context: Context)
extends BuiltInComponentsFromContext(context)
with I18nComponents
with AssetsComponents {

lazy val schedulerFactory: WorkerSchedulerFactory = new WorkerSchedulerFactory()
lazy val jobFormHelper: JobFormHelper = wire[JobFormHelper]
Expand All @@ -39,33 +42,40 @@ class PiezoAdminComponents(context: Context) extends BuiltInComponentsFromContex
override val httpFilters: Seq[EssentialFilter] = {
val ec = controllerComponents.executionContext
Seq(
wire[RequestStatCollector]
new RequestStatCollector(ec),
)
}
val logger = Logger("com.lucidchart.piezo.Global")

override lazy val httpErrorHandler: HttpErrorHandler =
new DefaultHttpErrorHandler(environment, configuration, devContext.map(_.sourceMapper), Some(router)) {

override lazy val httpErrorHandler: HttpErrorHandler = new DefaultHttpErrorHandler(environment, configuration, devContext.map(_.sourceMapper), Some(router)) {
/**
* Invoked when a handler or resource is not found.
*
* @param request The request that no handler was found to handle.
* @param message A message.
*/
override protected def onNotFound(request: RequestHeader, message: String): Future[Result] = {
logger.error("Request handler not found for URL: " + request.uri)
Future.successful(NotFound(com.lucidchart.piezo.admin.views.html.errors.notfound(None)(request)))
}
* Invoked when a handler or resource is not found.
*
* @param request
* The request that no handler was found to handle.
* @param message
* A message.
*/
override protected def onNotFound(request: RequestHeader, message: String): Future[Result] = {
logger.error("Request handler not found for URL: " + request.uri)
Future.successful(NotFound(com.lucidchart.piezo.admin.views.html.errors.notfound(None)(request)))
}

override def onServerError(request: RequestHeader, exception: Throwable): Future[Result] = {
logger.error("Error handling request for URL: " + request.uri, exception)
if(environment.mode == Mode.Dev) {
super.onServerError(request, exception)
} else {
Future.successful(InternalServerError(com.lucidchart.piezo.admin.views.html.errors.error(Option(exception.getMessage))(request)))
override def onServerError(request: RequestHeader, exception: Throwable): Future[Result] = {
logger.error("Error handling request for URL: " + request.uri, exception)
if (environment.mode == Mode.Dev) {
super.onServerError(request, exception)
} else {
Future.successful(
InternalServerError(
com.lucidchart.piezo.admin.views.html.errors.error(Option(exception.getMessage))(request),
),
)
}
}
}
}
// set up logger
LoggerConfigurator(context.environment.classLoader).foreach {
_.configure(context.environment, context.initialConfiguration, Map.empty)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.lucidchart.piezo.admin.controllers

import play.api._
import play.api.mvc._

class ApplicationController(cc: ControllerComponents) extends AbstractController(cc) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class HealthCheck(configuration: Configuration, cc: ControllerComponents) extend
5
}

def main = cc.actionBuilder { implicit requests=>
def main = cc.actionBuilder { request =>
val workerHealth = areWorkersHealthy()
val responseBody = Json.toJson(Map("HeartbeatTime" -> Json.toJson(workerHealth._2)))
if(workerHealth._1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.lucidchart.piezo.admin.controllers

import org.quartz.JobDataMap
import play.api.libs.json._
import play.api.data.Form
import play.api.data.Forms._
import play.api.data.Mapping

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.lucidchart.piezo.admin.controllers

import org.quartz._
import play.api.Logger
import play.api.data.Form
import play.api.data.Forms._
import com.lucidchart.piezo.GeneratorClassLoader
Expand Down
Loading

0 comments on commit 1589447

Please sign in to comment.