removed Java legacy code
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
the minimum is now Java 11
This commit is contained in:
parent
16cb89ca38
commit
d0d5e4b6d1
|
@ -7,8 +7,3 @@ steps:
|
|||
commands:
|
||||
- gradle test
|
||||
|
||||
- name: test-jdk8
|
||||
image: gradle:jdk8
|
||||
commands:
|
||||
- gradle test
|
||||
|
||||
|
|
|
@ -42,10 +42,10 @@ dependencies {
|
|||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.jvmTarget = "1.8"
|
||||
kotlinOptions.jvmTarget = "11"
|
||||
}
|
||||
compileTestKotlin {
|
||||
kotlinOptions.jvmTarget = "1.8"
|
||||
kotlinOptions.jvmTarget = "11"
|
||||
}
|
||||
|
||||
group 'org.mosad'
|
||||
|
|
|
@ -128,14 +128,7 @@ class CacheController {
|
|||
// get all lessons from the weeks timetable
|
||||
val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
|
||||
flatMap.forEach {
|
||||
// TODO Java 11
|
||||
//it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> println("${x.lessonSubject}, ${x.lessonTeacher}") }
|
||||
|
||||
it.forEach { lesson ->
|
||||
if(lesson.lessonSubject.contains(lessonSubject)) {
|
||||
lessonList.add(lesson)
|
||||
}
|
||||
}
|
||||
it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> lessonList.add(x) }
|
||||
}
|
||||
|
||||
return lessonList
|
||||
|
|
|
@ -56,18 +56,11 @@ class StatusController {
|
|||
* if a timetable is requested update the request counter
|
||||
*/
|
||||
fun updateTimetableRequests(courseName: String) {
|
||||
when (timetableRequests.stream().filter { x -> x.courseName == courseName }.findAny().orElse(null)) {
|
||||
null -> timetableRequests.add(TimetableCounter(courseName, 0))
|
||||
}
|
||||
timetableRequests.stream().filter { x -> x.courseName == courseName }.findFirst()
|
||||
.ifPresent { x -> x.requests++ }
|
||||
|
||||
// TODO Java 11
|
||||
// timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
|
||||
// it.requests++
|
||||
// }, {
|
||||
//
|
||||
// })
|
||||
timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
|
||||
it.requests++
|
||||
}, {
|
||||
timetableRequests.add(TimetableCounter(courseName, 1))
|
||||
})
|
||||
}
|
||||
|
||||
fun getTotalRequests(): Int {
|
||||
|
|
Loading…
Reference in New Issue