Merge pull request #703 from FridaTveit/RotationalCipherEstimate

rotational-cipher: estimate and tidy

config.json

@@ -205,6 +205,16 @@
       ]
     },
     {
+      "uuid": "9eb41883-55ef-4681-b5ac-5c2259302772",
+      "slug": "rotational-cipher",
+      "core": false,
+      "unlocked_by": null,
+      "difficulty": 4,
+      "topics": [
+
+      ]
+    },
+    {
       "uuid": "0b92ffee-c092-4ab1-ad78-76c8cf80e1b5",
       "slug": "kindergarten-garden",
       "core": false,
@@ -769,16 +779,6 @@
       ]
     },
     {
-      "uuid": "9eb41883-55ef-4681-b5ac-5c2259302772",
-      "slug": "rotational-cipher",
-      "core": false,
-      "unlocked_by": null,
-      "difficulty": 1,
-      "topics": [
-
-      ]
-    },
-    {
       "uuid": "e58c29d2-80a7-40ef-bed0-4a184ae35f34",
       "slug": "accumulate",
       "deprecated": true

exercises/rotational-cipher/src/example/java/RotationalCipher.java

@@ -1,13 +1,12 @@
+class RotationalCipher {
 
-public class RotationalCipher {
-
-    int shiftKey;
+    private int shiftKey;
 
     RotationalCipher(int shiftKey) {
         this.shiftKey = shiftKey;
     }
 
-    public String rotate(String data) {
+    String rotate(String data) {
         StringBuilder dataStringBuilder = new StringBuilder();
         for (char c : data.toCharArray()) {
             if (Character.isUpperCase(c)) {
@@ -25,12 +24,10 @@ public class RotationalCipher {
      * For Uppercase CaseStart = 'A' and CaseEnd = 'Z'
      * For Lowercase CaseStart = 'a' and CaseEnd = 'z'
      */
-    private char getReplacementCharacter(char characterToReplace,
-            char alphabetCaseStart, char alphabetCaseEnd) {
+    private char getReplacementCharacter(char characterToReplace, char alphabetCaseStart, char alphabetCaseEnd) {
         char replacementCharacter = (char) (characterToReplace + shiftKey);
         if (replacementCharacter > alphabetCaseEnd) {
-            replacementCharacter = (char) ((alphabetCaseStart - 1) +
-             (replacementCharacter % alphabetCaseEnd));
+            replacementCharacter = (char) ((alphabetCaseStart - 1) + (replacementCharacter % alphabetCaseEnd));
         }
         return replacementCharacter;
     }

exercises/rotational-cipher/src/test/java/RotationalCipherTest.java

@@ -1,6 +1,4 @@
-
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -13,7 +11,7 @@ public class RotationalCipherTest {
         rotationalCipher = new RotationalCipher(1);
         Assert.assertEquals("b", rotationalCipher.rotate("a"));
     }
-    
+
     @Ignore("Remove to run test")
     @Test
     public void rotateSingleCharacterBy26() {
@@ -75,7 +73,6 @@ public class RotationalCipherTest {
     public void rotateAllLetters() {
         rotationalCipher = new RotationalCipher(13);
         Assert.assertEquals("The quick brown fox jumps over the lazy dog.",
-         rotationalCipher.rotate("Gur dhvpx oebja sbk whzcf bire gur ynml qbt."));
-    } 
-
+                rotationalCipher.rotate("Gur dhvpx oebja sbk whzcf bire gur ynml qbt."));
+    }
 }