From 3ad3a0e73e83131d7a041422405eafcc58948155 Mon Sep 17 00:00:00 2001
From: sanjana <sanjanabaliga97@gmail.com>
Date: Sun, 7 Jan 2018 09:59:32 +0530
Subject: [PATCH] Minor changes: coding style and thread safety

---
 src/main/scala/BlurCaptcha.scala   |  9 +--------
 src/main/scala/FilterCaptcha.scala | 13 ++++---------
 src/main/scala/LabelCaptcha.scala  |  9 +++------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/BlurCaptcha.scala b/src/main/scala/BlurCaptcha.scala
index fa4a784..e753250 100644
--- a/src/main/scala/BlurCaptcha.scala
+++ b/src/main/scala/BlurCaptcha.scala
@@ -19,13 +19,6 @@ class BlurCaptcha extends CaptchaProvider {
     challenge
   }
   def checkAnswer(token: String, input: String): Boolean = {
-    if(tokenAnswer(token)==input)
-    {
-      true
-    }
-    else
-    {
-      false
-    }
+    tokenAnswer(token) == input
   }
 }
diff --git a/src/main/scala/FilterCaptcha.scala b/src/main/scala/FilterCaptcha.scala
index e3edf34..b1889ae 100644
--- a/src/main/scala/FilterCaptcha.scala
+++ b/src/main/scala/FilterCaptcha.scala
@@ -12,7 +12,9 @@ class FilterCaptcha extends CaptchaProvider {
     val n = 8
     val answer = Stream.continually(r.nextInt(alphabet.size)).map(alphabet).take(n).mkString
     val token = scala.util.Random.nextInt(10000).toString
-    tokenAnswer += token -> answer
+    tokenAnswer += synchronized {
+      token -> answer
+    }
     val canvas = new BufferedImage(225, 50, BufferedImage.TYPE_INT_RGB)
     val g = canvas.createGraphics()
     g.setColor(Color.WHITE)
@@ -28,14 +30,7 @@ class FilterCaptcha extends CaptchaProvider {
     challenge
   }
   def checkAnswer(token: String, input: String): Boolean = {
-    if(tokenAnswer(token)==input)
-    {
-      true
-    }
-    else
-    {
-      false
-    }
+    tokenAnswer(token) == input
   }
 }
 
diff --git a/src/main/scala/LabelCaptcha.scala b/src/main/scala/LabelCaptcha.scala
index 40bfaad..6318cc4 100644
--- a/src/main/scala/LabelCaptcha.scala
+++ b/src/main/scala/LabelCaptcha.scala
@@ -43,19 +43,16 @@ class LabelCaptcha extends CaptchaProvider {
     val userAnswer = input.split(' ')
     if(userAnswer(0)==expectedAnswer) {
       val unknownFile = tokenImagePair(token).unknown
-      if((unknownAnswers(unknownFile)).contains(userAnswer(1)))
-      {
+      if((unknownAnswers(unknownFile)).contains(userAnswer(1))) {
         unknownAnswers(unknownFile)(userAnswer(1)) += 1
         total(unknownFile) += 1
       }
-      else
-      {
+      else {
         unknownAnswers(unknownFile)+=(userAnswer(1)) -> 1
         total(unknownFile) += 1
       }
       if(total(unknownFile)>=3) {
-        if((unknownAnswers(unknownFile)(userAnswer(1))/total(unknownFile))>=0.9)
-        {
+        if((unknownAnswers(unknownFile)(userAnswer(1))/total(unknownFile))>=0.9) {
           unknownAnswers -= unknownFile
           Files.move(new File("unknown/"+unknownFile).toPath, new File("known/"+userAnswer(1)+".png").toPath, StandardCopyOption.REPLACE_EXISTING)
           knownFiles = new File("known").list.toList