From e7304d367ee6398616d056afe3343df93f677ca5 Mon Sep 17 00:00:00 2001
From: Du Yuanchao <shellhub.me@gmail.com>
Date: Tue, 25 Aug 2020 19:43:59 +0800
Subject: [PATCH] Revert "Fixed code smells after running sonarqube on the
project"
---
src/main/java/com/caching/LFUCache.java | 8 ++--
src/main/java/com/caching/LRUCache.java | 1 +
.../java/com/ciphers/CaesarBruteForce.java | 12 +++---
.../com/conversions/HexadecimalToBinary.java | 6 +--
.../BinaryTree.java | 41 +++++++++----------
.../DisjointSet.java | 11 +++--
.../GeneralQueue.java | 2 +-
.../IntQueue.java | 2 +-
.../SinglyLinkedList.java | 2 +-
.../Stack.java | 2 +-
.../GaleShapley.java | 2 +-
.../BinaryTreeTest.java | 2 +-
.../DisjointSetTest.java | 2 +-
.../GeneralQueueTest.java | 2 +-
.../IntQueueTest.java | 2 +-
.../SinglyLinkedListTest.java | 2 +-
.../StackTest.java | 2 +-
.../GaleShapleyTest.java | 2 +-
18 files changed, 50 insertions(+), 53 deletions(-)
rename src/main/java/com/{datastructures => dataStructures}/BinaryTree.java (77%)
rename src/main/java/com/{datastructures => dataStructures}/DisjointSet.java (92%)
rename src/main/java/com/{datastructures => dataStructures}/GeneralQueue.java (99%)
rename src/main/java/com/{datastructures => dataStructures}/IntQueue.java (99%)
rename src/main/java/com/{datastructures => dataStructures}/SinglyLinkedList.java (98%)
rename src/main/java/com/{datastructures => dataStructures}/Stack.java (98%)
rename src/main/java/com/matchings/{stablematching => stableMatching}/GaleShapley.java (99%)
rename src/test/java/com/{datastructures => dataStructures}/BinaryTreeTest.java (98%)
rename src/test/java/com/{datastructures => dataStructures}/DisjointSetTest.java (96%)
rename src/test/java/com/{datastructures => dataStructures}/GeneralQueueTest.java (97%)
rename src/test/java/com/{datastructures => dataStructures}/IntQueueTest.java (99%)
rename src/test/java/com/{datastructures => dataStructures}/SinglyLinkedListTest.java (98%)
rename src/test/java/com/{datastructures => dataStructures}/StackTest.java (98%)
rename src/test/java/com/matchings/{stablematching => stableMatching}/GaleShapleyTest.java (99%)
diff --git a/src/main/java/com/caching/LFUCache.java b/src/main/java/com/caching/LFUCache.java
index 3eb78de88f95..c61ba6c7bfb8 100644
--- a/src/main/java/com/caching/LFUCache.java
+++ b/src/main/java/com/caching/LFUCache.java
@@ -75,8 +75,8 @@ public void deleteNode(Node node) {
public LFUCache(int capacity) {
this.capacity = capacity;
size = 0;
- freq = new TreeMap<>();
- map = new HashMap<>();
+ freq = new TreeMap<Integer, DLL>();
+ map = new HashMap<Integer, Node>();
System.out.println("LFUCache initialised with capacity: " + capacity);
}
@@ -145,8 +145,8 @@ public void put(int key, T value) {
dll.deleteNode(dll.tail.pre);
if (dll.len == 0 && lowest != 1)
freq.remove(lowest);
- DLL freqOne = freq.computeIfAbsent(1, k -> new DLL());
- freqOne.addToHead(node);
+ DLL freq_one = freq.computeIfAbsent(1, k -> new DLL());
+ freq_one.addToHead(node);
}
}
diff --git a/src/main/java/com/caching/LRUCache.java b/src/main/java/com/caching/LRUCache.java
index 88e66efba5f7..e043e35d729f 100644
--- a/src/main/java/com/caching/LRUCache.java
+++ b/src/main/java/com/caching/LRUCache.java
@@ -63,6 +63,7 @@ public void put(int key, T value) {
System.out.println("Cache set to 0 capacity. No elements will be cached");
}
+ T currentValue = cache.get(key);
if (!cache.containsKey(key)) {
cache.put(key, value);
System.out.println("Adding new key:" + key + " to cache");
diff --git a/src/main/java/com/ciphers/CaesarBruteForce.java b/src/main/java/com/ciphers/CaesarBruteForce.java
index 88f715694579..ab60fec0b727 100644
--- a/src/main/java/com/ciphers/CaesarBruteForce.java
+++ b/src/main/java/com/ciphers/CaesarBruteForce.java
@@ -5,25 +5,25 @@ public class CaesarBruteForce {
/**
* Recursively Brute forces a parsed encrypted text, trying out all shifting keys from 1-26, printing out all decryption attempts
* @param message (String) The encrypted text.
- * @param key (int) The key used to decrypt the encrypted text and is increment upon a recursive call.
+ * @param Key (int) The key used to decrypt the encrypted text and is increment upon a recursive call.
* @return (String) Concatenated string of all decryption attempts (For unit testing purposes).
*/
- public String decrypt(String message, int key) {
+ public String decrypt(String message, int Key) {
final String LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- if (key > 26){ System.out.println(); return null; }
+ if (Key > 26){ System.out.println(); return null; }
StringBuilder plainText = new StringBuilder();
for (char character : message.toUpperCase().toCharArray()) {
int index = LETTERS.indexOf(character);
if (index != -1) {
- index -= key;
+ index -= Key;
//Wrap around index value range[1-26]
if (index < 0) { index += LETTERS.length(); }
plainText.append(LETTERS.toCharArray()[index]);
} else { plainText.append(character); }
}
- System.out.println(String.format("Current Decryption Key %d : %s", key, plainText));
- return plainText.append(decrypt(message, key+1)).toString();
+ System.out.println(String.format("Current Decryption Key %d : %s", Key, plainText));
+ return plainText.append(decrypt(message, Key+1)).toString();
}
}
diff --git a/src/main/java/com/conversions/HexadecimalToBinary.java b/src/main/java/com/conversions/HexadecimalToBinary.java
index da3a01aca148..6758606ee551 100644
--- a/src/main/java/com/conversions/HexadecimalToBinary.java
+++ b/src/main/java/com/conversions/HexadecimalToBinary.java
@@ -12,7 +12,7 @@ public class HexadecimalToBinary {
public String hexToBin (String hexStr) {
String binaryString = "", hexaNumbers = "0123456789ABCDEF",
- decimalStr ="", binaryStringBefore ="" , binaryStringAfter = "";
+ DecimalStr ="", binaryStringBefore ="" , binaryStringAfter = "";
int indexOfHex, decimalNumber = 0, k = 1, n =1, z=1, decimalNumberBefore = 0
, decimalNumberAfter = 0;
char letter;
@@ -48,12 +48,12 @@ public String hexToBin (String hexStr) {
String decimalNumberAfterStr = String.valueOf(decimalNumberAfter);
- decimalStr = decimalNumberBeforeStr + '.' + decimalNumberAfterStr;
+ DecimalStr = decimalNumberBeforeStr + '.' + decimalNumberAfterStr;
}
- int pointPositionDec = decimalStr.indexOf(".");
+ int pointPositionDec = DecimalStr.indexOf(".");
/**
* Check whether the result contains a floating point or not
*/
diff --git a/src/main/java/com/datastructures/BinaryTree.java b/src/main/java/com/dataStructures/BinaryTree.java
similarity index 77%
rename from src/main/java/com/datastructures/BinaryTree.java
rename to src/main/java/com/dataStructures/BinaryTree.java
index 5bf1702e2cfe..4aae62fe52a8 100644
--- a/src/main/java/com/datastructures/BinaryTree.java
+++ b/src/main/java/com/dataStructures/BinaryTree.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
/**
* Binary tree for general value type, without redundancy
@@ -8,7 +8,7 @@
public class BinaryTree<T extends Comparable> {
private final T data;
- private BinaryTree<T> right, // the upper binary tree
+ private BinaryTree right, // the upper binary tree
left; // the lower binary tree
public BinaryTree(T data) {
@@ -21,38 +21,35 @@ public String toString() {
}
/**
- * inserts a new value in it's correspondent place
+ * inserts a new value in it's correspondant place
*
* @param newDataValue value of the new binary tree to add on this tree
*/
public void insert(T newDataValue) {
- this.insert(new BinaryTree<>(newDataValue));
+ this.insert(new BinaryTree(newDataValue));
}
/**
- * inserts a new binary tree in it's correspondent place
+ * inserts a new binary tree in it's correspondant place
*
* @param newData new value to add on this tree
*/
- public void insert(BinaryTree<T> newData) {
+ public void insert(BinaryTree newData) {
int cpr = newData.data.compareTo(this.data); //new value comparission respect to actual value
- if (cpr < 0) {
- if (this.left == null) {
+ if (cpr < 0)
+ if (this.left == null)
this.setLeft(newData);
- } else {
+ else
this.left.insert(newData);
- }
- } else if (cpr > 0) {
- if (this.right == null) {
+ else if (cpr > 0)
+ if (this.right == null)
this.setRight(newData);
- } else {
+ else
this.right.insert(newData);
- }
- } else {
+ else
System.out.println("Redundant value, not added");
- }
}
/**
@@ -61,8 +58,8 @@ public void insert(BinaryTree<T> newData) {
* @param data Searched value
* @return Binary tree which contains the value, null if it doesn't exist
*/
- public BinaryTree<T> search(T data) {
- int cpr = data.compareTo(this.data); //new value comparison respect to actual value
+ public BinaryTree search(T data) {
+ int cpr = data.compareTo(this.data); //new value comparission respect to actual value
if (cpr < 0) {
if (this.left == null)
@@ -116,19 +113,19 @@ public T getData() {
return data;
}
- public BinaryTree<T> getRight() {
+ public BinaryTree getRight() {
return right;
}
- public void setRight(BinaryTree<T> right) {
+ public void setRight(BinaryTree right) {
this.right = right;
}
- public BinaryTree<T> getLeft() {
+ public BinaryTree getLeft() {
return left;
}
- public void setLeft(BinaryTree<T> left) {
+ public void setLeft(BinaryTree left) {
this.left = left;
}
}
diff --git a/src/main/java/com/datastructures/DisjointSet.java b/src/main/java/com/dataStructures/DisjointSet.java
similarity index 92%
rename from src/main/java/com/datastructures/DisjointSet.java
rename to src/main/java/com/dataStructures/DisjointSet.java
index 281bbf165337..3cb0d698a80e 100644
--- a/src/main/java/com/datastructures/DisjointSet.java
+++ b/src/main/java/com/dataStructures/DisjointSet.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import java.io.Serializable;
import java.util.*;
@@ -18,15 +18,14 @@
*/
public class DisjointSet<T> implements Serializable {
private static final long serialVersionUID = 3134700471905625636L;
- private static final String elementKey = "element";
- private final Map<T, Node<T>> nodeMap = new HashMap<>();
+ private Map<T, Node<T>> nodeMap = new HashMap<>();
/**
* Add an element to the disjoint-set forests as a set.
*/
public void makeSet(T element) {
- checkNotNull(element, elementKey);
+ checkNotNull(element, "element");
nodeMap.putIfAbsent(element, new Node<>());
}
@@ -37,8 +36,8 @@ public void makeSet(T element) {
* Rank is an upper bound on the height of node.
*/
public void union(T left, T right) {
- checkNotNull(left, elementKey);
- checkNotNull(right, elementKey);
+ checkNotNull(left, "element");
+ checkNotNull(right, "element");
Node<T> leftNode = nodeMap.get(left),
rightNode = nodeMap.get(right);
diff --git a/src/main/java/com/datastructures/GeneralQueue.java b/src/main/java/com/dataStructures/GeneralQueue.java
similarity index 99%
rename from src/main/java/com/datastructures/GeneralQueue.java
rename to src/main/java/com/dataStructures/GeneralQueue.java
index 1749bb1082b9..3d0920821c67 100644
--- a/src/main/java/com/datastructures/GeneralQueue.java
+++ b/src/main/java/com/dataStructures/GeneralQueue.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import com.types.Queue;
diff --git a/src/main/java/com/datastructures/IntQueue.java b/src/main/java/com/dataStructures/IntQueue.java
similarity index 99%
rename from src/main/java/com/datastructures/IntQueue.java
rename to src/main/java/com/dataStructures/IntQueue.java
index 901609c60270..d300f38359d9 100644
--- a/src/main/java/com/datastructures/IntQueue.java
+++ b/src/main/java/com/dataStructures/IntQueue.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
/**
* This file contains an implementation of an integer only queue which is extremely quick and
diff --git a/src/main/java/com/datastructures/SinglyLinkedList.java b/src/main/java/com/dataStructures/SinglyLinkedList.java
similarity index 98%
rename from src/main/java/com/datastructures/SinglyLinkedList.java
rename to src/main/java/com/dataStructures/SinglyLinkedList.java
index 6d1e5e98e37a..4525e3a7bdf1 100644
--- a/src/main/java/com/datastructures/SinglyLinkedList.java
+++ b/src/main/java/com/dataStructures/SinglyLinkedList.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
diff --git a/src/main/java/com/datastructures/Stack.java b/src/main/java/com/dataStructures/Stack.java
similarity index 98%
rename from src/main/java/com/datastructures/Stack.java
rename to src/main/java/com/dataStructures/Stack.java
index e71d3cd1f91e..7c562f5ba40e 100644
--- a/src/main/java/com/datastructures/Stack.java
+++ b/src/main/java/com/dataStructures/Stack.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import java.io.Serializable;
import java.util.EmptyStackException;
diff --git a/src/main/java/com/matchings/stablematching/GaleShapley.java b/src/main/java/com/matchings/stableMatching/GaleShapley.java
similarity index 99%
rename from src/main/java/com/matchings/stablematching/GaleShapley.java
rename to src/main/java/com/matchings/stableMatching/GaleShapley.java
index f8d94b6242f0..1e1e1ab9269d 100644
--- a/src/main/java/com/matchings/stablematching/GaleShapley.java
+++ b/src/main/java/com/matchings/stableMatching/GaleShapley.java
@@ -1,4 +1,4 @@
-package com.matchings.stablematching;
+package com.matchings.stableMatching;
public class GaleShapley {
diff --git a/src/test/java/com/datastructures/BinaryTreeTest.java b/src/test/java/com/dataStructures/BinaryTreeTest.java
similarity index 98%
rename from src/test/java/com/datastructures/BinaryTreeTest.java
rename to src/test/java/com/dataStructures/BinaryTreeTest.java
index a574692e9603..1fcfeb7df041 100644
--- a/src/test/java/com/datastructures/BinaryTreeTest.java
+++ b/src/test/java/com/dataStructures/BinaryTreeTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/datastructures/DisjointSetTest.java b/src/test/java/com/dataStructures/DisjointSetTest.java
similarity index 96%
rename from src/test/java/com/datastructures/DisjointSetTest.java
rename to src/test/java/com/dataStructures/DisjointSetTest.java
index 79e65df116b4..d85871a79868 100644
--- a/src/test/java/com/datastructures/DisjointSetTest.java
+++ b/src/test/java/com/dataStructures/DisjointSetTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/datastructures/GeneralQueueTest.java b/src/test/java/com/dataStructures/GeneralQueueTest.java
similarity index 97%
rename from src/test/java/com/datastructures/GeneralQueueTest.java
rename to src/test/java/com/dataStructures/GeneralQueueTest.java
index d4794d021892..3c4c3a7aa391 100644
--- a/src/test/java/com/datastructures/GeneralQueueTest.java
+++ b/src/test/java/com/dataStructures/GeneralQueueTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import com.types.Queue;
diff --git a/src/test/java/com/datastructures/IntQueueTest.java b/src/test/java/com/dataStructures/IntQueueTest.java
similarity index 99%
rename from src/test/java/com/datastructures/IntQueueTest.java
rename to src/test/java/com/dataStructures/IntQueueTest.java
index f9f871999d13..4e107c882416 100644
--- a/src/test/java/com/datastructures/IntQueueTest.java
+++ b/src/test/java/com/dataStructures/IntQueueTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import static org.junit.Assert.*;
diff --git a/src/test/java/com/datastructures/SinglyLinkedListTest.java b/src/test/java/com/dataStructures/SinglyLinkedListTest.java
similarity index 98%
rename from src/test/java/com/datastructures/SinglyLinkedListTest.java
rename to src/test/java/com/dataStructures/SinglyLinkedListTest.java
index 0396bf3dbe1c..a5b87b633bcd 100644
--- a/src/test/java/com/datastructures/SinglyLinkedListTest.java
+++ b/src/test/java/com/dataStructures/SinglyLinkedListTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/src/test/java/com/datastructures/StackTest.java b/src/test/java/com/dataStructures/StackTest.java
similarity index 98%
rename from src/test/java/com/datastructures/StackTest.java
rename to src/test/java/com/dataStructures/StackTest.java
index 4759d17b371e..c6b80f158d06 100644
--- a/src/test/java/com/datastructures/StackTest.java
+++ b/src/test/java/com/dataStructures/StackTest.java
@@ -1,4 +1,4 @@
-package com.datastructures;
+package com.dataStructures;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/matchings/stablematching/GaleShapleyTest.java b/src/test/java/com/matchings/stableMatching/GaleShapleyTest.java
similarity index 99%
rename from src/test/java/com/matchings/stablematching/GaleShapleyTest.java
rename to src/test/java/com/matchings/stableMatching/GaleShapleyTest.java
index 6506bd07bd99..d23db53803b5 100644
--- a/src/test/java/com/matchings/stablematching/GaleShapleyTest.java
+++ b/src/test/java/com/matchings/stableMatching/GaleShapleyTest.java
@@ -1,4 +1,4 @@
-package com.matchings.stablematching;
+package com.matchings.stableMatching;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;