Skip to content
Merged
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
8b3a13d
Add files via upload
k0l0ssus Feb 14, 2017
8284773
Merge pull request #1 from k0l0ssus/k0l0ssus-guice-intro
k0l0ssus Feb 14, 2017
39ab201
Update pom.xml
k0l0ssus Feb 18, 2017
b8051b0
Update RunGuice.java
k0l0ssus Feb 18, 2017
1122e93
Update Communication.java
k0l0ssus Feb 18, 2017
efc2d27
Update CommunicationMode.java
k0l0ssus Feb 18, 2017
e9281a8
Update DefaultCommunicator.java
k0l0ssus Feb 18, 2017
0e02029
Update EmailCommunicationMode.java
k0l0ssus Feb 18, 2017
24acd84
Update IMCommunicationMode.java
k0l0ssus Feb 18, 2017
023d1da
Update SMSCommunicationMode.java
k0l0ssus Feb 18, 2017
6d46dfe
Update MessageLogger.java
k0l0ssus Feb 18, 2017
d5bd121
Update MessageSentLoggable.java
k0l0ssus Feb 18, 2017
156c7a2
Update AOPModule.java
k0l0ssus Feb 18, 2017
e1226d1
Update BasicModule.java
k0l0ssus Feb 18, 2017
67c0dd6
Update CommunicationModel.java
k0l0ssus Feb 18, 2017
43c3b52
Update Communicator.java
k0l0ssus Feb 18, 2017
c634e0b
Update BasicModule.java
k0l0ssus Feb 18, 2017
cae5eb7
Update RunGuice.java
k0l0ssus Feb 23, 2017
1517f89
Update MessageLogger.java
k0l0ssus Feb 23, 2017
54683ed
Update Communicator.java
k0l0ssus Feb 23, 2017
d9bb20a
Update pom.xml
k0l0ssus Feb 23, 2017
51580ab
BAEL-278: Updated README.md
KevinGilmore Feb 25, 2017
8dfb8bc
Merge remote-tracking branch 'upstream/master'
KevinGilmore Feb 26, 2017
9f87c07
BAEL-554: Add and update README.md files
KevinGilmore Feb 26, 2017
41bc542
Merge remote-tracking branch 'upstream/master'
KevinGilmore Feb 27, 2017
a1cf303
Merge remote-tracking branch 'upstream/master'
KevinGilmore Feb 27, 2017
53c06f8
Update pom.xml
k0l0ssus Feb 28, 2017
4883ae3
Update pom.xml
k0l0ssus Feb 28, 2017
9b3e96d
Update pom.xml
k0l0ssus Feb 28, 2017
9efb3e0
Merge remote-tracking branch 'upstream/master'
KevinGilmore Feb 28, 2017
1f28625
BAEL-345: fixed assertion
KevinGilmore Feb 28, 2017
26ba8a0
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 1, 2017
54aceaa
BAEL-109: Updated README.md
KevinGilmore Mar 1, 2017
767728b
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 2, 2017
d5e4764
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 2, 2017
2e6ce4b
BAEL-345: Added README.md
KevinGilmore Mar 2, 2017
c619c11
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 2, 2017
e27be0e
Reinstating reactor-core module in root-level pom
KevinGilmore Mar 2, 2017
1fc9668
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 3, 2017
ca24d5a
BAEL-393: Adding guide-intro module to root pom
KevinGilmore Mar 3, 2017
e62c825
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 5, 2017
7fa4b7c
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 5, 2017
f85c4e4
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 6, 2017
e2a2f5b
BAEL-9: Updated README.md
KevinGilmore Mar 6, 2017
051c439
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 7, 2017
1f4cafc
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 8, 2017
65e06de
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 8, 2017
caaf98a
BAEL-157: README.md updated
KevinGilmore Mar 8, 2017
b4ef2ba
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 9, 2017
7a27307
Changed project name
k0l0ssus Mar 9, 2017
78a6145
Merge pull request #2 from k0l0ssus/k0l0ssus-guice-patch
k0l0ssus Mar 9, 2017
6d5c8bb
Update RunGuice.java
k0l0ssus Mar 9, 2017
774d126
Update Communication.java
k0l0ssus Mar 9, 2017
bae1842
Merge branch 'master' into master
k0l0ssus Mar 9, 2017
685e731
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 11, 2017
b655a6a
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 11, 2017
5c6875a
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 12, 2017
a3dc283
BAEL-566: Updated README.md
KevinGilmore Mar 12, 2017
5da0089
Merge pull request #3 from eugenp/master
k0l0ssus Mar 12, 2017
1c58273
New project name
k0l0ssus Mar 12, 2017
32d947d
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 12, 2017
21825e4
Merge branch 'k0l0ssus-guice-4' of https://github.com/k0l0ssus/tutori…
KevinGilmore Mar 12, 2017
e09ba44
BAEL-393: removing guice-intro directory
KevinGilmore Mar 13, 2017
5fae580
BAEL-393: renamed module guice-intro to guice in root pom.xml
KevinGilmore Mar 13, 2017
871a769
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 13, 2017
dda833d
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 14, 2017
3f605bd
BAEL-393 and BAEL-541 README.md files
KevinGilmore Mar 15, 2017
d2ef609
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 17, 2017
c157e6a
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 17, 2017
276c2c6
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 19, 2017
91d8ef0
BAEL-731: Updated README.md
KevinGilmore Mar 19, 2017
b602dd1
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 19, 2017
f0ade8d
Merge remote-tracking branch 'upstream/master'
KevinGilmore Mar 21, 2017
9d49637
BAEL-680: renamed test methods
KevinGilmore Mar 21, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public void initData() {
}

