MyFavMirrors/lc-core
1
0
Fork 0
mirror of https://github.com/librecaptcha/lc-core.git synced 2025-02-12 19:28:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor: use Map.of()

Browse Source 
Signed-off-by: hrj <harshad.rj@gmail.com>
This commit is contained in:
hrj 2021-04-14 09:38:02 +05:30
parent 321bc67897
commit d3a2c6fa35
6 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/lc/captchas/FontFunCaptcha.java
View File

@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.util.HashMap; import java.util.Map;
import java.util.List; import java.util.List;
import lc.captchas.interfaces.Challenge; import lc.captchas.interfaces.Challenge;
import lc.captchas.interfaces.ChallengeProvider; import lc.captchas.interfaces.ChallengeProvider;
@ -18,13 +18,12 @@ public class FontFunCaptcha implements ChallengeProvider {
return "FontFunCaptcha"; return "FontFunCaptcha";
} }
public HashMap<String, List<String>> supportedParameters() { public Map<String, List<String>> supportedParameters() {
HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>(); return Map.of(
supportedParams.put("supportedLevels", List.of("medium")); "supportedLevels", List.of("medium"),
supportedParams.put("supportedMedia", List.of("image/png")); "supportedMedia", List.of("image/png"),
supportedParams.put("supportedInputType", List.of("text")); "supportedInputType", List.of("text")
);
return supportedParams;
} }
public void configure(String config) { public void configure(String config) {

15
src/main/java/lc/captchas/GifCaptcha.java
View File

@ -6,7 +6,7 @@ import java.awt.RenderingHints;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.Map;
import java.util.List; import java.util.List;
import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.ImageOutputStream;
@ -55,13 +55,12 @@ public class GifCaptcha implements ChallengeProvider {
// TODO: Add custom config // TODO: Add custom config
} }
public HashMap<String, List<String>> supportedParameters() { public Map<String, List<String>> supportedParameters() {
HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>(); return Map.of(
supportedParams.put("supportedLevels", List.of("hard")); "supportedLevels", List.of("hard"),
supportedParams.put("supportedMedia", List.of("image/gif")); "supportedMedia", List.of("image/gif"),
supportedParams.put("supportedInputType", List.of("text")); "supportedInputType", List.of("text")
);
return supportedParams;
} }
public Challenge returnChallenge() { public Challenge returnChallenge() {

15
src/main/java/lc/captchas/ShadowTextCaptcha.java
View File

@ -10,7 +10,7 @@ import java.awt.image.BufferedImage;
import java.awt.image.ConvolveOp; import java.awt.image.ConvolveOp;
import java.awt.image.Kernel; import java.awt.image.Kernel;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.util.HashMap; import java.util.Map;
import java.util.List; import java.util.List;
import lc.misc.HelperFunctions; import lc.misc.HelperFunctions;
@ -27,13 +27,12 @@ public class ShadowTextCaptcha implements ChallengeProvider {
// TODO: Add custom config // TODO: Add custom config
} }
public HashMap<String, List<String>> supportedParameters() { public Map<String, List<String>> supportedParameters() {
HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>(); return Map.of(
supportedParams.put("supportedLevels", List.of("easy")); "supportedLevels", List.of("easy"),
supportedParams.put("supportedMedia", List.of("image/png")); "supportedMedia", List.of("image/png"),
supportedParams.put("supportedInputType", List.of("text")); "supportedInputType", List.of("text")
);
return supportedParams;
} }
public boolean checkAnswer(String secret, String answer) { public boolean checkAnswer(String secret, String answer) {

13
src/main/scala/lc/captchas/FilterChallenge.scala
View File

@ -7,7 +7,6 @@ import java.awt.Font
import java.awt.Color import java.awt.Color
import lc.captchas.interfaces.ChallengeProvider import lc.captchas.interfaces.ChallengeProvider
import lc.captchas.interfaces.Challenge import lc.captchas.interfaces.Challenge
import scala.jdk.CollectionConverters.MapHasAsJava
import java.util.{List => JavaList, Map => JavaMap} import java.util.{List => JavaList, Map => JavaMap}
class FilterChallenge extends ChallengeProvider { class FilterChallenge extends ChallengeProvider {
@ -18,13 +17,11 @@ class FilterChallenge extends ChallengeProvider {
} }
def supportedParameters(): JavaMap[String, JavaList[String]] = { def supportedParameters(): JavaMap[String, JavaList[String]] = {
val supportedParams = Map( JavaMap.of(
"supportedLevels" -> JavaList.of("medium", "hard"), "supportedLevels",JavaList.of("medium", "hard"),
"supportedMedia" -> JavaList.of("image/png"), "supportedMedia", JavaList.of("image/png"),
"supportedInputType" -> JavaList.of("text") "supportedInputType", JavaList.of("text")
).asJava )
supportedParams
} }
def returnChallenge(): Challenge = { def returnChallenge(): Challenge = {

13
src/main/scala/lc/captchas/LabelCaptcha.scala
View File

@ -9,7 +9,6 @@ import java.awt.image.BufferedImage
import java.awt.Color import java.awt.Color
import lc.captchas.interfaces.ChallengeProvider import lc.captchas.interfaces.ChallengeProvider
import lc.captchas.interfaces.Challenge import lc.captchas.interfaces.Challenge
import scala.jdk.CollectionConverters.MapHasAsJava
import java.util.{List => JavaList, Map => JavaMap} import java.util.{List => JavaList, Map => JavaMap}
class LabelCaptcha extends ChallengeProvider { class LabelCaptcha extends ChallengeProvider {
@ -30,13 +29,11 @@ class LabelCaptcha extends ChallengeProvider {
} }
def supportedParameters(): JavaMap[String, JavaList[String]] = { def supportedParameters(): JavaMap[String, JavaList[String]] = {
val supportedParams = Map( JavaMap.of(
"supportedLevels" -> JavaList.of("hard"), "supportedLevels", JavaList.of("hard"),
"supportedMedia" -> JavaList.of("image/png"), "supportedMedia", JavaList.of("image/png"),
"supportedInputType" -> JavaList.of("text") "supportedInputType", JavaList.of("text")
).asJava )
supportedParams
} }
def returnChallenge(): Challenge = def returnChallenge(): Challenge =

13
src/main/scala/lc/captchas/RainDropsCaptcha.scala
View File

@ -10,7 +10,6 @@ import javax.imageio.stream.MemoryCacheImageOutputStream;
import lc.captchas.interfaces.ChallengeProvider import lc.captchas.interfaces.ChallengeProvider
import lc.captchas.interfaces.Challenge import lc.captchas.interfaces.Challenge
import lc.misc.GifSequenceWriter import lc.misc.GifSequenceWriter
import scala.jdk.CollectionConverters.MapHasAsJava
import java.util.{List => JavaList, Map => JavaMap} import java.util.{List => JavaList, Map => JavaMap}
class Drop { class Drop {
@ -38,13 +37,11 @@ class RainDropsCP extends ChallengeProvider {
} }
def supportedParameters(): JavaMap[String, JavaList[String]] = { def supportedParameters(): JavaMap[String, JavaList[String]] = {
val supportedParams = Map( JavaMap.of(
"supportedLevels" -> JavaList.of("medium", "easy"), "supportedLevels", JavaList.of("medium", "easy"),
"supportedMedia" -> JavaList.of("image/gif"), "supportedMedia", JavaList.of("image/gif"),
"supportedInputType" -> JavaList.of("text") "supportedInputType", JavaList.of("text")
).asJava )
supportedParams
} }
private def extendDrops(drops: Array[Drop], steps: Int, xOffset: Int) = { private def extendDrops(drops: Array[Drop], steps: Int, xOffset: Int) = {