From 435f9c85614730cabdc45d93fff79aed5d9046f2 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Wed, 13 Jan 2021 01:46:52 +0700 Subject: [PATCH 1/2] SBT: roll back to 1.4.0 due to https://github.com/playframework/playframework/issues/10486 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6db9842..0837f7a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0 +sbt.version=1.3.13 From dac6c412013fcc43642d9ada061490f30c724bd9 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Wed, 13 Jan 2021 01:47:50 +0700 Subject: [PATCH 2/2] Fix #235: use Option instead of direct nulls in the quote API --- .../src/main/scala/ru/org/codingteam/loglist/dto/QuoteDTO.scala | 2 +- scalajvm/app/controllers/api/Quotes.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scala/src/main/scala/ru/org/codingteam/loglist/dto/QuoteDTO.scala b/scala/src/main/scala/ru/org/codingteam/loglist/dto/QuoteDTO.scala index ce16c63..20cf9e0 100644 --- a/scala/src/main/scala/ru/org/codingteam/loglist/dto/QuoteDTO.scala +++ b/scala/src/main/scala/ru/org/codingteam/loglist/dto/QuoteDTO.scala @@ -1,3 +1,3 @@ package ru.org.codingteam.loglist.dto -case class QuoteDTO(id: Long, source: String, sourceUrl: String, time: Long, content: String, rating: Int) +case class QuoteDTO(id: Long, source: String, sourceUrl: Option[String], time: Long, content: String, rating: Int) diff --git a/scalajvm/app/controllers/api/Quotes.scala b/scalajvm/app/controllers/api/Quotes.scala index 36a4921..045e16d 100644 --- a/scalajvm/app/controllers/api/Quotes.scala +++ b/scalajvm/app/controllers/api/Quotes.scala @@ -50,7 +50,7 @@ class Quotes @Inject()(implicit cc: ControllerComponents, configuration: Configu } private def buildQuoteDto(quote: Quote): QuoteDTO = - QuoteDTO(quote.id, quote.source, quote.sourceUrl.orNull, quote.time.toInstant.toEpochMilli, quote.content.getOrElse(""), quote.rating) + QuoteDTO(quote.id, quote.source, quote.sourceUrl, quote.time.toInstant.toEpochMilli, quote.content.getOrElse(""), quote.rating) private def json(text: String) = Ok(text).as("application/json; charset=utf-8") }