Move classes between packages

andrei-punko · andrei-punko · commit b2341b10d4b6 · 2021-02-25T17:02:43.000+03:00
diff --git a/src/main/java/by/andd3dfx/cache/LFUCache.java b/src/main/java/by/andd3dfx/cache/LFUCache.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.amazon;
+package by.andd3dfx.cache;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
diff --git a/src/main/java/by/andd3dfx/cache/LRUCache.java b/src/main/java/by/andd3dfx/cache/LRUCache.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.amazon;
+package by.andd3dfx.cache;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
diff --git a/src/main/java/by/andd3dfx/common/CustomEnum.java b/src/main/java/by/andd3dfx/common/CustomEnum.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.common;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/by/andd3dfx/info.txt b/src/main/java/by/andd3dfx/info.txt
diff --git a/src/main/java/by/andd3dfx/iterators/CompositeIterator2.java b/src/main/java/by/andd3dfx/iterators/CompositeIterator2.java
@@ -1,14 +1,14 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.iterators;
 
 import java.util.Iterator;
 
-public class CompositeIterator<T> implements Iterator<T> {
+public class CompositeIterator2<T> implements Iterator<T> {
 
     private final Iterator<T> a;
     private final Iterator<T> b;
     private Iterator<T> currentIterator;
 
-    public CompositeIterator(Iterator<T> a, Iterator<T> b) {
+    public CompositeIterator2(Iterator<T> a, Iterator<T> b) {
         this.a = a;
         this.b = b;
         currentIterator = a;
diff --git a/src/main/java/by/andd3dfx/iterators/EvenIterator.java b/src/main/java/by/andd3dfx/iterators/EvenIterator.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.iterators;
 
 import java.util.Iterator;
 import java.util.Stack;
diff --git a/src/main/java/by/andd3dfx/numeric/BestAverageScore.java b/src/main/java/by/andd3dfx/numeric/BestAverageScore.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.numeric;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/by/andd3dfx/numeric/FindIndexesForSum.java b/src/main/java/by/andd3dfx/numeric/FindIndexesForSum.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.numeric;
 
 import static java.util.Arrays.binarySearch;
 
diff --git a/src/main/java/by/andd3dfx/numeric/MinMultiplication.java b/src/main/java/by/andd3dfx/numeric/MinMultiplication.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.numeric;
 
 /**
  * Дана последовательность целых чисел. Необходимо найти минимально возможное произведение
diff --git a/src/main/java/by/andd3dfx/numeric/SecondLargestElement.java b/src/main/java/by/andd3dfx/numeric/SecondLargestElement.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.numeric;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/by/andd3dfx/numeric/TwoSum.java b/src/main/java/by/andd3dfx/numeric/TwoSum.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.wf;
+package by.andd3dfx.numeric;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/by/andd3dfx/string/LettersFrequencies.java b/src/main/java/by/andd3dfx/string/LettersFrequencies.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.string;
 
 import java.util.Map;
 import java.util.TreeMap;
diff --git a/src/main/java/by/andd3dfx/string/LongestDictWordsFromCharacters.java b/src/main/java/by/andd3dfx/string/LongestDictWordsFromCharacters.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.string;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/by/andd3dfx/tasks.txt b/src/main/java/by/andd3dfx/tasks.txt
@@ -19,13 +19,25 @@ We have restriction of RAM size: so only one string could be loaded into RAM sim
 TODO: добавить решение CS задач:
 сортировки:
 - пирамидальная
-- быстрая (со стеками/на месте)
+- быстрая
+    - со стеками
+    - на месте
 - подсчетом
 - блочная
 
-хеш-таблицы, пробирование (линейное, квадратичное, пвсевдослучайное), хэширование (одинарное, двойное)
+хеш-таблицы:
+- пробирование
+    - линейное
+    - квадратичное
+    - пвсевдослучайное
+- хэширование
+    - одинарное
+    - двойное
+
 сочетания, размещения, с повторениями/без
 
 деревья:
-- добавление/поиск/удаление вершин
+- добавление вершин
+- поиск вершин
+- удаление вершин
 - префиксные деревья
diff --git a/src/main/java/by/andd3dfx/tree/NextNodeForBinarySearchTree.java b/src/main/java/by/andd3dfx/tree/NextNodeForBinarySearchTree.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.tree;
 
 /**
  * We have binary search tree:
diff --git a/src/main/java/by/andd3dfx/xml/Parser.java b/src/main/java/by/andd3dfx/xml/Parser.java
@@ -1,4 +1,4 @@
-package by.andd3dfx.interview.dow;
+package by.andd3dfx.xml;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/by/andd3dfx/cache/LFUCacheTest.java b/src/test/java/by/andd3dfx/cache/LFUCacheTest.java
@@ -1,8 +1,9 @@
-package by.andd3dfx.interview.amazon;
+package by.andd3dfx.cache;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.cache.LFUCache;
 import org.junit.Test;
 
 public class LFUCacheTest {
diff --git a/src/test/java/by/andd3dfx/cache/LRUCacheTest.java b/src/test/java/by/andd3dfx/cache/LRUCacheTest.java
@@ -1,8 +1,9 @@
-package by.andd3dfx.interview.amazon;
+package by.andd3dfx.cache;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.cache.LRUCache;
 import org.junit.Test;
 
 public class LRUCacheTest {
diff --git a/src/test/java/by/andd3dfx/common/CustomEnumTest.java b/src/test/java/by/andd3dfx/common/CustomEnumTest.java
@@ -1,9 +1,10 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.common;
 
+import by.andd3dfx.common.CustomEnum;
 import org.junit.Test;
 
-import static by.andd3dfx.interview.train2021.CustomEnum.MONDAY;
-import static by.andd3dfx.interview.train2021.CustomEnum.SUNDAY;
+import static by.andd3dfx.common.CustomEnum.MONDAY;
+import static by.andd3dfx.common.CustomEnum.SUNDAY;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/src/test/java/by/andd3dfx/interview/goldmansachs/Card.java b/src/test/java/by/andd3dfx/interview/goldmansachs/Card.java
diff --git a/src/test/java/by/andd3dfx/interview/goldmansachs/Person.java b/src/test/java/by/andd3dfx/interview/goldmansachs/Person.java
diff --git a/src/test/java/by/andd3dfx/interview/goldmansachs/PropertiesExtractorTest.java b/src/test/java/by/andd3dfx/interview/goldmansachs/PropertiesExtractorTest.java
@@ -3,8 +3,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import org.junit.Test;
 
 public class PropertiesExtractorTest {
@@ -21,4 +19,45 @@ public void extractForComplexObject() throws IllegalAccessException {
         person.setCard(new Card("VISA", "123546"));
         assertThat(PropertiesExtractor.extract(person), is("Andrei VISA 123546"));
     }
+
+    public static class Person {
+
+        private String name;
+        private Card card;
+
+        public Person(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Card getCard() {
+            return card;
+        }
+
+        public void setCard(Card card) {
+            this.card = card;
+        }
+    }
+
+    public static class Card {
+
+        private String vendor;
+        private String number;
+
+        public Card(String vendor, String number) {
+            this.vendor = vendor;
+            this.number = number;
+        }
+
+        public String getVendor() {
+            return vendor;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+    }
 }
diff --git a/src/test/java/by/andd3dfx/iterators/EvenIteratorTest.java b/src/test/java/by/andd3dfx/iterators/EvenIteratorTest.java
@@ -1,5 +1,6 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.iterators;
 
+import by.andd3dfx.iterators.EvenIterator;
 import org.junit.Test;
 
 import java.util.Arrays;
diff --git a/src/test/java/by/andd3dfx/numeric/BestAverageScoreTest.java b/src/test/java/by/andd3dfx/numeric/BestAverageScoreTest.java
@@ -1,9 +1,10 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.numeric;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import by.andd3dfx.interview.goldmansachs.BestAverageScore.Item;
+import by.andd3dfx.numeric.BestAverageScore;
+import by.andd3dfx.numeric.BestAverageScore.Item;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
diff --git a/src/test/java/by/andd3dfx/numeric/FindIndexesForSumTest.java b/src/test/java/by/andd3dfx/numeric/FindIndexesForSumTest.java
@@ -1,5 +1,6 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.numeric;
 
+import by.andd3dfx.numeric.FindIndexesForSum;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/by/andd3dfx/numeric/MinMultiplicationTest.java b/src/test/java/by/andd3dfx/numeric/MinMultiplicationTest.java
@@ -1,5 +1,6 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.numeric;
 
+import by.andd3dfx.numeric.MinMultiplication;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/by/andd3dfx/numeric/SecondLargestElementTest.java b/src/test/java/by/andd3dfx/numeric/SecondLargestElementTest.java
@@ -1,8 +1,9 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.numeric;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.numeric.SecondLargestElement;
 import org.junit.Test;
 
 public class SecondLargestElementTest {
diff --git a/src/test/java/by/andd3dfx/numeric/TwoSumTest.java b/src/test/java/by/andd3dfx/numeric/TwoSumTest.java
@@ -1,10 +1,11 @@
-package by.andd3dfx.interview.wf;
+package by.andd3dfx.numeric;
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.numeric.TwoSum;
 import org.junit.Test;
 
 public class TwoSumTest {
diff --git a/src/test/java/by/andd3dfx/string/LettersFrequenciesTest.java b/src/test/java/by/andd3dfx/string/LettersFrequenciesTest.java
@@ -1,8 +1,9 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.string;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.string.LettersFrequencies;
 import org.junit.Test;
 
 public class LettersFrequenciesTest {
diff --git a/src/test/java/by/andd3dfx/string/LongestDictWordsFromCharactersTest.java b/src/test/java/by/andd3dfx/string/LongestDictWordsFromCharactersTest.java
@@ -1,8 +1,9 @@
-package by.andd3dfx.interview.goldmansachs;
+package by.andd3dfx.string;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import by.andd3dfx.string.LongestDictWordsFromCharacters;
 import org.junit.Test;
 
 public class LongestDictWordsFromCharactersTest {
diff --git a/src/test/java/by/andd3dfx/tree/NextNodeForBinarySearchTreeTest.java b/src/test/java/by/andd3dfx/tree/NextNodeForBinarySearchTreeTest.java
@@ -1,5 +1,6 @@
-package by.andd3dfx.interview.train2021;
+package by.andd3dfx.tree;
 
+import by.andd3dfx.tree.NextNodeForBinarySearchTree;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package by.andd3dfx.interview.amazon;`
	`1`	`+package by.andd3dfx.cache;`
`2`	`2`
`3`	`3`	`import java.util.HashMap;`
`4`	`4`	`import java.util.LinkedHashSet;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package by.andd3dfx.interview.train2021;`
	`1`	`+package by.andd3dfx.common;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.HashMap;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package by.andd3dfx.interview.train2021;`
	`1`	`+package by.andd3dfx.iterators;`
`2`	`2`
`3`	`3`	`import java.util.Iterator;`
`4`	`4`	`import java.util.Stack;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package by.andd3dfx.interview.goldmansachs;`
	`1`	`+package by.andd3dfx.numeric;`
`2`	`2`
`3`	`3`	`import java.util.Collection;`
`4`	`4`	`import java.util.Collections;`