update copyright, kotlin 1.5 stuff, update copyright

2d-archive · May 25, 2021 · 5431deb · 5431deb
1 parent 7226957
commit 5431deb
Show file tree

Hide file tree

Showing 51 changed files with 1,244 additions and 326 deletions.
diff --git a/LavalinkServer/src/main/java/lavalink/server/Launcher.kt b/LavalinkServer/src/main/java/lavalink/server/Launcher.kt
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 package lavalink.server
@@ -50,8 +51,10 @@ object Launcher {
     val appInfo = AppInfo()
     val gitRepoState = GitRepoState()
 
-    val dtf = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss z")
+    val dtf = DateTimeFormatter
+      .ofPattern("dd.MM.yyyy HH:mm:ss z")
       .withZone(ZoneId.of("UTC"))
+
     val buildTime = dtf.format(Instant.ofEpochMilli(appInfo.buildTime))
     val commitTime = dtf.format(Instant.ofEpochMilli(gitRepoState.commitTime * 1000))
 
@@ -60,25 +63,28 @@ object Launcher {
 
     return buildString {
       if (vanity) {
-        appendln()
-        appendln()
-        appendln(getVanity())
+        appendLine()
+        appendLine()
+        appendLine(getVanity())
       }
+
       if (!gitRepoState.isLoaded) {
-        appendln()
-        appendln("$indentation*** Unable to find or load Git metadata ***")
+        appendLine()
+        appendLine("$indentation*** Unable to find or load Git metadata ***")
       }
-      appendln()
-      append("${indentation}Version:        "); appendln(version)
-      append("${indentation}Build:          "); appendln(buildNumber)
+
+      appendLine()
+      append("${indentation}Version:        "); appendLine(version)
+      append("${indentation}Build:          "); appendLine(buildNumber)
       if (gitRepoState.isLoaded) {
-        append("${indentation}Build time:     "); appendln(buildTime)
-        append("${indentation}Branch          "); appendln(gitRepoState.branch)
-        append("${indentation}Commit:         "); appendln(gitRepoState.commitIdAbbrev)
-        append("${indentation}Commit time:    "); appendln(commitTime)
+        append("${indentation}Build time:     "); appendLine(buildTime)
+        append("${indentation}Branch          "); appendLine(gitRepoState.branch)
+        append("${indentation}Commit:         "); appendLine(gitRepoState.commitIdAbbrev)
+        append("${indentation}Commit time:    "); appendLine(commitTime)
       }
-      append("${indentation}JVM:            "); appendln(System.getProperty("java.version"))
-      append("${indentation}Lavaplayer      "); appendln(PlayerLibrary.VERSION)
+
+      append("${indentation}JVM:            "); appendLine(System.getProperty("java.version"))
+      append("${indentation}Lavaplayer      "); appendLine(PlayerLibrary.VERSION)
     }
   }
 
@@ -103,29 +109,23 @@ object Launcher {
 
   @JvmStatic
   fun main(args: Array<String>) {
-    if (args.isNotEmpty() &&
-      (args[0].equals("-v", ignoreCase = true) || args[0].equals("--version", ignoreCase = true))
-    ) {
-      println(getVersionInfo(indentation = "", vanity = false))
-      return
+    when (args.firstOrNull()?.lowercase()) {
+      "-v", "--version" -> return println(getVersionInfo(indentation = "", vanity = false))
     }
 
+    /* start the spring application */
     val sa = SpringApplication(LavalinkApplication::class.java)
     sa.webApplicationType = WebApplicationType.SERVLET
     sa.setBannerMode(Banner.Mode.OFF) // We have our own
     sa.addListeners(
-        ApplicationListener { event: Any ->
-            if (event is ApplicationEnvironmentPreparedEvent) {
-                log.info(getVersionInfo())
-            }
-        },
-        ApplicationListener { event: Any ->
-            if (event is ApplicationFailedEvent) {
-                log.error("Application failed", event.exception)
-            }
+      ApplicationListener { event: Any ->
+        when (event) {
+          is ApplicationEnvironmentPreparedEvent -> log.info(getVersionInfo())
+          is ApplicationFailedEvent -> log.error("Application failed", event.exception)
         }
+      }
     )
+
     sa.run(*args)
-    log.info("You can safely ignore the big red warning about illegal reflection. See https://github.com/Frederikam/Lavalink/issues/295")
   }
 }
diff --git a/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
@@ -116,7 +139,7 @@ class AudioPlayerConfiguration {
       }
     }
 
-    return when (rateLimitConfig.strategy.toLowerCase().trim()) {
+    return when (rateLimitConfig.strategy.lowercase().trim()) {
       "rotateonban" -> RotatingIpRoutePlanner(ipBlocks, filter, rateLimitConfig.searchTriggersFail)
       "loadbalance" -> BalancingIpRoutePlanner(ipBlocks, filter, rateLimitConfig.searchTriggersFail)
       "nanoswitch" -> NanoIpRoutePlanner(ipBlocks, rateLimitConfig.searchTriggersFail)

diff --git a/LavalinkServer/src/main/java/lavalink/server/config/AudioSourcesConfig.java b/LavalinkServer/src/main/java/lavalink/server/config/AudioSourcesConfig.java
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfigProperties.kt b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfigProperties.kt
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
@@ -10,4 +33,4 @@ class KoeConfigProperties {
   var highPacketPriority: Boolean = true
   var bufferDurationMs: Int? = null
   var byteBufAllocator: String = "pooled"
-}
+}
diff --git a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config
 
 import io.netty.buffer.ByteBufAllocator

diff --git a/LavalinkServer/src/main/java/lavalink/server/config/LavaplayerConfigProperties.kt b/LavalinkServer/src/main/java/lavalink/server/config/LavaplayerConfigProperties.kt
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
@@ -13,4 +36,4 @@ class LavaplayerConfigProperties {
   var ratelimit: RateLimitConfig? = null
   var nonAllocating: Boolean = false
   var frameBufferDuration: Int = 5000
-}
+}
diff --git a/LavalinkServer/src/main/java/lavalink/server/config/MetricsPrometheusConfigProperties.java b/LavalinkServer/src/main/java/lavalink/server/config/MetricsPrometheusConfigProperties.java
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/LavalinkServer/src/main/java/lavalink/server/config/RateLimitConfig.kt b/LavalinkServer/src/main/java/lavalink/server/config/RateLimitConfig.kt
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config
 
 data class RateLimitConfig(
@@ -6,4 +29,4 @@ data class RateLimitConfig(
   var strategy: String = "RotateOnBan",
   var retryLimit: Int = -1,
   var searchTriggersFail: Boolean = true
-)
+)
diff --git a/LavalinkServer/src/main/java/lavalink/server/config/RequestAuthorizationFilter.java b/LavalinkServer/src/main/java/lavalink/server/config/RequestAuthorizationFilter.java
@@ -1,3 +1,26 @@
+/*
+ *  Copyright (c) 2021 Freya Arbjerg and contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
 package lavalink.server.config;
 
 import org.slf4j.Logger;