Skip to content

Commit 1e19b0b

Browse files
committed
Simplify url validation.
1 parent a9efd6f commit 1e19b0b

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/main/scala/io/sdkman/changelogs/package.scala

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,10 @@ package object changelogs {
3030
if (v.version.length > 15)
3131
throw new MongobeeChangeSetException(s"sVersion length exceeds 15 chars: ${v.version}")
3232

33-
override def validUrl(v: Version): Unit = {
34-
if (v.url.contains("download.oracle.com")) {
35-
checkResourceAvailable(v.url, Some(Cookie("oraclelicense", "accept-securebackup-cookie")))
36-
} else {
37-
checkResourceAvailable(v.url, None)
38-
}
39-
}
40-
41-
private def checkResourceAvailable(url: String, cookie: Option[Cookie]) = {
42-
val available = cookie.fold(resourceAvailable(url)) { c =>
43-
resourceAvailable(url, Some(c))
44-
}
33+
override def validUrl(v: Version): Unit =
34+
if (!resourceAvailable(v.url))
35+
throw new MongobeeChangeSetException(s"Invalid url: ${v.url}")
4536

46-
if (!available) throw new MongobeeChangeSetException(s"Invalid url: $url")
47-
}
4837
}
4938

5039
implicit def listValidation[A](implicit validate: Validator[A]): Validator[List[A]] = new Validator[List[A]] {
@@ -199,4 +188,4 @@ package object changelogs {
199188

200189
def setCandidateDefault(candidate: String, version: String)(implicit db: MongoDatabase): Document =
201190
db.getCollection(CandidatesCollection).findOneAndUpdate(Filters.eq("candidate", candidate), Updates.set("default", version))
202-
}
191+
}

0 commit comments

Comments
 (0)