Corrected project structure

varunu28 · varunu28 · commit 0adfcaca7a70 · 2018-08-28T13:16:45.000-07:00
diff --git a/src/main/java/com/conversions/AnyBaseToDecimal.java b/src/main/java/com/conversions/AnyBaseToDecimal.java
@@ -1,4 +1,4 @@
-package src.main.com.java.conversions;
+package src.main.java.com.conversions;
 
 public class AnyBaseToDecimal {
     /**
diff --git a/src/main/java/com/conversions/DecimalToAnyBase.java b/src/main/java/com/conversions/DecimalToAnyBase.java
@@ -1,4 +1,4 @@
-package main.com.java.conversions;
+package src.main.java.com.conversions;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/search/BinarySearch.java b/src/main/java/com/search/BinarySearch.java
@@ -1,4 +1,4 @@
-package src.main.com.java.search;
+package src.main.java.com.search;
 
 /**
  * Binary search is an algorithm which finds the position of a target value within a sorted array
diff --git a/src/main/java/com/sorts/BubbleSort.java b/src/main/java/com/sorts/BubbleSort.java
@@ -1,7 +1,4 @@
-package src.main.com.java.sorts;
-
-import static src.main.com.java.sorts.SortUtils.less;
-import static src.main.com.java.sorts.SortUtils.swap;
+package src.main.java.com.sorts;
 
 public class BubbleSort {
   /**
@@ -17,8 +14,8 @@ public <T extends Comparable<T>> T[] sort(T[] array) {
     do {
       swap = false;
       for (int count = 0; count < last - 1; count++) {
-        if (less(array[count + 1], array[count])) {
-          swap = swap(array, count, count + 1);
+        if (SortUtils.less(array[count + 1], array[count])) {
+          swap = SortUtils.swap(array, count, count + 1);
         }
       }
       last--;
diff --git a/src/main/java/com/sorts/HeapSort.java b/src/main/java/com/sorts/HeapSort.java
@@ -1,11 +1,11 @@
-package src.main.com.java.sorts;
+package src.main.java.com.sorts;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static src.main.com.java.sorts.SortUtils.less;
-import static src.main.com.java.sorts.SortUtils.swap;
+import static src.main.java.com.sorts.SortUtils.less;
+import static src.main.java.com.sorts.SortUtils.swap;
 
 public class HeapSort {
 
diff --git a/src/main/java/com/sorts/QuickSort.java b/src/main/java/com/sorts/QuickSort.java
@@ -1,7 +1,7 @@
-package src.main.com.java.sorts;
+package src.main.java.com.sorts;
 
-import static src.main.com.java.sorts.SortUtils.less;
-import static src.main.com.java.sorts.SortUtils.swap;
+import static src.main.java.com.sorts.SortUtils.less;
+import static src.main.java.com.sorts.SortUtils.swap;
 
 public class QuickSort {
 
diff --git a/src/main/java/com/sorts/SelectionSort.java b/src/main/java/com/sorts/SelectionSort.java
@@ -1,7 +1,7 @@
-package src.main.com.java.sorts;
+package src.main.java.com.sorts;
 
-import static src.main.com.java.sorts.SortUtils.less;
-import static src.main.com.java.sorts.SortUtils.swap;
+import static src.main.java.com.sorts.SortUtils.less;
+import static src.main.java.com.sorts.SortUtils.swap;
 
 public class SelectionSort {
 
diff --git a/src/main/java/com/sorts/ShellSort.java b/src/main/java/com/sorts/ShellSort.java
@@ -1,7 +1,7 @@
-package src.main.com.java.sorts;
+package src.main.java.com.sorts;
 
-import static src.main.com.java.sorts.SortUtils.less;
-import static src.main.com.java.sorts.SortUtils.swap;
+import static src.main.java.com.sorts.SortUtils.less;
+import static src.main.java.com.sorts.SortUtils.swap;
 
 public class ShellSort {
 
diff --git a/src/main/java/com/sorts/SortUtils.java b/src/main/java/com/sorts/SortUtils.java
@@ -1,4 +1,4 @@
-package src.main.com.java.sorts;
+package src.main.java.com.sorts;
 
 final class SortUtils {
 
diff --git a/src/test/java/com/conversions/AnyBaseToDecimalTest.java b/src/test/java/com/conversions/AnyBaseToDecimalTest.java
@@ -1,8 +1,8 @@
-package src.test.com.java.conversions;
+package src.test.java.com.conversions;
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.conversions.AnyBaseToDecimal;
+import src.main.java.com.conversions.AnyBaseToDecimal;
 
 public class AnyBaseToDecimalTest {
 
diff --git a/src/test/java/com/conversions/DecimalToAnyBaseTest.java b/src/test/java/com/conversions/DecimalToAnyBaseTest.java
@@ -1,6 +1,6 @@
-package test.com.java.conversions;
+package src.test.java.com.conversions;
 
-import main.com.java.conversions.DecimalToAnyBase;
+import src.main.java.com.conversions.DecimalToAnyBase;
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/src/test/java/com/search/BinarySearchTest.java b/src/test/java/com/search/BinarySearchTest.java
@@ -1,8 +1,8 @@
-package src.test.com.java.search;
+package src.test.java.com.search;
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.search.BinarySearch;
+import src.main.java.com.search.BinarySearch;
 
 public class BinarySearchTest {
 
diff --git a/src/test/java/com/sorts/BubbleSortTest.java b/src/test/java/com/sorts/BubbleSortTest.java
@@ -1,9 +1,9 @@
-package src.test.com.java.sorts;
+package src.test.java.com.sorts;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.sorts.BubbleSort;
+import src.main.java.com.sorts.BubbleSort;
 
 import java.util.Arrays;
 
diff --git a/src/test/java/com/sorts/HeapSortTest.java b/src/test/java/com/sorts/HeapSortTest.java
@@ -1,9 +1,9 @@
-package src.test.com.java.sorts;
+package src.test.java.com.sorts;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.sorts.HeapSort;
+import src.main.java.com.sorts.HeapSort;
 
 import java.util.Arrays;
 
diff --git a/src/test/java/com/sorts/QuickSortTest.java b/src/test/java/com/sorts/QuickSortTest.java
@@ -1,9 +1,9 @@
-package src.test.com.java.sorts;
+package src.test.java.com.sorts;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.sorts.QuickSort;
+import src.main.java.com.sorts.QuickSort;
 
 import java.util.Arrays;
 
diff --git a/src/test/java/com/sorts/SelectionSortTest.java b/src/test/java/com/sorts/SelectionSortTest.java
@@ -1,8 +1,8 @@
-package src.test.com.java.sorts;
+package src.test.java.com.sorts;
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.sorts.SelectionSort;
+import src.main.java.com.sorts.SelectionSort;
 
 import java.util.Arrays;
 
diff --git a/src/test/java/com/sorts/ShellSortTest.java b/src/test/java/com/sorts/ShellSortTest.java
@@ -1,8 +1,8 @@
-package src.test.com.java.sorts;
+package src.test.java.com.sorts;
 
 import org.junit.Assert;
 import org.junit.Test;
-import src.main.com.java.sorts.ShellSort;
+import src.main.java.com.sorts.ShellSort;
 
 import java.util.Arrays;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package src.main.com.java.conversions;`
	`1`	`+package src.main.java.com.conversions;`
`2`	`2`
`3`	`3`	`public class AnyBaseToDecimal {`
`4`	`4`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package main.com.java.conversions;`
	`1`	`+package src.main.java.com.conversions;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package src.main.com.java.search;`
	`1`	`+package src.main.java.com.search;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Binary search is an algorithm which finds the position of a target value within a sorted array`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package src.main.com.java.sorts;`
	`1`	`+package src.main.java.com.sorts;`
`2`	`2`
`3`	`3`	`final class SortUtils {`
`4`	`4`