@Test
public void givenEmployeeArray_whenUsingComparing_thenCheckingSort() {
public void whenComparing_thenSortedByName() {
Comparator<Employee> employeeNameComparator = Comparator.comparing(Employee::getName);
Arrays.sort(employees, employeeNameComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesByName));
}

@Test
public void givenEmployeeArray_whenUsingComparingWithComparator_thenCheckingSort() {
public void whenComparingWithComparator_thenSortedByNameDesc() {
Comparator<Employee> employeeNameComparator = Comparator.comparing(Employee::getName, (s1, s2) -> {
return s2.compareTo(s1);
});
Expand All @@ -78,47 +78,47 @@ public void givenEmployeeArray_whenUsingComparingWithComparator_thenCheckingSort
}

@Test
public void givenEmployeeArray_whenUsingComparingInt_thenCheckingSort() {
public void whenComparingInt_thenSortedByAge() {
Comparator<Employee> employeeAgeComparator = Comparator.comparingInt(Employee::getAge);
Arrays.sort(employees, employeeAgeComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesByAge));
}

@Test
public void givenEmployeeArray_whenUsingComparingLong_thenCheckingSort() {
public void whenComparingLong_thenSortedByMobile() {
Comparator<Employee> employeeMobileComparator = Comparator.comparingLong(Employee::getMobile);
Arrays.sort(employees, employeeMobileComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesByMobile));
}

@Test
public void givenEmployeeArray_whenUsingComparingDouble_thenCheckingSort() {
public void whenComparingDouble_thenSortedBySalary() {
Comparator<Employee> employeeSalaryComparator = Comparator.comparingDouble(Employee::getSalary);
Arrays.sort(employees, employeeSalaryComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesBySalary));
}

@Test
public void givenEmployeeArray_whenUsingNaturalOrder_thenCheckingSort() {
public void whenNaturalOrder_thenSortedByName() {
Comparator<Employee> employeeNameComparator = Comparator.<Employee> naturalOrder();
Arrays.sort(employees, employeeNameComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesByName));
}

@Test
public void givenEmployeeArray_whenUsingReverseOrder_thenCheckingSort() {
public void whenReverseOrder_thenSortedByNameDesc() {
Comparator<Employee> employeeNameComparator = Comparator.<Employee> reverseOrder();
Arrays.sort(employees, employeeNameComparator);
// System.out.println(Arrays.toString(employees));
assertTrue(Arrays.equals(employees, sortedEmployeesByNameDesc));
}

@Test
public void givenEmployeeArray_whenUsingNullFirst_thenCheckingSort() {
public void whenNullsFirst_thenSortedByNameWithNullsFirst() {
Comparator<Employee> employeeNameComparator = Comparator.comparing(Employee::getName);
Comparator<Employee> employeeNameComparator_nullFirst = Comparator.nullsFirst(employeeNameComparator);
Arrays.sort(employeesArrayWithNulls, employeeNameComparator_nullFirst);
Expand All @@ -127,7 +127,7 @@ public void givenEmployeeArray_whenUsingNullFirst_thenCheckingSort() {
}

@Test
public void givenEmployeeArray_whenUsingNullLast_thenCheckingSort() {
public void whenNullsLast_thenSortedByNameWithNullsLast() {
Comparator<Employee> employeeNameComparator = Comparator.comparing(Employee::getName);
Comparator<Employee> employeeNameComparator_nullLast = Comparator.nullsLast(employeeNameComparator);
Arrays.sort(employeesArrayWithNulls, employeeNameComparator_nullLast);
Expand All @@ -136,7 +136,7 @@ public void givenEmployeeArray_whenUsingNullLast_thenCheckingSort() {
}

@Test
public void givenEmployeeArray_whenUsingThenComparing_thenCheckingSort() {
public void whenThenComparing_thenSortedByAgeName() {
Comparator<Employee> employee_Age_Name_Comparator = Comparator.comparing(Employee::getAge).thenComparing(Employee::getName);

Arrays.sort(someMoreEmployees, employee_Age_Name_Comparator);
Expand All @@ -145,48 +145,12 @@ public void givenEmployeeArray_whenUsingThenComparing_thenCheckingSort() {
}

@Test
public void givenEmployeeArray_whenUsingThenComparingInt_thenCheckingSort() {
public void whenThenComparing_thenSortedByNameAge() {
Comparator<Employee> employee_Name_Age_Comparator = Comparator.comparing(Employee::getName).thenComparingInt(Employee::getAge);

Arrays.sort(someMoreEmployees, employee_Name_Age_Comparator);
// System.out.println(Arrays.toString(someMoreEmployees));
assertTrue(Arrays.equals(someMoreEmployees, sortedEmployeesByNameAge));
}

@Before
public void printData() {
// System.out.println("employees");
// System.out.println(Arrays.toString(employees));
//
// System.out.println("employeesArrayWithNulls");
// System.out.println(Arrays.toString(employeesArrayWithNulls));
//
// System.out.println("sortedEmployeesByName");
// System.out.println(Arrays.toString(sortedEmployeesByName));
//
// System.out.println("sortedEmployeesByNameDesc");
// System.out.println(Arrays.toString(sortedEmployeesByNameDesc));
//
// System.out.println("sortedEmployeesByAge");
// System.out.println(Arrays.toString(sortedEmployeesByAge));
//
// System.out.println("sortedEmployeesByMobile");
// System.out.println(Arrays.toString(sortedEmployeesByMobile));
//
// System.out.println("sortedEmployeesBySalary");
// System.out.println(Arrays.toString(sortedEmployeesBySalary));
//
// System.out.println("sortedEmployeesArray_WithNullsFirst");
// System.out.println(Arrays.toString(sortedEmployeesArray_WithNullsFirst));
//
// System.out.println("sortedEmployeesArray_WithNullsLast");
// System.out.println(Arrays.toString(sortedEmployeesArray_WithNullsLast));
//
// System.out.println("sortedEmployeesByNameAge");
// System.out.println(Arrays.toString(sortedEmployeesByNameAge));
//
// System.out.println("someMoreEmployees");
// System.out.println(Arrays.toString(someMoreEmployees));
//
}
}
}