From cb6c9638a2a7d81cf00aa9992b334dacd653637b Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 21:32:18 -0300 Subject: [PATCH 1/6] test(bamboo): Apenas teste do bamboo. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 90006ab..f6344ba 100644 --- a/pom.xml +++ b/pom.xml @@ -149,12 +149,12 @@ INSTRUCTION COVEREDRATIO - 0.73 + 0.70 COMPLEXITY COVEREDRATIO - 0.73 + 0.70 From e5bb80dcbe0a3593f2a9e56c09b53be54490d4e5 Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 22:45:32 -0300 Subject: [PATCH 2/6] feat: Adicionando maven-checkstyle-plugin para o projeto. --- checkstyle.xml | 359 +++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 37 +++++ 2 files changed, 396 insertions(+) create mode 100644 checkstyle.xml diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..ae69ace --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f6344ba..8fcf23f 100644 --- a/pom.xml +++ b/pom.xml @@ -163,9 +163,46 @@ + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.1.1 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.1 + + + com.puppycrawl.tools + checkstyle + 8.38 + + + + checkstyle.xml + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.1 + + checkstyle.xml + + + + + spring-milestones From b1e861c2785deab5efa59547f2f00c800ad9f0ba Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 22:47:16 -0300 Subject: [PATCH 3/6] refactor: Refatoreado para o checklist de FileTabCharacter. --- mvnw.cmd | 12 +- .../SomeJava8ExamplesApplication.java | 6 +- .../somejava8examples/commons/BaseEntity.java | 4 +- .../commons/CommonsService.java | 22 +- .../commons/entities/Developer.java | 94 ++++---- .../commons/entities/Person.java | 90 +++---- .../commons/entities/Staff.java | 92 +++---- .../commons/entities/StaffPublic.java | 118 ++++----- .../commons/service/MobileService.java | 32 +-- .../comparator/SortWithLambdaService.java | 92 +++---- .../comparator/SortWithoutLambdaService.java | 82 +++---- .../foreach/ForEachService.java | 152 ++++++------ .../streams/StreamsFilterService.java | 226 +++++++++--------- .../SomeJava8ExamplesApplicationTest.java | 40 ++-- .../commons/entities/HostingTest.java | 118 ++++----- .../commons/entities/Mobile2Test.java | 166 ++++++------- .../commons/entities/MobileTest.java | 166 ++++++------- .../commons/entities/StaffPublicTest.java | 124 +++++----- .../commons/entities/StaffTest.java | 138 +++++------ .../commons/service/MobileServiceTest.java | 74 +++--- .../comparator/ComparatorTests.java | 80 +++---- .../foreach/ForEachTests.java | 34 +-- .../stream/StreamCollectorsGroupingTest.java | 44 ++-- .../stream/StreamsFilterMapsTest.java | 44 ++-- .../stream/StreamsFilterTest.java | 64 ++--- 25 files changed, 1057 insertions(+), 1057 deletions(-) diff --git a/mvnw.cmd b/mvnw.cmd index 84d60ab..d2175f8 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -142,12 +142,12 @@ if exist %WRAPPER_JAR% ( ) powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" if "%MVNW_VERBOSE%" == "true" ( echo Finished downloading %WRAPPER_JAR% ) diff --git a/src/main/java/br/com/somejava8examples/SomeJava8ExamplesApplication.java b/src/main/java/br/com/somejava8examples/SomeJava8ExamplesApplication.java index 185d4d3..572bfd0 100644 --- a/src/main/java/br/com/somejava8examples/SomeJava8ExamplesApplication.java +++ b/src/main/java/br/com/somejava8examples/SomeJava8ExamplesApplication.java @@ -6,8 +6,8 @@ @SpringBootApplication public class SomeJava8ExamplesApplication { - public static void main(String[] args) { - SpringApplication.run(SomeJava8ExamplesApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SomeJava8ExamplesApplication.class, args); + } } diff --git a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java index 954f945..041db56 100644 --- a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java +++ b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java @@ -4,7 +4,7 @@ * Entidade básica. */ public interface BaseEntity { - - String toString(); + + String toString(); } diff --git a/src/main/java/br/com/somejava8examples/commons/CommonsService.java b/src/main/java/br/com/somejava8examples/commons/CommonsService.java index e681396..ba06cac 100644 --- a/src/main/java/br/com/somejava8examples/commons/CommonsService.java +++ b/src/main/java/br/com/somejava8examples/commons/CommonsService.java @@ -4,18 +4,18 @@ public abstract class CommonsService { - protected void beforePrint(List list) { - System.out.println("Before..."); - print(list); - } + protected void beforePrint(List list) { + System.out.println("Before..."); + print(list); + } - protected void afterPrint(List list) { - System.out.println("After..."); - print(list); - } + protected void afterPrint(List list) { + System.out.println("After..."); + print(list); + } - protected void print(List list) { - list.forEach(item -> System.out.println(item)); - } + protected void print(List list) { + list.forEach(item -> System.out.println(item)); + } } diff --git a/src/main/java/br/com/somejava8examples/commons/entities/Developer.java b/src/main/java/br/com/somejava8examples/commons/entities/Developer.java index db78ced..9782d12 100644 --- a/src/main/java/br/com/somejava8examples/commons/entities/Developer.java +++ b/src/main/java/br/com/somejava8examples/commons/entities/Developer.java @@ -7,62 +7,62 @@ public class Developer implements BaseEntity { - private String name; - private BigDecimal salary; - private Integer age; + private String name; + private BigDecimal salary; + private Integer age; - public Developer(String name, BigDecimal salary, Integer age) { - this.name = name; - this.salary = salary; - this.age = age; - } + public Developer(String name, BigDecimal salary, Integer age) { + this.name = name; + this.salary = salary; + this.age = age; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public BigDecimal getSalary() { - return salary; - } + public BigDecimal getSalary() { + return salary; + } - public void setSalary(BigDecimal salary) { - this.salary = salary; - } + public void setSalary(BigDecimal salary) { + this.salary = salary; + } - public Integer getAge() { - return age; - } + public Integer getAge() { + return age; + } - public void setAge(Integer age) { - this.age = age; - } + public void setAge(Integer age) { + this.age = age; + } - @Override - public int hashCode() { - return Objects.hash(age, name, salary); - } + @Override + public int hashCode() { + return Objects.hash(age, name, salary); + } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Developer)) { - return false; - } - Developer other = (Developer) obj; - return Objects.equals(age, other.age) && Objects.equals(name, other.name) - && Objects.equals(salary, other.salary); - } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof Developer)) { + return false; + } + Developer other = (Developer) obj; + return Objects.equals(age, other.age) && Objects.equals(name, other.name) + && Objects.equals(salary, other.salary); + } - @Override - public String toString() { - return "Developer [" + (name != null ? "name=" + name + ", " : "") - + (salary != null ? "salary=" + salary + ", " : "") + (age != null ? "age=" + age : "") + "]"; - } + @Override + public String toString() { + return "Developer [" + (name != null ? "name=" + name + ", " : "") + + (salary != null ? "salary=" + salary + ", " : "") + (age != null ? "age=" + age : "") + "]"; + } } diff --git a/src/main/java/br/com/somejava8examples/commons/entities/Person.java b/src/main/java/br/com/somejava8examples/commons/entities/Person.java index bfcda24..d6622e1 100644 --- a/src/main/java/br/com/somejava8examples/commons/entities/Person.java +++ b/src/main/java/br/com/somejava8examples/commons/entities/Person.java @@ -6,50 +6,50 @@ public class Person implements BaseEntity { - private String name; - private int age; - - public Person(String name, int age) { - this.name = name; - this.age = age; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - @Override - public int hashCode() { - return Objects.hash(age, name); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Person)) { - return false; - } - Person other = (Person) obj; - return age == other.age && Objects.equals(name, other.name); - } - - @Override - public String toString() { - return "Person [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + "]"; - } + private String name; + private int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + @Override + public int hashCode() { + return Objects.hash(age, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof Person)) { + return false; + } + Person other = (Person) obj; + return age == other.age && Objects.equals(name, other.name); + } + + @Override + public String toString() { + return "Person [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + "]"; + } } diff --git a/src/main/java/br/com/somejava8examples/commons/entities/Staff.java b/src/main/java/br/com/somejava8examples/commons/entities/Staff.java index d9c052a..b5e48a1 100644 --- a/src/main/java/br/com/somejava8examples/commons/entities/Staff.java +++ b/src/main/java/br/com/somejava8examples/commons/entities/Staff.java @@ -7,61 +7,61 @@ public class Staff implements BaseEntity { - private String name; - private int age; - private BigDecimal salary; + private String name; + private int age; + private BigDecimal salary; - public Staff(String name, int age, BigDecimal salary) { - this.name = name; - this.age = age; - this.salary = salary; - } + public Staff(String name, int age, BigDecimal salary) { + this.name = name; + this.age = age; + this.salary = salary; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public int getAge() { - return age; - } + public int getAge() { + return age; + } - public void setAge(int age) { - this.age = age; - } + public void setAge(int age) { + this.age = age; + } - public BigDecimal getSalary() { - return salary; - } + public BigDecimal getSalary() { + return salary; + } - public void setSalary(BigDecimal salary) { - this.salary = salary; - } + public void setSalary(BigDecimal salary) { + this.salary = salary; + } - @Override - public int hashCode() { - return Objects.hash(age, name, salary); - } + @Override + public int hashCode() { + return Objects.hash(age, name, salary); + } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Staff)) { - return false; - } - Staff other = (Staff) obj; - return age == other.age && Objects.equals(name, other.name) && Objects.equals(salary, other.salary); - } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof Staff)) { + return false; + } + Staff other = (Staff) obj; + return age == other.age && Objects.equals(name, other.name) && Objects.equals(salary, other.salary); + } - @Override - public String toString() { - return "Staff [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + ", " - + (salary != null ? "salary=" + salary : "") + "]"; - } + @Override + public String toString() { + return "Staff [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + ", " + + (salary != null ? "salary=" + salary : "") + "]"; + } } diff --git a/src/main/java/br/com/somejava8examples/commons/entities/StaffPublic.java b/src/main/java/br/com/somejava8examples/commons/entities/StaffPublic.java index 20ce1ee..6c76d93 100644 --- a/src/main/java/br/com/somejava8examples/commons/entities/StaffPublic.java +++ b/src/main/java/br/com/somejava8examples/commons/entities/StaffPublic.java @@ -6,64 +6,64 @@ public class StaffPublic implements BaseEntity { - private String name; - private int age; - private String extra; - - public StaffPublic() { - } - - public StaffPublic(String name, int age, String extra) { - this.name = name; - this.age = age; - this.extra = extra; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } - - @Override - public int hashCode() { - return Objects.hash(age, extra, name); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof StaffPublic)) { - return false; - } - StaffPublic other = (StaffPublic) obj; - return age == other.age && Objects.equals(extra, other.extra) && Objects.equals(name, other.name); - } - - @Override - public String toString() { - return "StaffPublic [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + ", " - + (extra != null ? "extra=" + extra : "") + "]"; - } + private String name; + private int age; + private String extra; + + public StaffPublic() { + } + + public StaffPublic(String name, int age, String extra) { + this.name = name; + this.age = age; + this.extra = extra; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } + + @Override + public int hashCode() { + return Objects.hash(age, extra, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof StaffPublic)) { + return false; + } + StaffPublic other = (StaffPublic) obj; + return age == other.age && Objects.equals(extra, other.extra) && Objects.equals(name, other.name); + } + + @Override + public String toString() { + return "StaffPublic [" + (name != null ? "name=" + name + ", " : "") + "age=" + age + ", " + + (extra != null ? "extra=" + extra : "") + "]"; + } } diff --git a/src/main/java/br/com/somejava8examples/commons/service/MobileService.java b/src/main/java/br/com/somejava8examples/commons/service/MobileService.java index 64c98ea..b4146a5 100644 --- a/src/main/java/br/com/somejava8examples/commons/service/MobileService.java +++ b/src/main/java/br/com/somejava8examples/commons/service/MobileService.java @@ -13,22 +13,22 @@ @Service public class MobileService { - public int getMobileScreenWidth(Mobile mobile) { - if (mobile != null) { - DisplayFeatures dfeatures = mobile.getDisplayFeatures(); - if (dfeatures != null) { - ScreenResolution resolution = dfeatures.getResolution(); - if (resolution != null) { - return resolution.getWidth(); - } - } - } - return 0; - } + public int getMobileScreenWidth(Mobile mobile) { + if (mobile != null) { + DisplayFeatures dfeatures = mobile.getDisplayFeatures(); + if (dfeatures != null) { + ScreenResolution resolution = dfeatures.getResolution(); + if (resolution != null) { + return resolution.getWidth(); + } + } + } + return 0; + } - public Integer getMobileScreenWidth(Optional mobile) { - return mobile.flatMap(Mobile2::getDisplayFeatures2).flatMap(DisplayFeatures2::getResolution) - .map(ScreenResolution::getWidth).orElse(0); - } + public Integer getMobileScreenWidth(Optional mobile) { + return mobile.flatMap(Mobile2::getDisplayFeatures2).flatMap(DisplayFeatures2::getResolution) + .map(ScreenResolution::getWidth).orElse(0); + } } diff --git a/src/main/java/br/com/somejava8examples/comparator/SortWithLambdaService.java b/src/main/java/br/com/somejava8examples/comparator/SortWithLambdaService.java index 8f7d2d4..65fa918 100644 --- a/src/main/java/br/com/somejava8examples/comparator/SortWithLambdaService.java +++ b/src/main/java/br/com/somejava8examples/comparator/SortWithLambdaService.java @@ -13,51 +13,51 @@ @Service public class SortWithLambdaService extends CommonsService { - public List sortByAge(List list) { - System.out.println("\nSort with Lambda by age:"); - return sort(list, (Developer o1, Developer o2) -> o1.getAge().compareTo(o2.getAge())); - } - - public List sortByName(List list) { - System.out.println("\nSort with Lambda by name:"); - return sort(list, (o1, o2) -> o1.getName().compareTo(o2.getName())); - } - - public List sortBySalary(List list) { - System.out.println("\nSort with Lambda by salary:"); - return sort(list, (o1, o2) -> o1.getSalary().compareTo(o2.getSalary())); - } - - private List sort(List list, Comparator comparator) { - beforePrint(list); - list.sort(comparator); - afterPrint(list); - return list; - } - - public List sortByAgeReversed(List list) { - System.out.println("\nSort reversed with Lambda by age:"); - return sortReversed(list, (Developer o1, Developer o2) -> o1.getAge().compareTo(o2.getAge())); - } - - private List sortReversed(List list, Comparator comparator) { - beforePrint(list); - list.sort(comparator.reversed()); - afterPrint(list); - return list; - } - - public List getDevelopers() { - - List result = new ArrayList(); - - result.add(new Developer("Daniel", new BigDecimal("80000"), 38)); - result.add(new Developer("Alvin", new BigDecimal("50000"), 23)); - result.add(new Developer("Jason", new BigDecimal("130000"), 42)); - result.add(new Developer("Iris", new BigDecimal("125000"), 51)); - - return result; - - } + public List sortByAge(List list) { + System.out.println("\nSort with Lambda by age:"); + return sort(list, (Developer o1, Developer o2) -> o1.getAge().compareTo(o2.getAge())); + } + + public List sortByName(List list) { + System.out.println("\nSort with Lambda by name:"); + return sort(list, (o1, o2) -> o1.getName().compareTo(o2.getName())); + } + + public List sortBySalary(List list) { + System.out.println("\nSort with Lambda by salary:"); + return sort(list, (o1, o2) -> o1.getSalary().compareTo(o2.getSalary())); + } + + private List sort(List list, Comparator comparator) { + beforePrint(list); + list.sort(comparator); + afterPrint(list); + return list; + } + + public List sortByAgeReversed(List list) { + System.out.println("\nSort reversed with Lambda by age:"); + return sortReversed(list, (Developer o1, Developer o2) -> o1.getAge().compareTo(o2.getAge())); + } + + private List sortReversed(List list, Comparator comparator) { + beforePrint(list); + list.sort(comparator.reversed()); + afterPrint(list); + return list; + } + + public List getDevelopers() { + + List result = new ArrayList(); + + result.add(new Developer("Daniel", new BigDecimal("80000"), 38)); + result.add(new Developer("Alvin", new BigDecimal("50000"), 23)); + result.add(new Developer("Jason", new BigDecimal("130000"), 42)); + result.add(new Developer("Iris", new BigDecimal("125000"), 51)); + + return result; + + } } diff --git a/src/main/java/br/com/somejava8examples/comparator/SortWithoutLambdaService.java b/src/main/java/br/com/somejava8examples/comparator/SortWithoutLambdaService.java index bb48a6d..5efaa47 100644 --- a/src/main/java/br/com/somejava8examples/comparator/SortWithoutLambdaService.java +++ b/src/main/java/br/com/somejava8examples/comparator/SortWithoutLambdaService.java @@ -14,54 +14,54 @@ @Service public class SortWithoutLambdaService extends CommonsService { - public List sortByAge(List list) { - System.out.println("\nSort by age:"); - return sort(list, new Comparator() { - @Override - public int compare(Developer o1, Developer o2) { - return o1.getAge().compareTo(o2.getAge()); - } - }); - } + public List sortByAge(List list) { + System.out.println("\nSort by age:"); + return sort(list, new Comparator() { + @Override + public int compare(Developer o1, Developer o2) { + return o1.getAge().compareTo(o2.getAge()); + } + }); + } - public List sortByName(List list) { - System.out.println("\nSort by name:"); - return sort(list, new Comparator() { - @Override - public int compare(Developer o1, Developer o2) { - return o1.getName().compareTo(o2.getName()); - } - }); - } + public List sortByName(List list) { + System.out.println("\nSort by name:"); + return sort(list, new Comparator() { + @Override + public int compare(Developer o1, Developer o2) { + return o1.getName().compareTo(o2.getName()); + } + }); + } - public List sortBySalary(List list) { - System.out.println("\nSort by salary:"); - return sort(list, new Comparator() { - @Override - public int compare(Developer o1, Developer o2) { - return o1.getSalary().compareTo(o2.getSalary()); - } - }); - } + public List sortBySalary(List list) { + System.out.println("\nSort by salary:"); + return sort(list, new Comparator() { + @Override + public int compare(Developer o1, Developer o2) { + return o1.getSalary().compareTo(o2.getSalary()); + } + }); + } - private List sort(List list, Comparator comparator) { - beforePrint(list); - Collections.sort(list, comparator); - afterPrint(list); - return list; - } + private List sort(List list, Comparator comparator) { + beforePrint(list); + Collections.sort(list, comparator); + afterPrint(list); + return list; + } - public List getDevelopers() { + public List getDevelopers() { - List result = new ArrayList(); + List result = new ArrayList(); - result.add(new Developer("Daniel", new BigDecimal("80000"), 38)); - result.add(new Developer("Alvin", new BigDecimal("50000"), 23)); - result.add(new Developer("Jason", new BigDecimal("130000"), 42)); - result.add(new Developer("Iris", new BigDecimal("125000"), 51)); + result.add(new Developer("Daniel", new BigDecimal("80000"), 38)); + result.add(new Developer("Alvin", new BigDecimal("50000"), 23)); + result.add(new Developer("Jason", new BigDecimal("130000"), 42)); + result.add(new Developer("Iris", new BigDecimal("125000"), 51)); - return result; + return result; - } + } } diff --git a/src/main/java/br/com/somejava8examples/foreach/ForEachService.java b/src/main/java/br/com/somejava8examples/foreach/ForEachService.java index c7ee5b6..6f8b09b 100644 --- a/src/main/java/br/com/somejava8examples/foreach/ForEachService.java +++ b/src/main/java/br/com/somejava8examples/foreach/ForEachService.java @@ -10,81 +10,81 @@ @Service public class ForEachService { - public Map normalWayToLoopMap() { - System.out.println("\nNormal way to loop a Map:"); - Map items = getItemsMap(); - - for (Map.Entry entry : items.entrySet()) { - System.out.println("Item : " + entry.getKey() + " Count : " + entry.getValue()); - } - - return items; - } - - public Map normalWayToLoopMapLambdaExpression() { - System.out.println("\nNormal way to loop a Map with Lambda Expression:"); - Map items = getItemsMap(); - - items.forEach((k, v) -> System.out.println("Item : " + k + " Count : " + v)); - - items.forEach((k, v) -> { - System.out.println("Item : " + k + " Count : " + v); - if ("E".equals(k)) { - System.out.println(String.format("Hello %s - %d", k, v)); - } - }); - - return items; - } - - public List forEachAndList() { - System.out.println("\nNormal for-loop to loop a List:"); - List items = getItemsList(); - - for (String item : items) { - System.out.println(item); - } - - items = getItemsList(); - - System.out.println("\nLambda - Output : A,B,C,D,E:"); - items.forEach(item -> System.out.println(item)); - - System.out.println("\nOutput: C"); - items.forEach(item -> { - if ("C".equals(item)) { - System.out.println(item); - } - }); - - System.out.println("\nMethod reference - Output : A,B,C,D,E:"); - items.forEach(System.out::println); - - System.out.println("\nStream and filter - Output : B:"); - items.stream().filter(s -> s.contains("B")).forEach(System.out::println); - - return items; - } - - private Map getItemsMap() { - Map items = new HashMap<>(); - items.put("A", 10); - items.put("B", 20); - items.put("C", 30); - items.put("D", 40); - items.put("E", 50); - items.put("F", 60); - return items; - } - - private List getItemsList() { - List items = new ArrayList<>(); - items.add("A"); - items.add("B"); - items.add("C"); - items.add("D"); - items.add("E"); - return items; - } + public Map normalWayToLoopMap() { + System.out.println("\nNormal way to loop a Map:"); + Map items = getItemsMap(); + + for (Map.Entry entry : items.entrySet()) { + System.out.println("Item : " + entry.getKey() + " Count : " + entry.getValue()); + } + + return items; + } + + public Map normalWayToLoopMapLambdaExpression() { + System.out.println("\nNormal way to loop a Map with Lambda Expression:"); + Map items = getItemsMap(); + + items.forEach((k, v) -> System.out.println("Item : " + k + " Count : " + v)); + + items.forEach((k, v) -> { + System.out.println("Item : " + k + " Count : " + v); + if ("E".equals(k)) { + System.out.println(String.format("Hello %s - %d", k, v)); + } + }); + + return items; + } + + public List forEachAndList() { + System.out.println("\nNormal for-loop to loop a List:"); + List items = getItemsList(); + + for (String item : items) { + System.out.println(item); + } + + items = getItemsList(); + + System.out.println("\nLambda - Output : A,B,C,D,E:"); + items.forEach(item -> System.out.println(item)); + + System.out.println("\nOutput: C"); + items.forEach(item -> { + if ("C".equals(item)) { + System.out.println(item); + } + }); + + System.out.println("\nMethod reference - Output : A,B,C,D,E:"); + items.forEach(System.out::println); + + System.out.println("\nStream and filter - Output : B:"); + items.stream().filter(s -> s.contains("B")).forEach(System.out::println); + + return items; + } + + private Map getItemsMap() { + Map items = new HashMap<>(); + items.put("A", 10); + items.put("B", 20); + items.put("C", 30); + items.put("D", 40); + items.put("E", 50); + items.put("F", 60); + return items; + } + + private List getItemsList() { + List items = new ArrayList<>(); + items.add("A"); + items.add("B"); + items.add("C"); + items.add("D"); + items.add("E"); + return items; + } } diff --git a/src/main/java/br/com/somejava8examples/streams/StreamsFilterService.java b/src/main/java/br/com/somejava8examples/streams/StreamsFilterService.java index e2de5e4..01bbd1c 100644 --- a/src/main/java/br/com/somejava8examples/streams/StreamsFilterService.java +++ b/src/main/java/br/com/somejava8examples/streams/StreamsFilterService.java @@ -12,118 +12,118 @@ @Service public class StreamsFilterService { - private static final String AHMOOK = "ahmook"; - private static final String JACK = "jack"; - private static final String LAWRENCE = "lawrence"; - private static final String SPRING = "spring"; - private static final String NODE = "node"; - private static final String DANIEL = "daniel"; - - public List streamsFilterAndCollectBeforeJava8() { - System.out.println("\nstreamsFilterAndCollectBeforeJava8:"); - List lines = Arrays.asList(SPRING, NODE, DANIEL); - List result = getFilterOutput(lines, DANIEL); - for (String temp : result) { - System.out.println(temp); // output : spring, node - } - return result; - } - - public List streamsFilterAndCollectNowJava8() { - System.out.println("\nstreamsFilterAndCollectNowJava8:"); - List lines = Arrays.asList(SPRING, NODE, DANIEL); - List result = lines.stream() // convert list to stream - .filter(line -> !DANIEL.equals(line)) // we dont like daniel - .collect(Collectors.toList()); // collect the output and convert streams to a List - - result.forEach(System.out::println); // output : spring, node - return result; - } - - private List getFilterOutput(List lines, String filter) { - List result = new ArrayList<>(); - for (String line : lines) { - if (!DANIEL.equals(line)) { - result.add(line); - } - } - return result; - } - - public Person getPersonByNameLikeThisBeforeJava8() { - System.out.println("\ngetPersonByNameLikeThisBeforeJava8:"); - List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); - Person result = getStudentByName(persons, JACK); - System.out.println(result); - return result; - } - - public Person getPersonByNameLikeThisAfterJava8() { - System.out.println("\ngetPersonByNameLikeThisAfterJava8:"); - List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); - - Person result1 = persons.stream() // Convert to steam - .filter(x -> JACK.equals(x.getName())) // we want "jack" only - .findAny() // If 'findAny' then return found - .orElse(null); // If not found, return null - - System.out.println("\nfilter(x -> JACK.equals(x.getName())):"); - System.out.println(result1); - - Person result2 = persons.stream().filter(x -> AHMOOK.equals(x.getName())).findAny().orElse(null); - - System.out.println("\nfilter(x -> AHMOOK.equals(x.getName())):"); - System.out.println(result2); - - return result2; - } - - public Person getPersonByNameLikeThisJava8ForMultipleCondition() { - System.out.println("\ngetPersonByNameLikeThisJava8ForMultipleCondition:"); - List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); - - Person result1 = persons.stream().filter((p) -> JACK.equals(p.getName()) && 20 == p.getAge()).findAny() - .orElse(null); - - System.out.println("result 1 :" + result1); - - // or like this - Person result2 = persons.stream().filter(p -> { - if (JACK.equals(p.getName()) && 20 == p.getAge()) { - return true; - } - return false; - }).findAny().orElse(null); - - System.out.println("result 2 :" + result2); - - return result2; - } - - private Person getStudentByName(List persons, String name) { - Person result = null; - for (Person temp : persons) { - if (name.equals(temp.getName())) { - result = temp; - } - } - return result; - } - - public List getStreamsFilterAndMap() { - System.out.println("\ngetStreamsFilterAndMap:"); - List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); - - String name = persons.stream().filter(x -> JACK.equals(x.getName())).map(Person::getName) // convert stream to - .findAny().orElse(""); - - System.out.println("name : " + name); - - List collect = persons.stream().map(Person::getName).collect(Collectors.toList()); - - collect.forEach(System.out::println); - - return collect; - } + private static final String AHMOOK = "ahmook"; + private static final String JACK = "jack"; + private static final String LAWRENCE = "lawrence"; + private static final String SPRING = "spring"; + private static final String NODE = "node"; + private static final String DANIEL = "daniel"; + + public List streamsFilterAndCollectBeforeJava8() { + System.out.println("\nstreamsFilterAndCollectBeforeJava8:"); + List lines = Arrays.asList(SPRING, NODE, DANIEL); + List result = getFilterOutput(lines, DANIEL); + for (String temp : result) { + System.out.println(temp); // output : spring, node + } + return result; + } + + public List streamsFilterAndCollectNowJava8() { + System.out.println("\nstreamsFilterAndCollectNowJava8:"); + List lines = Arrays.asList(SPRING, NODE, DANIEL); + List result = lines.stream() // convert list to stream + .filter(line -> !DANIEL.equals(line)) // we dont like daniel + .collect(Collectors.toList()); // collect the output and convert streams to a List + + result.forEach(System.out::println); // output : spring, node + return result; + } + + private List getFilterOutput(List lines, String filter) { + List result = new ArrayList<>(); + for (String line : lines) { + if (!DANIEL.equals(line)) { + result.add(line); + } + } + return result; + } + + public Person getPersonByNameLikeThisBeforeJava8() { + System.out.println("\ngetPersonByNameLikeThisBeforeJava8:"); + List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); + Person result = getStudentByName(persons, JACK); + System.out.println(result); + return result; + } + + public Person getPersonByNameLikeThisAfterJava8() { + System.out.println("\ngetPersonByNameLikeThisAfterJava8:"); + List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); + + Person result1 = persons.stream() // Convert to steam + .filter(x -> JACK.equals(x.getName())) // we want "jack" only + .findAny() // If 'findAny' then return found + .orElse(null); // If not found, return null + + System.out.println("\nfilter(x -> JACK.equals(x.getName())):"); + System.out.println(result1); + + Person result2 = persons.stream().filter(x -> AHMOOK.equals(x.getName())).findAny().orElse(null); + + System.out.println("\nfilter(x -> AHMOOK.equals(x.getName())):"); + System.out.println(result2); + + return result2; + } + + public Person getPersonByNameLikeThisJava8ForMultipleCondition() { + System.out.println("\ngetPersonByNameLikeThisJava8ForMultipleCondition:"); + List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); + + Person result1 = persons.stream().filter((p) -> JACK.equals(p.getName()) && 20 == p.getAge()).findAny() + .orElse(null); + + System.out.println("result 1 :" + result1); + + // or like this + Person result2 = persons.stream().filter(p -> { + if (JACK.equals(p.getName()) && 20 == p.getAge()) { + return true; + } + return false; + }).findAny().orElse(null); + + System.out.println("result 2 :" + result2); + + return result2; + } + + private Person getStudentByName(List persons, String name) { + Person result = null; + for (Person temp : persons) { + if (name.equals(temp.getName())) { + result = temp; + } + } + return result; + } + + public List getStreamsFilterAndMap() { + System.out.println("\ngetStreamsFilterAndMap:"); + List persons = Arrays.asList(new Person(DANIEL, 30), new Person(JACK, 20), new Person(LAWRENCE, 40)); + + String name = persons.stream().filter(x -> JACK.equals(x.getName())).map(Person::getName) // convert stream to + .findAny().orElse(""); + + System.out.println("name : " + name); + + List collect = persons.stream().map(Person::getName).collect(Collectors.toList()); + + collect.forEach(System.out::println); + + return collect; + } } diff --git a/src/test/java/br/com/somejava8examples/SomeJava8ExamplesApplicationTest.java b/src/test/java/br/com/somejava8examples/SomeJava8ExamplesApplicationTest.java index a3e4db3..03f2e1a 100644 --- a/src/test/java/br/com/somejava8examples/SomeJava8ExamplesApplicationTest.java +++ b/src/test/java/br/com/somejava8examples/SomeJava8ExamplesApplicationTest.java @@ -12,25 +12,25 @@ @ActiveProfiles("test") class SomeJava8ExamplesApplicationTest { - @BeforeAll - static void setUpBeforeClass() throws Exception { - } - - @AfterAll - static void tearDownAfterClass() throws Exception { - } - - @BeforeEach - void setUp() throws Exception { - } - - @AfterEach - void tearDown() throws Exception { - } - - @Test - void testMain() { - SomeJava8ExamplesApplication.main(new String[] {}); - } + @BeforeAll + static void setUpBeforeClass() throws Exception { + } + + @AfterAll + static void tearDownAfterClass() throws Exception { + } + + @BeforeEach + void setUp() throws Exception { + } + + @AfterEach + void tearDown() throws Exception { + } + + @Test + void testMain() { + SomeJava8ExamplesApplication.main(new String[] {}); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/entities/HostingTest.java b/src/test/java/br/com/somejava8examples/commons/entities/HostingTest.java index 4116d0c..05477ef 100644 --- a/src/test/java/br/com/somejava8examples/commons/entities/HostingTest.java +++ b/src/test/java/br/com/somejava8examples/commons/entities/HostingTest.java @@ -12,74 +12,74 @@ @ActiveProfiles("test") class HostingTest { - private Hosting hosting; - - @BeforeEach - void setUp() throws Exception { - hosting = new Hosting(12, "NAME", 23323L); - } + private Hosting hosting; + + @BeforeEach + void setUp() throws Exception { + hosting = new Hosting(12, "NAME", 23323L); + } - @Test - void testHashCode() { - assertNotNull(hosting.hashCode()); - } + @Test + void testHashCode() { + assertNotNull(hosting.hashCode()); + } - @Test - void testHosting() { - assertNotNull(new Hosting(44, "LASKÇDLSAK", 888L)); - } + @Test + void testHosting() { + assertNotNull(new Hosting(44, "LASKÇDLSAK", 888L)); + } - @Test - void testGetId() { - assertNotNull(hosting.getId()); - } + @Test + void testGetId() { + assertNotNull(hosting.getId()); + } - @Test - void testSetId() { - hosting.setId(7938); - assertNotNull(hosting.getId()); - } + @Test + void testSetId() { + hosting.setId(7938); + assertNotNull(hosting.getId()); + } - @Test - void testGetName() { - assertNotNull(hosting.getName()); - } + @Test + void testGetName() { + assertNotNull(hosting.getName()); + } - @Test - void testSetName() { - hosting.setName("KKKJSJJS"); - assertNotNull(hosting.getName()); - } + @Test + void testSetName() { + hosting.setName("KKKJSJJS"); + assertNotNull(hosting.getName()); + } - @Test - void testGetWebsites() { - assertNotNull(hosting.getWebsites()); - } + @Test + void testGetWebsites() { + assertNotNull(hosting.getWebsites()); + } - @Test - void testSetWebsites() { - hosting.setWebsites(9999L); - assertNotNull(hosting.getWebsites()); - } + @Test + void testSetWebsites() { + hosting.setWebsites(9999L); + assertNotNull(hosting.getWebsites()); + } - @Test - void testEqualsObject() { - assertTrue(!hosting.equals(null)); - } - - @Test - void testEqualsNewObject() { - assertTrue(!hosting.equals(new Object())); - } - - @Test - void testEqualsNew() { - assertTrue(!hosting.equals(new Hosting(33, "OOOI", 22299L))); - } + @Test + void testEqualsObject() { + assertTrue(!hosting.equals(null)); + } + + @Test + void testEqualsNewObject() { + assertTrue(!hosting.equals(new Object())); + } + + @Test + void testEqualsNew() { + assertTrue(!hosting.equals(new Hosting(33, "OOOI", 22299L))); + } - @Test - void testToString() { - assertNotNull(hosting.toString()); - } + @Test + void testToString() { + assertNotNull(hosting.toString()); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/entities/Mobile2Test.java b/src/test/java/br/com/somejava8examples/commons/entities/Mobile2Test.java index 4eb2520..970c768 100644 --- a/src/test/java/br/com/somejava8examples/commons/entities/Mobile2Test.java +++ b/src/test/java/br/com/somejava8examples/commons/entities/Mobile2Test.java @@ -14,88 +14,88 @@ @ActiveProfiles("test") class Mobile2Test { - private Mobile2 mobile2; - - @BeforeEach - void setUp() throws Exception { - mobile2 = new Mobile2(); - mobile2.setBrand("ASLJDK"); - mobile2.setId(133L); - mobile2.setName("ASLKDJLASJD"); - mobile2.setDisplayFeatures2(Optional.empty()); - } - - @Test - void testHashCode() { - assertNotNull(mobile2.hashCode()); - } - - @Test - void testGetId() { - assertNotNull(mobile2.getId()); - } - - @Test - void testSetId() { - mobile2.setId(3332L); - assertNotNull(mobile2.getId()); - } - - @Test - void testGetBrand() { - assertNotNull(mobile2.getBrand()); - } - - @Test - void testSetBrand() { - mobile2.setBrand("HHH#%@LKJ"); - assertNotNull(mobile2.getBrand()); - } - - @Test - void testGetName() { - assertNotNull(mobile2.getName()); - } - - @Test - void testSetName() { - mobile2.setName("ALSKHDASKLJD"); - assertNotNull(mobile2.getName()); - } - - @Test - void testGetDisplayFeatures2() { - assertNotNull(mobile2.getDisplayFeatures2()); - } - - @Test - void testSetDisplayFeatures2() { - mobile2.setDisplayFeatures2(Optional.of(new DisplayFeatures2())); - assertNotNull(mobile2.getDisplayFeatures2()); - } - - @Test - void testEqualsObject() { - assertTrue(!mobile2.equals(null)); - } - - @Test - void testEqualsNewObject() { - assertTrue(!mobile2.equals(new Object())); - } - - @Test - void testEqualsMobile2() { - Mobile2 mobileNew = new Mobile2(); - mobileNew.setBrand("ASLJDDDDDK"); - mobileNew.setId(13344L); - mobileNew.setName("AXXXXDJLASJD"); - assertTrue(!mobile2.equals(mobileNew)); - } - - @Test - void testToString() { - assertNotNull(mobile2.toString()); - } + private Mobile2 mobile2; + + @BeforeEach + void setUp() throws Exception { + mobile2 = new Mobile2(); + mobile2.setBrand("ASLJDK"); + mobile2.setId(133L); + mobile2.setName("ASLKDJLASJD"); + mobile2.setDisplayFeatures2(Optional.empty()); + } + + @Test + void testHashCode() { + assertNotNull(mobile2.hashCode()); + } + + @Test + void testGetId() { + assertNotNull(mobile2.getId()); + } + + @Test + void testSetId() { + mobile2.setId(3332L); + assertNotNull(mobile2.getId()); + } + + @Test + void testGetBrand() { + assertNotNull(mobile2.getBrand()); + } + + @Test + void testSetBrand() { + mobile2.setBrand("HHH#%@LKJ"); + assertNotNull(mobile2.getBrand()); + } + + @Test + void testGetName() { + assertNotNull(mobile2.getName()); + } + + @Test + void testSetName() { + mobile2.setName("ALSKHDASKLJD"); + assertNotNull(mobile2.getName()); + } + + @Test + void testGetDisplayFeatures2() { + assertNotNull(mobile2.getDisplayFeatures2()); + } + + @Test + void testSetDisplayFeatures2() { + mobile2.setDisplayFeatures2(Optional.of(new DisplayFeatures2())); + assertNotNull(mobile2.getDisplayFeatures2()); + } + + @Test + void testEqualsObject() { + assertTrue(!mobile2.equals(null)); + } + + @Test + void testEqualsNewObject() { + assertTrue(!mobile2.equals(new Object())); + } + + @Test + void testEqualsMobile2() { + Mobile2 mobileNew = new Mobile2(); + mobileNew.setBrand("ASLJDDDDDK"); + mobileNew.setId(13344L); + mobileNew.setName("AXXXXDJLASJD"); + assertTrue(!mobile2.equals(mobileNew)); + } + + @Test + void testToString() { + assertNotNull(mobile2.toString()); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/entities/MobileTest.java b/src/test/java/br/com/somejava8examples/commons/entities/MobileTest.java index ef77a2e..1696148 100644 --- a/src/test/java/br/com/somejava8examples/commons/entities/MobileTest.java +++ b/src/test/java/br/com/somejava8examples/commons/entities/MobileTest.java @@ -12,88 +12,88 @@ @ActiveProfiles("test") class MobileTest { - private Mobile mobile2; - - @BeforeEach - void setUp() throws Exception { - mobile2 = new Mobile(); - mobile2.setBrand("ASLJDK"); - mobile2.setId(133L); - mobile2.setName("ASLKDJLASJD"); - mobile2.setDisplayFeatures(new DisplayFeatures()); - } - - @Test - void testHashCode() { - assertNotNull(mobile2.hashCode()); - } - - @Test - void testGetId() { - assertNotNull(mobile2.getId()); - } - - @Test - void testSetId() { - mobile2.setId(3332L); - assertNotNull(mobile2.getId()); - } - - @Test - void testGetBrand() { - assertNotNull(mobile2.getBrand()); - } - - @Test - void testSetBrand() { - mobile2.setBrand("HHH#%@LKJ"); - assertNotNull(mobile2.getBrand()); - } - - @Test - void testGetName() { - assertNotNull(mobile2.getName()); - } - - @Test - void testSetName() { - mobile2.setName("ALSKHDASKLJD"); - assertNotNull(mobile2.getName()); - } - - @Test - void testGetDisplayFeatures2() { - assertNotNull(mobile2.getDisplayFeatures()); - } - - @Test - void testSetDisplayFeatures2() { - mobile2.setDisplayFeatures(new DisplayFeatures()); - assertNotNull(mobile2.getDisplayFeatures()); - } - - @Test - void testEqualsObject() { - assertTrue(!mobile2.equals(null)); - } - - @Test - void testEqualsNewObject() { - assertTrue(!mobile2.equals(new Object())); - } - - @Test - void testEqualsMobile() { - Mobile mobileNew = new Mobile(); - mobileNew.setBrand("ASLJDDDDDK"); - mobileNew.setId(13344L); - mobileNew.setName("AXXXXDJLASJD"); - assertTrue(!mobile2.equals(mobileNew)); - } - - @Test - void testToString() { - assertNotNull(mobile2.toString()); - } + private Mobile mobile2; + + @BeforeEach + void setUp() throws Exception { + mobile2 = new Mobile(); + mobile2.setBrand("ASLJDK"); + mobile2.setId(133L); + mobile2.setName("ASLKDJLASJD"); + mobile2.setDisplayFeatures(new DisplayFeatures()); + } + + @Test + void testHashCode() { + assertNotNull(mobile2.hashCode()); + } + + @Test + void testGetId() { + assertNotNull(mobile2.getId()); + } + + @Test + void testSetId() { + mobile2.setId(3332L); + assertNotNull(mobile2.getId()); + } + + @Test + void testGetBrand() { + assertNotNull(mobile2.getBrand()); + } + + @Test + void testSetBrand() { + mobile2.setBrand("HHH#%@LKJ"); + assertNotNull(mobile2.getBrand()); + } + + @Test + void testGetName() { + assertNotNull(mobile2.getName()); + } + + @Test + void testSetName() { + mobile2.setName("ALSKHDASKLJD"); + assertNotNull(mobile2.getName()); + } + + @Test + void testGetDisplayFeatures2() { + assertNotNull(mobile2.getDisplayFeatures()); + } + + @Test + void testSetDisplayFeatures2() { + mobile2.setDisplayFeatures(new DisplayFeatures()); + assertNotNull(mobile2.getDisplayFeatures()); + } + + @Test + void testEqualsObject() { + assertTrue(!mobile2.equals(null)); + } + + @Test + void testEqualsNewObject() { + assertTrue(!mobile2.equals(new Object())); + } + + @Test + void testEqualsMobile() { + Mobile mobileNew = new Mobile(); + mobileNew.setBrand("ASLJDDDDDK"); + mobileNew.setId(13344L); + mobileNew.setName("AXXXXDJLASJD"); + assertTrue(!mobile2.equals(mobileNew)); + } + + @Test + void testToString() { + assertNotNull(mobile2.toString()); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/entities/StaffPublicTest.java b/src/test/java/br/com/somejava8examples/commons/entities/StaffPublicTest.java index 22e91bd..a107973 100644 --- a/src/test/java/br/com/somejava8examples/commons/entities/StaffPublicTest.java +++ b/src/test/java/br/com/somejava8examples/commons/entities/StaffPublicTest.java @@ -7,77 +7,77 @@ class StaffPublicTest { - private StaffPublic staffPublic; - - @BeforeEach - void setUp() throws Exception { - staffPublic = new StaffPublic(); - staffPublic.setAge(12); - staffPublic.setExtra("EXTRA"); - staffPublic.setName("ASHDKASJD"); - } + private StaffPublic staffPublic; + + @BeforeEach + void setUp() throws Exception { + staffPublic = new StaffPublic(); + staffPublic.setAge(12); + staffPublic.setExtra("EXTRA"); + staffPublic.setName("ASHDKASJD"); + } - @Test - void testHashCode() { - assertNotNull(staffPublic.hashCode()); - } + @Test + void testHashCode() { + assertNotNull(staffPublic.hashCode()); + } - @Test - void testStaffPublic() { - assertNotNull(new StaffPublic("NAME", 30, "EXTRA")); - } + @Test + void testStaffPublic() { + assertNotNull(new StaffPublic("NAME", 30, "EXTRA")); + } - @Test - void testGetName() { - assertNotNull(staffPublic.getName()); - } + @Test + void testGetName() { + assertNotNull(staffPublic.getName()); + } - @Test - void testSetName() { - staffPublic.setName("NAME2"); - assertNotNull(staffPublic.getName()); - } + @Test + void testSetName() { + staffPublic.setName("NAME2"); + assertNotNull(staffPublic.getName()); + } - @Test - void testGetAge() { - assertNotNull(staffPublic.getAge()); - } + @Test + void testGetAge() { + assertNotNull(staffPublic.getAge()); + } - @Test - void testSetAge() { - staffPublic.setAge(50); - assertNotNull(staffPublic.getAge()); - } + @Test + void testSetAge() { + staffPublic.setAge(50); + assertNotNull(staffPublic.getAge()); + } - @Test - void testGetExtra() { - assertNotNull(staffPublic.getExtra()); - } + @Test + void testGetExtra() { + assertNotNull(staffPublic.getExtra()); + } - @Test - void testSetExtra() { - staffPublic.setExtra("ASJKDHKASJ"); - assertNotNull(staffPublic.getExtra()); - } + @Test + void testSetExtra() { + staffPublic.setExtra("ASJKDHKASJ"); + assertNotNull(staffPublic.getExtra()); + } - @Test - void testEqualsObject() { - assertNotNull(staffPublic.equals(null)); - } - - @Test - void testEqualsNewObject() { - assertNotNull(staffPublic.equals(new Object())); - } - - @Test - void testEqualsNew() { - assertNotNull(staffPublic.equals(new StaffPublic())); - } + @Test + void testEqualsObject() { + assertNotNull(staffPublic.equals(null)); + } + + @Test + void testEqualsNewObject() { + assertNotNull(staffPublic.equals(new Object())); + } + + @Test + void testEqualsNew() { + assertNotNull(staffPublic.equals(new StaffPublic())); + } - @Test - void testToString() { - assertNotNull(staffPublic.toString()); - } + @Test + void testToString() { + assertNotNull(staffPublic.toString()); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/entities/StaffTest.java b/src/test/java/br/com/somejava8examples/commons/entities/StaffTest.java index 8eb50b0..a25b1c3 100644 --- a/src/test/java/br/com/somejava8examples/commons/entities/StaffTest.java +++ b/src/test/java/br/com/somejava8examples/commons/entities/StaffTest.java @@ -15,74 +15,74 @@ @ActiveProfiles("test") class StaffTest { - private Staff staff; - - @BeforeEach - void setUp() throws Exception { - staff = new Staff("KASHDKJS", 34, new BigDecimal(12333)); - } - - @Test - void testHashCode() { - assertNotNull(staff.hashCode()); - } - - @Test - void testStaff() { - assertNotNull(new Staff("WWWWWS", 54, new BigDecimal(3344))); - } - - @Test - void testGetName() { - assertNotNull(staff.getName()); - } - - @Test - void testSetName() { - staff.setName("JJJS"); - assertNotNull(staff.getName()); - } - - @Test - void testGetAge() { - assertNotNull(staff.getAge()); - } - - @Test - void testSetAge() { - staff.setAge(36); - assertNotNull(staff.getAge()); - } - - @Test - void testGetSalary() { - assertNotNull(staff.getSalary()); - } - - @Test - void testSetSalary() { - staff.setSalary(new BigDecimal(999)); - assertNotNull(staff.getSalary()); - } - - @Test - void testEqualsObject() { - assertTrue(!staff.equals(null)); - } - - @Test - void testEqualsNew() { - assertTrue(!staff.equals(new Staff("ASKLJD", 78, new BigDecimal(333)))); - } - - @Test - void testEqualsNewObject() { - assertTrue(!staff.equals(new Object())); - } - - @Test - void testToString() { - assertNotNull(staff.toString()); - } + private Staff staff; + + @BeforeEach + void setUp() throws Exception { + staff = new Staff("KASHDKJS", 34, new BigDecimal(12333)); + } + + @Test + void testHashCode() { + assertNotNull(staff.hashCode()); + } + + @Test + void testStaff() { + assertNotNull(new Staff("WWWWWS", 54, new BigDecimal(3344))); + } + + @Test + void testGetName() { + assertNotNull(staff.getName()); + } + + @Test + void testSetName() { + staff.setName("JJJS"); + assertNotNull(staff.getName()); + } + + @Test + void testGetAge() { + assertNotNull(staff.getAge()); + } + + @Test + void testSetAge() { + staff.setAge(36); + assertNotNull(staff.getAge()); + } + + @Test + void testGetSalary() { + assertNotNull(staff.getSalary()); + } + + @Test + void testSetSalary() { + staff.setSalary(new BigDecimal(999)); + assertNotNull(staff.getSalary()); + } + + @Test + void testEqualsObject() { + assertTrue(!staff.equals(null)); + } + + @Test + void testEqualsNew() { + assertTrue(!staff.equals(new Staff("ASKLJD", 78, new BigDecimal(333)))); + } + + @Test + void testEqualsNewObject() { + assertTrue(!staff.equals(new Object())); + } + + @Test + void testToString() { + assertNotNull(staff.toString()); + } } diff --git a/src/test/java/br/com/somejava8examples/commons/service/MobileServiceTest.java b/src/test/java/br/com/somejava8examples/commons/service/MobileServiceTest.java index 5bfe3dd..79b19a6 100644 --- a/src/test/java/br/com/somejava8examples/commons/service/MobileServiceTest.java +++ b/src/test/java/br/com/somejava8examples/commons/service/MobileServiceTest.java @@ -16,42 +16,42 @@ @ActiveProfiles("test") public class MobileServiceTest { - @Autowired - private MobileService service; - - private Mobile mobile; - - @BeforeEach - void setUp() throws Exception { - this.mobile = new Mobile(); - mobile.setId(12323L); - mobile.setBrand("ASDASD"); - mobile.setName("AKJDHASKD"); - } - - @Test - void getMobileScreenWidthDisplayFeaturesNullTest() { - assertEquals(0, service.getMobileScreenWidth(this.mobile)); - } - - @Test - void getMobileScreenWidthDisplayFeaturesScreenResolutionNullTest() { - DisplayFeatures displayFeatures = new DisplayFeatures(); - displayFeatures.setSize("123px"); - this.mobile.setDisplayFeatures(displayFeatures); - assertEquals(0, service.getMobileScreenWidth(this.mobile)); - } - - @Test - void getMobileScreenWidthDisplayFeaturesScreenResolutionTest() { - DisplayFeatures displayFeatures = new DisplayFeatures(); - displayFeatures.setSize("123px"); - ScreenResolution resolution = new ScreenResolution(); - resolution.setHeight(123); - resolution.setWidth(344); - displayFeatures.setResolution(resolution); - this.mobile.setDisplayFeatures(displayFeatures); - assertEquals(344, service.getMobileScreenWidth(this.mobile)); - } + @Autowired + private MobileService service; + + private Mobile mobile; + + @BeforeEach + void setUp() throws Exception { + this.mobile = new Mobile(); + mobile.setId(12323L); + mobile.setBrand("ASDASD"); + mobile.setName("AKJDHASKD"); + } + + @Test + void getMobileScreenWidthDisplayFeaturesNullTest() { + assertEquals(0, service.getMobileScreenWidth(this.mobile)); + } + + @Test + void getMobileScreenWidthDisplayFeaturesScreenResolutionNullTest() { + DisplayFeatures displayFeatures = new DisplayFeatures(); + displayFeatures.setSize("123px"); + this.mobile.setDisplayFeatures(displayFeatures); + assertEquals(0, service.getMobileScreenWidth(this.mobile)); + } + + @Test + void getMobileScreenWidthDisplayFeaturesScreenResolutionTest() { + DisplayFeatures displayFeatures = new DisplayFeatures(); + displayFeatures.setSize("123px"); + ScreenResolution resolution = new ScreenResolution(); + resolution.setHeight(123); + resolution.setWidth(344); + displayFeatures.setResolution(resolution); + this.mobile.setDisplayFeatures(displayFeatures); + assertEquals(344, service.getMobileScreenWidth(this.mobile)); + } } diff --git a/src/test/java/br/com/somejava8examples/comparator/ComparatorTests.java b/src/test/java/br/com/somejava8examples/comparator/ComparatorTests.java index 7e33ea0..1d957d8 100644 --- a/src/test/java/br/com/somejava8examples/comparator/ComparatorTests.java +++ b/src/test/java/br/com/somejava8examples/comparator/ComparatorTests.java @@ -11,45 +11,45 @@ @ActiveProfiles("test") public class ComparatorTests { - @Autowired - private SortWithoutLambdaService service; - - @Autowired - private SortWithLambdaService serviceWithLambda; - - @Test - public void sortAgeWithoutLambda() { - assertFalse(service.sortByAge(service.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortNameWithoutLambda() { - assertFalse(service.sortByName(service.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortSalaryWithoutLambda() { - assertFalse(service.sortBySalary(service.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortAgeWithLambda() { - assertFalse(serviceWithLambda.sortByAge(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortNameWithLambda() { - assertFalse(serviceWithLambda.sortByName(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortSalaryWithLambda() { - assertFalse(serviceWithLambda.sortBySalary(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); - } - - @Test - public void sortAgeReversedWithLambda() { - assertFalse(serviceWithLambda.sortByAgeReversed(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); - } + @Autowired + private SortWithoutLambdaService service; + + @Autowired + private SortWithLambdaService serviceWithLambda; + + @Test + public void sortAgeWithoutLambda() { + assertFalse(service.sortByAge(service.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortNameWithoutLambda() { + assertFalse(service.sortByName(service.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortSalaryWithoutLambda() { + assertFalse(service.sortBySalary(service.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortAgeWithLambda() { + assertFalse(serviceWithLambda.sortByAge(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortNameWithLambda() { + assertFalse(serviceWithLambda.sortByName(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortSalaryWithLambda() { + assertFalse(serviceWithLambda.sortBySalary(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); + } + + @Test + public void sortAgeReversedWithLambda() { + assertFalse(serviceWithLambda.sortByAgeReversed(serviceWithLambda.getDevelopers()).isEmpty(), "List is empty"); + } } diff --git a/src/test/java/br/com/somejava8examples/foreach/ForEachTests.java b/src/test/java/br/com/somejava8examples/foreach/ForEachTests.java index 8550474..344c13c 100644 --- a/src/test/java/br/com/somejava8examples/foreach/ForEachTests.java +++ b/src/test/java/br/com/somejava8examples/foreach/ForEachTests.java @@ -11,22 +11,22 @@ @ActiveProfiles("test") public class ForEachTests { - @Autowired - private ForEachService service; - - @Test - public void normalWayToLoopMapTest() { - assertFalse(service.normalWayToLoopMap().isEmpty(), "List is empty"); - } - - @Test - public void normalWayToLoopMapLambdaExpressionTest() { - assertFalse(service.normalWayToLoopMapLambdaExpression().isEmpty(), "List is empty"); - } - - @Test - public void forEachAndListTest() { - assertFalse(service.forEachAndList().isEmpty(), "List is empty"); - } + @Autowired + private ForEachService service; + + @Test + public void normalWayToLoopMapTest() { + assertFalse(service.normalWayToLoopMap().isEmpty(), "List is empty"); + } + + @Test + public void normalWayToLoopMapLambdaExpressionTest() { + assertFalse(service.normalWayToLoopMapLambdaExpression().isEmpty(), "List is empty"); + } + + @Test + public void forEachAndListTest() { + assertFalse(service.forEachAndList().isEmpty(), "List is empty"); + } } diff --git a/src/test/java/br/com/somejava8examples/stream/StreamCollectorsGroupingTest.java b/src/test/java/br/com/somejava8examples/stream/StreamCollectorsGroupingTest.java index d278f51..180b6e4 100644 --- a/src/test/java/br/com/somejava8examples/stream/StreamCollectorsGroupingTest.java +++ b/src/test/java/br/com/somejava8examples/stream/StreamCollectorsGroupingTest.java @@ -12,27 +12,27 @@ @ActiveProfiles("test") public class StreamCollectorsGroupingTest { - @Autowired - private StreamCollectorsGroupingService service; - - @Test - public void groupByCountAndSortTest() { - assertFalse(service.groupByCountAndSort().isEmpty(), "List is empty"); - } - - @Test - public void sortingTest() { - assertFalse(service.sorting().isEmpty(), "List is empty"); - } - - @Test - public void groupByTheNameCountOrSumtheQty() { - assertFalse(service.groupByTheNameCountOrSumtheQty().isEmpty(), "List is empty"); - } - - @Test - public void groupByPriceCollectorsGroupingByAndCollectorsMappingExample() { - assertFalse(service.groupByPriceCollectorsGroupingByAndCollectorsMappingExample().isEmpty(), "List is empty"); - } + @Autowired + private StreamCollectorsGroupingService service; + + @Test + public void groupByCountAndSortTest() { + assertFalse(service.groupByCountAndSort().isEmpty(), "List is empty"); + } + + @Test + public void sortingTest() { + assertFalse(service.sorting().isEmpty(), "List is empty"); + } + + @Test + public void groupByTheNameCountOrSumtheQty() { + assertFalse(service.groupByTheNameCountOrSumtheQty().isEmpty(), "List is empty"); + } + + @Test + public void groupByPriceCollectorsGroupingByAndCollectorsMappingExample() { + assertFalse(service.groupByPriceCollectorsGroupingByAndCollectorsMappingExample().isEmpty(), "List is empty"); + } } diff --git a/src/test/java/br/com/somejava8examples/stream/StreamsFilterMapsTest.java b/src/test/java/br/com/somejava8examples/stream/StreamsFilterMapsTest.java index 30c13a9..98f064d 100644 --- a/src/test/java/br/com/somejava8examples/stream/StreamsFilterMapsTest.java +++ b/src/test/java/br/com/somejava8examples/stream/StreamsFilterMapsTest.java @@ -12,27 +12,27 @@ @ActiveProfiles("test") public class StreamsFilterMapsTest { - @Autowired - private StreamsFilterMapService service; - - @Test - public void listOfStringsToUppercaseTest() { - assertFalse(service.listOfStringsToUppercase().isEmpty(), "List is empty"); - } - - @Test - public void listOfObjectsListOfStringTest() { - assertFalse(service.listOfObjectsListOfString().isEmpty(), "List is empty"); - } - - @Test - public void listOfObjectsListOfOtherObjectsTest() { - assertFalse(service.listOfObjectsListOfOtherObjects().isEmpty(), "List is empty"); - } - - @Test - public void convertInsideTheMapMethodDirectlyTest() { - assertFalse(service.convertInsideTheMapMethodDirectly().isEmpty(), "List is empty"); - } + @Autowired + private StreamsFilterMapService service; + + @Test + public void listOfStringsToUppercaseTest() { + assertFalse(service.listOfStringsToUppercase().isEmpty(), "List is empty"); + } + + @Test + public void listOfObjectsListOfStringTest() { + assertFalse(service.listOfObjectsListOfString().isEmpty(), "List is empty"); + } + + @Test + public void listOfObjectsListOfOtherObjectsTest() { + assertFalse(service.listOfObjectsListOfOtherObjects().isEmpty(), "List is empty"); + } + + @Test + public void convertInsideTheMapMethodDirectlyTest() { + assertFalse(service.convertInsideTheMapMethodDirectly().isEmpty(), "List is empty"); + } } diff --git a/src/test/java/br/com/somejava8examples/stream/StreamsFilterTest.java b/src/test/java/br/com/somejava8examples/stream/StreamsFilterTest.java index 1f06139..92f7cb4 100644 --- a/src/test/java/br/com/somejava8examples/stream/StreamsFilterTest.java +++ b/src/test/java/br/com/somejava8examples/stream/StreamsFilterTest.java @@ -13,36 +13,36 @@ @ActiveProfiles("test") public class StreamsFilterTest { - @Autowired - private StreamsFilterService service; - - @Test - public void streamsFilterAndCollectBeforeJava8Test() { - Assertions.assertFalse(service.streamsFilterAndCollectBeforeJava8().isEmpty(), "List is empty"); - } - - @Test - public void streamsFilterAndCollectNowJava8Test() { - Assertions.assertFalse(service.streamsFilterAndCollectNowJava8().isEmpty(), "List is empty"); - } - - @Test - public void getPersonByNameLikeThisBeforeJava8Test() { - isTrue(service.getPersonByNameLikeThisBeforeJava8() != null, "Entity is empty"); - } - - @Test - public void getPersonByNameLikeThisAfterJava8Test() { - isTrue(service.getPersonByNameLikeThisAfterJava8() == null, "Entity not is empty"); - } - - @Test - public void getPersonByNameLikeThisJava8ForMultipleConditionTest() { - isTrue(service.getPersonByNameLikeThisJava8ForMultipleCondition() != null, "Entity is empty"); - } - - @Test - public void getStreamsFilterAndMapTest() { - Assertions.assertFalse(service.getStreamsFilterAndMap().isEmpty(), "List is empty"); - } + @Autowired + private StreamsFilterService service; + + @Test + public void streamsFilterAndCollectBeforeJava8Test() { + Assertions.assertFalse(service.streamsFilterAndCollectBeforeJava8().isEmpty(), "List is empty"); + } + + @Test + public void streamsFilterAndCollectNowJava8Test() { + Assertions.assertFalse(service.streamsFilterAndCollectNowJava8().isEmpty(), "List is empty"); + } + + @Test + public void getPersonByNameLikeThisBeforeJava8Test() { + isTrue(service.getPersonByNameLikeThisBeforeJava8() != null, "Entity is empty"); + } + + @Test + public void getPersonByNameLikeThisAfterJava8Test() { + isTrue(service.getPersonByNameLikeThisAfterJava8() == null, "Entity not is empty"); + } + + @Test + public void getPersonByNameLikeThisJava8ForMultipleConditionTest() { + isTrue(service.getPersonByNameLikeThisJava8ForMultipleCondition() != null, "Entity is empty"); + } + + @Test + public void getStreamsFilterAndMapTest() { + Assertions.assertFalse(service.getStreamsFilterAndMap().isEmpty(), "List is empty"); + } } From b73e4e795003b2c941b81c9bcab262604f62f053 Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 22:51:24 -0300 Subject: [PATCH 4/6] =?UTF-8?q?doc:=20Documenta=C3=A7=C3=A3o=20para=20exec?= =?UTF-8?q?utar=20o=20mvn=20checkstyle:check.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index f74521c..2b27ab7 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,9 @@ mvn -q -am clean test jacoco:report Relatório da cobertura: [codecov.io/somejava8examples](https://codecov.io/gh/danielso2007/somejava8examples) + +# Para executar o checklist do projeto + +``` +mvn checkstyle:check +``` From eb0c07028f62935b84ef6379f32ddaac6faeae68 Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 22:55:12 -0300 Subject: [PATCH 5/6] test(bamboo): Teste para o bamboo. --- src/main/java/br/com/somejava8examples/commons/BaseEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java index 041db56..8ca605c 100644 --- a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java +++ b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java @@ -5,6 +5,6 @@ */ public interface BaseEntity { - String toString(); + String toString(); } From 9773af603467d0af4c488eae6c3da5154afdef75 Mon Sep 17 00:00:00 2001 From: danielso2007 Date: Mon, 28 Dec 2020 23:19:23 -0300 Subject: [PATCH 6/6] test(bamboo): Usado para teste no bamboo. --- src/main/java/br/com/somejava8examples/commons/BaseEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java index 8ca605c..041db56 100644 --- a/src/main/java/br/com/somejava8examples/commons/BaseEntity.java +++ b/src/main/java/br/com/somejava8examples/commons/BaseEntity.java @@ -5,6 +5,6 @@ */ public interface BaseEntity { - String toString(); + String toString(); }