FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Rename redirect service · devhttps/frontend@263cec1 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 263cec1

Browse files
jfsoul
committed
Rename redirect service
1 parent 9214dd8 commit 263cec1

8 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎admin/app/AppLoader.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ trait AdminServices extends I18nComponents {
4040
lazy val emailService = wire[EmailService]
4141
lazy val fastlyStatisticService = wire[FastlyStatisticService]
4242
lazy val fastlyCloudwatchLoadJob = wire[FastlyCloudwatchLoadJob]
43-
lazy val redirects = wire[Redirects]
43+
lazy val redirects = wire[RedirectService]
4444
lazy val r2PagePressJob = wire[R2PagePressJob]
4545
lazy val videoEncodingsJob = wire[VideoEncodingsJob]
4646
lazy val matchDayRecorder = wire[MatchDayRecorder]

‎admin/app/controllers/AdminControllers.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import jobs.VideoEncodingsJob
99
import play.api.Environment
1010
import play.api.libs.ws.WSClient
1111
import play.api.i18n.Messages
12-
import services.{OphanApi, Redirects}
12+
import services.{OphanApi, RedirectService}
1313

1414
trait AdminControllers {
1515
def akkaAsync: AkkaAsync
1616
def wsClient: WSClient
1717
def videoEncodingsJob: VideoEncodingsJob
1818
def ophanApi: OphanApi
1919
def environment: Environment
20-
def redirects: Redirects
20+
def redirects: RedirectService
2121
implicit val messages: Messages
2222
lazy val oAuthLoginController = wire[OAuthLoginAdminController]
2323
lazy val uncachedWebAssets = wire[UncachedWebAssets]

‎admin/app/controllers/RedirectController.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import play.api.mvc.{Action, Controller}
66
import common.Logging
77
import play.api.data._
88
import play.api.data.Forms._
9-
import services.Redirects
10-
import services.Redirects.External
9+
import services.RedirectService.External
10+
import services.RedirectService
1111

1212

1313
case class PageRedirect(from: String, to: String) {
1414
lazy val trim = this.copy(from = from.trim, to = to.trim)
1515
}
16-
class RedirectController(redirects: Redirects) extends Controller with Logging {
16+
class RedirectController(redirects: RedirectService) extends Controller with Logging {
1717

1818

1919
val redirectForm = Form(mapping("from" -> text, "to" -> text)(PageRedirect.apply)(PageRedirect.unapply))

‎admin/app/jobs/R2PagePressJob.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import org.jsoup.Jsoup
1010
import pagepresser.{InteractiveHtmlCleaner, NextGenInteractiveHtmlCleaner, PollsHtmlCleaner, SimpleHtmlCleaner}
1111
import play.api.libs.json._
1212
import play.api.libs.ws.WSClient
13-
import services.{Redirects, S3Archive, S3ArchiveOriginals}
13+
import services.{RedirectService, S3Archive, S3ArchiveOriginals}
1414
import model.R2PressMessage
1515
import implicits.R2PressNotification.pressMessageFormatter
1616
import org.jsoup.nodes.Document
17-
import services.Redirects.Archive
17+
import services.RedirectService.Archive
1818

1919
import scala.concurrent.Future
2020

21-
class R2PagePressJob(wsClient: WSClient, redirects: Redirects) extends ExecutionContexts with Logging {
21+
class R2PagePressJob(wsClient: WSClient, redirects: RedirectService) extends ExecutionContexts with Logging {
2222
private val waitTimeSeconds = Configuration.r2Press.pressQueueWaitTimeInSeconds
2323
private val maxMessages = Configuration.r2Press.pressQueueMaxMessages
2424
private val credentials = Configuration.aws.mandatoryCredentials

‎archive/app/AppLoader.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import play.api.http.{HttpErrorHandler, HttpRequestHandler}
1313
import play.api.mvc.EssentialFilter
1414
import play.api.routing.Router
1515
import play.api._
16-
import services.{ArchiveMetrics, Redirects}
16+
import services.{ArchiveMetrics, RedirectService}
1717
import router.Routes
1818

1919
class AppLoader extends FrontendApplicationLoader {
@@ -22,7 +22,7 @@ class AppLoader extends FrontendApplicationLoader {
2222

2323
trait AppComponents extends FrontendComponents {
2424

25-
lazy val redirects = wire[Redirects]
25+
lazy val redirects = wire[RedirectService]
2626

2727
lazy val healthCheck = wire[HealthCheck]
2828
lazy val archiveController = wire[ArchiveController]

‎archive/app/controllers/ArchiveController.scala‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ import campaigns.ShortCampaignCodes
44
import common._
55
import model.Cached.{CacheableResult, WithoutRevalidationResult}
66
import play.api.mvc._
7-
import services.{Redirects, GoogleBotMetric}
7+
import services.{GoogleBotMetric, RedirectService}
88
import java.net.URLDecoder
99
import javax.ws.rs.core.UriBuilder
1010

1111
import model.{CacheTime, Cached}
1212
import org.apache.http.HttpStatus
13+
import services.RedirectService.{Archive, Destination, External}
1314

1415
import scala.concurrent.Future
1516

16-
class ArchiveController(redirects: Redirects) extends Controller with Logging with ExecutionContexts {
17+
class ArchiveController(redirects: RedirectService) extends Controller with Logging with ExecutionContexts {
1718

1819
private val R1ArtifactUrl = """www.theguardian.com/(.*)/[0|1]?,[\d]*,(-?\d+),[\d]*(.*)""".r
1920
private val ShortUrl = """^(www\.theguardian\.com/p/[\w\d]+).*$""".r
@@ -92,7 +93,7 @@ class ArchiveController(redirects: Redirects) extends Controller with Logging wi
9293
}
9394
}
9495

95-
private def destinationFor(path: String): Future[Option[Redirects.Destination]] = redirects.destinationFor(normalise(path))
96+
private def destinationFor(path: String): Future[Option[Destination]] = redirects.destinationFor(normalise(path))
9697

9798
private object Combiner {
9899
def unapply(path: String): Option[String] = {
@@ -144,11 +145,11 @@ class ArchiveController(redirects: Redirects) extends Controller with Logging wi
144145

145146
private def lookupPath(path: String) = destinationFor(path).map{ _.flatMap(processLookupDestination(path).lift) }
146147

147-
def processLookupDestination(path: String) : PartialFunction[Redirects.Destination, CacheableResult] = {
148-
case Redirects.External(_, location) if !linksToItself(path, location) =>
148+
def processLookupDestination(path: String) : PartialFunction[Destination, CacheableResult] = {
149+
case External(_, location) if !linksToItself(path, location) =>
149150
val locationWithCampaign = retainShortUrlCampaign(path, location)
150151
WithoutRevalidationResult(Redirect(locationWithCampaign, redirectHttpStatus))
151-
case Redirects.Archive(_, archivePath) =>
152+
case Archive(_, archivePath) =>
152153
// http://wiki.nginx.org/X-accel
153154
WithoutRevalidationResult(Ok.withHeaders("X-Accel-Redirect" -> s"/s3-archive/$archivePath"))
154155
}

‎archive/test/ArchiveControllerTest.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import play.api.test.Helpers._
66
import org.scalatest.{BeforeAndAfterAll, DoNotDiscover, FlatSpec, Matchers}
77

88
import scala.concurrent.Future
9-
import services.Redirects
9+
import services.RedirectService
10+
import services.RedirectService.{Archive, External}
1011

1112
@DoNotDiscover class ArchiveControllerTest
1213
extends FlatSpec
@@ -15,7 +16,7 @@ import services.Redirects
1516
with BeforeAndAfterAll {
1617

1718
lazy val archiveController = new ArchiveController(mockRedirects)
18-
lazy val mockRedirects = new Redirects {
19+
lazy val mockRedirects = new RedirectService {
1920
override def destinationFor(source: String) = Future.successful(None)
2021
}
2122

@@ -206,15 +207,15 @@ import services.Redirects
206207

207208
it should "redirect short urls with campaign codes and allow for overrides" in {
208209
val path = "http://www.theguardian.com/p/old/stw"
209-
val shortRedirectWithCMP = Redirects.External(path, "http://www.theguardian.com/p/new?CMP=existing-cmp")
210+
val shortRedirectWithCMP = External(path, "http://www.theguardian.com/p/new?CMP=existing-cmp")
210211
val result = archiveController.retainShortUrlCampaign(path, shortRedirectWithCMP.location)
211212
result should be (shortRedirectWithCMP.location)
212213
}
213214

214215
it should "not perform a redirect loop check on Archive objects" in {
215216
// The archive x-accel goes to s3. So it is irrelevant whether the original path looks like the s3 archive path.
216217
val path = "http://www.theguardian.com/redirect/path-to-content"
217-
val databaseSaysArchive = Redirects.Archive("any", path)
218+
val databaseSaysArchive = Archive("any", path)
218219
val result = archiveController.processLookupDestination(path).lift(databaseSaysArchive)
219220
result.map(_.toString).getOrElse("") should include (s"""X-Accel-Redirect -> /s3-archive/$path""")
220221
}

common/app/services/Redirects.scala renamed to common/app/services/RedirectService.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import conf.Configuration
99
import scala.concurrent.Future
1010

1111

12-
object Redirects {
12+
object RedirectService {
1313
sealed trait Destination {
1414
def source: String
1515
def location: String
@@ -33,8 +33,8 @@ object Redirects {
3333
}
3434

3535

36-
class Redirects extends Logging with ExecutionContexts {
37-
import Redirects._
36+
class RedirectService extends Logging with ExecutionContexts {
37+
import RedirectService._
3838

3939
// protocol fixed to http so that lookups to dynamo find existing redirects
4040
private val expectedSourceProtocol = "http://"

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL