Merge pull request 'update config for IJ' (#48) from xml-2 into main

Reviewed-on: https://src.isharkfly.com/iSharkFly-Docs/java-tutorials/pulls/48

Code merged

.idea/checkstyle-idea.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.14.2</checkstyleVersion>
+    <checkstyleVersion>10.23.0</checkstyleVersion>
     <scanScope>JavaOnly</scanScope>
     <copyLibs>true</copyLibs>
     <option name="thirdPartyClasspath" />

.idea/compiler.xml

@@ -7,60 +7,51 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="jackson-annotations" />
         <module name="assertion-libraries" />
         <module name="core-java-serialization" />
+        <module name="lucene" />
         <module name="core-java-annotations" />
         <module name="core-java-uuid" />
-        <module name="core-java-numbers" />
         <module name="jackson-polymorphic-deserialization" />
+        <module name="ethereum" />
         <module name="core-java-strings" />
         <module name="jackson" />
         <module name="core-java-11" />
         <module name="core-java-collections-conversions" />
+        <module name="xml" />
         <module name="core-java-collections" />
         <module name="core-java-datetime-conversion" />
         <module name="core-java-lambdas" />
         <module name="junit-5-basics" />
-        <module name="activejdbc" />
-        <module name="spring-data-jpa-repo" />
         <module name="apache-velocity" />
         <module name="jackson-conversions-2" />
-        <module name="codebank" />
+        <module name="activejdbc" />
         <module name="core-java-collections-list" />
         <module name="image-compressing" />
-        <module name="spring-data-jpa-repo-2" />
         <module name="core-java-streams" />
         <module name="core-java-io-2" />
         <module name="core-java-io" />
-        <module name="discourse" />
+        <module name="core-java-8-datetime" />
         <module name="image-processing" />
         <module name="jackson-jr" />
         <module name="spring-data-redis" />
+        <module name="xml-2" />
         <module name="core-java" />
         <module name="jackson-custom-conversions" />
-        <module name="core-java-collections-list-2" />
         <module name="core-java-collections-conversions-2" />
         <module name="jackson-exceptions" />
-        <module name="core-java-8" />
+        <module name="xstream" />
         <module name="apache-httpclient" />
+        <module name="core-java-8" />
         <module name="core-java-collections-3" />
         <module name="core-java-9" />
         <module name="jackson-conversions" />
         <module name="core-java-collections-2" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="core-java-10" target="17" />
-      <module name="core-java-11-2" target="11" />
-      <module name="core-java-8-2" target="11" />
-      <module name="core-java-collections-list-3" target="11" />
-      <module name="spring-data-jpa-repo-2" target="17" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="core-java-9" options="" />
       <module name="core-java-streams" options="-parameters" />
     </option>
   </component>

.idea/encodings.xml

@@ -7,14 +7,10 @@
     <file url="file://$PROJECT_DIR$/apache/apache-velocity/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/apache/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/apache/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-10/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-10/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-11-2/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-11-2/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-11/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-11/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8-2/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8-datetime/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8-2/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8-datetime/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-8/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-9/src/main/java" charset="UTF-8" />
@@ -29,10 +25,6 @@
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-conversions-2/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-conversions/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-conversions/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list-2/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list-2/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list-3/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list-3/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections/src/main/java" charset="UTF-8" />
@@ -45,8 +37,6 @@
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-io/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-lambdas/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-lambdas/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-numbers/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-numbers/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-serialization/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-serialization/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-streams/src/main/java" charset="UTF-8" />
@@ -59,12 +49,12 @@
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ethereum/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ethereum/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/image-compressing/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/image-compressing/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/image-processing/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/image-processing/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/libraries-jackson/jackson-annotations/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/libraries-jackson/jackson-annotations/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/libraries-jackson/jackson-conversions-2/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/libraries-jackson/jackson-conversions-2/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/libraries-jackson/jackson-conversions/src/main/java" charset="UTF-8" />
@@ -81,16 +71,14 @@
     <file url="file://$PROJECT_DIR$/libraries-jackson/jackson/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/libraries-jackson/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/libraries-jackson/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/lucene/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/lucene/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/parent-boot-2/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/parent-boot-2/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/parent-boot-3/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/parent-boot-3/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/persistence-modules/activejdbc/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/persistence-modules/activejdbc/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-jpa-repo-2/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-jpa-repo-2/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-jpa-repo/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-jpa-repo/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-redis/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/persistence-modules/spring-data-redis/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/persistence-modules/src/main/java" charset="UTF-8" />
@@ -104,9 +92,11 @@
     <file url="file://$PROJECT_DIR$/testing-modules/junit-5-basics/src/test/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/testing-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/testing-modules/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/toolkits/codebank/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml-2/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/toolkits/codebank/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml-2/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/toolkits/discourse/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/toolkits/discourse/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xstream/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xstream/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/jarRepositories.xml

@@ -1,85 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="ossez-repo-releases" />
+      <option name="name" value="iSharkFly Private Releases" />
+      <option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-releases/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="OSSEZ Private Snapshots" />
+      <option name="name" value="iSharkFly Private Snapshots" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
+      <option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="OSSEZ Private Releases" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="iSharkFly Private Releases" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="OSSEZ Private Snapshots" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="iSharkFly Private Snapshots" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="iSharkFly Private Snapshots" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="" />
-      <option name="name" value="" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-snapshots" />
-      <option name="name" value="OSSEZ Private Snapshots" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-snapshots/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="OSSEZ Private Releases" />
-      <option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="iSharkFly Private Releases" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-releases/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="ossez-repo-releases" />
-      <option name="name" value="OSSEZ Private Releases" />
-      <option name="url" value="https://repo.isharkfly.com/repository/maven-releases/" />
-    </remote-repository>
   </component>
 </project>

.idea/jpa.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="defaultUnitInitialized" value="true" />
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>

.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

README.md

@@ -15,12 +15,12 @@ Java 代码使用的是 JDK 17。
 
 请使用下面的联系方式和我们联系：
 
-| 联系方式名称 | 联系方式                                                 |
+| 联系方式名称 | 联系方式                                          |
-|--------|------------------------------------------------------|
+|--------|-----------------------------------------------|
-| 电子邮件   | [service@ossez.com](mailto:service@ossez.com)        |
+| 电子邮件   | [service@ossez.com](mailto:service@ossez.com) |
-| QQ 或微信 | 103899765                                            |
+| QQ 或微信 | 103899765                                     |
-| QQ 交流群 | 15186112                                             |
+| QQ 交流群 | 15186112                                      |
-| 社区论坛   | https://www.isharkfly.com/c/computer-program/java/15 |
+| 社区论坛   | https://www.ossez.com/c/open-source/java/15   |
 
 # 公众平台
 

core-java-modules/core-java-8-datetime/README.md

@@ -1,15 +1,15 @@
-## Java 8+ Date and Time API 
+## Java 8+ Date 和 Time API 
 
-This module contains articles about the Date and Time API introduced with Java 8.
+本模块中包含的内容有关 Java 8 中使用日期和时间的 API。
 
-### Relevant Articles: 
+### 相关文章： 
 - [Introduction to the Java 8 Date/Time API](http://www.baeldung.com/java-8-date-time-intro)
 - [Migrating to the New Java 8 Date Time API](http://www.baeldung.com/migrating-to-java-8-date-time-api)
 - [Get the Current Date and Time in Java](https://www.baeldung.com/current-date-time-and-timestamp-in-java-8)
 - [TemporalAdjuster in Java](http://www.baeldung.com/java-temporal-adjuster)
-- [ZoneOffset in Java](https://www.baeldung.com/java-zone-offset)
+- [Java 中的 ZoneOffset](https://www.isharkfly.com/t/java-zoneoffset/16803)
 - [Differences Between ZonedDateTime and OffsetDateTime](https://www.baeldung.com/java-zoneddatetime-offsetdatetime)
-- [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
+- [Java 中的 Period 和 Duration](https://www.isharkfly.com/t/java-period-duration/16809)
 - [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)
 - [Set the Time Zone of a Date in Java](https://www.baeldung.com/java-set-date-time-zone)
 - [Comparing Dates in Java](https://www.baeldung.com/java-comparing-dates)

core-java-modules/core-java-8-datetime/pom.xml

@@ -8,9 +8,9 @@
     <name>core-java-8-datetime</name>
 
     <parent>
-        <groupId>com.baeldung.core-java-modules</groupId>
+        <groupId>com.ossez.core-java-modules</groupId>
         <artifactId>core-java-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/date/comparison/DateTimeComparisonUtils.java

@@ -1,4 +1,4 @@
-package com.baeldung.date.comparison;
+package com.ossez.date.comparison;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/date/comparison/LegacyDateComparisonUtils.java

@@ -1,4 +1,4 @@
-package com.baeldung.date.comparison;
+package com.ossez.date.comparison;
 
 import org.apache.commons.lang3.time.DateUtils;
 

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/CalendarUtils.java

@@ -0,0 +1,14 @@
+package com.ossez.datetime;
+
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+
+public class CalendarUtils {
+    public static Calendar getPlusDays(Date date, int amount) throws ParseException {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_YEAR, amount);
+        return calendar;
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/DateUtils.java

@@ -0,0 +1,19 @@
+package com.ossez.datetime;
+
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.Date;
+public class DateUtils {
+
+    public static Date getNow() {
+        return new Date();
+    }
+
+    public static Date getDate(long millis) {
+        return new Date(millis);
+    }
+
+    public static Date getDate(String dateAsString, String pattern) throws ParseException {
+        return new SimpleDateFormat(pattern).parse(dateAsString);
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseDateTimeFormatter.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseDuration.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.Duration;
 import java.time.LocalTime;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseLocalDate.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseLocalDateTime.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseLocalTime.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseOffsetDateTime.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UsePeriod.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDate;
 import java.time.Period;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseSimpleDateFormat.java

@@ -0,0 +1,15 @@
+package com.ossez.datetime;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+public class UseSimpleDateFormat {
+
+    public String useFormat() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+        sdf.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata"));
+        Date date = new Date(1725437542000L);
+        return sdf.format(date);
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseToInstant.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/UseZonedDateTime.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/sql/DateUtils.java

@@ -0,0 +1,21 @@
+package com.ossez.datetime.sql;
+
+import java.sql.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class DateUtils {
+
+    public static Date getNow() {
+        return new Date(System.currentTimeMillis());
+    }
+
+    public static Date getDate(String dateAsString) {
+        return Date.valueOf(dateAsString);
+    }
+
+    public static Date getDate(String dateAsString, String pattern) throws ParseException {
+        java.util.Date customUtilDate = new SimpleDateFormat(pattern).parse(dateAsString);
+        return new Date(customUtilDate.getTime());
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/sql/TimeUtils.java

@@ -0,0 +1,21 @@
+package com.ossez.datetime.sql;
+
+import java.sql.Time;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class TimeUtils {
+
+    public static Time getNow() {
+        return new Time(System.currentTimeMillis());
+    }
+
+    public static Time getTime(String timeAsString) {
+        return Time.valueOf(timeAsString);
+    }
+
+    public static Time getTime(String dateAsString, String pattern) throws ParseException {
+        java.util.Date customUtilDate = new SimpleDateFormat(pattern).parse(dateAsString);
+        return new Time(customUtilDate.getTime());
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/datetime/sql/TimestampUtils.java

@@ -0,0 +1,21 @@
+package com.ossez.datetime.sql;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class TimestampUtils {
+
+    public static Timestamp getNow() {
+        return new Timestamp(System.currentTimeMillis());
+    }
+
+    public static Timestamp getTimestamp(String timestampAsString) {
+        return Timestamp.valueOf(timestampAsString);
+    }
+
+    public static Timestamp getTimestamp(String dateAsString, String pattern) throws ParseException {
+        java.util.Date customUtilDate = new SimpleDateFormat(pattern).parse(dateAsString);
+        return new Timestamp(customUtilDate.getTime());
+    }
+}

core-java-modules/core-java-8-datetime/src/main/java/com/ossez/temporaladjuster/CustomTemporalAdjuster.java

@@ -1,4 +1,4 @@
-package com.baeldung.temporaladjuster;
+package com.ossez.temporaladjuster;
 
 import java.time.DayOfWeek;
 import java.time.temporal.ChronoField;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/date/comparison/DateTimeComparisonUtilsUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.date.comparison;
+package com.ossez.date.comparison;
 
 import org.junit.jupiter.api.Test;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/date/comparison/Java8DateTimeApiGeneralComparisonsUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.date.comparison;
+package com.ossez.date.comparison;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/date/comparison/LegacyDateComparisonUtilsUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.date.comparison;
+package com.ossez.date.comparison;
 
 import org.junit.jupiter.api.Test;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/dateapi/ConversionExample.java

@@ -1,4 +1,4 @@
-package com.baeldung.dateapi;
+package com.ossez.dateapi;
 
 import java.time.Instant;
 import java.time.ZoneId;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/dateapi/JavaDurationUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.dateapi;
+package com.ossez.dateapi;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/dateapi/JavaPeriodUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.dateapi;
+package com.ossez.dateapi;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -8,12 +8,14 @@ import java.time.LocalDate;
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
 
-import org.apache.log4j.Logger;
+
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JavaPeriodUnitTest {
 
-    private static final Logger LOG = Logger.getLogger(JavaPeriodUnitTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(JavaPeriodUnitTest.class);
 
     @Test
     public void givenADatePlus5Days_whenRequestingPeriod_thenExpectFive() {
@@ -44,7 +46,7 @@ public class JavaPeriodUnitTest {
 
         Period period = Period.between(startDate, endDate);
 
-        LOG.info(String.format("Years:%d months:%d days:%d", period.getYears(), period.getMonths(), period.getDays()));
+        logger.info("Years:{} months:{} days:{}", period.getYears(), period.getMonths(), period.getDays());
 
         assertFalse(period.isNegative());
         assertEquals(56, period.plusDays(50)

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/dateapi/JavaUtilTimeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.dateapi;
+package com.ossez.dateapi;
 
 import org.junit.Test;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/CalendarUtilsUnitTest.java

@@ -0,0 +1,18 @@
+package com.ossez.datetime;
+
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
+
+public class CalendarUtilsUnitTest {
+
+    @Test
+    public void givenDateAndDaysToAdd_thenCalendarIsCorrectlyReturned() throws ParseException {
+        Date initialDate = DateUtils.getDate("2020/01/01", "yyyy/MM/dd");
+        Date expectedDate= DateUtils.getDate("2020/01/11", "yyyy/MM/dd");
+        assertEquals(expectedDate, CalendarUtils.getPlusDays(initialDate, 10).getTime());
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/DateTimeZoneUnitTest.java

@@ -0,0 +1,36 @@
+package com.ossez.datetime;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+public class DateTimeZoneUnitTest {
+    private static final Logger logger = LoggerFactory.getLogger(DateTimeZoneUnitTest.class);
+
+    @Test
+    public void zoneId_out() {
+        ZoneId zoneId = ZoneId.of("Asia/Shanghai");
+        logger.debug("zoneId: {}", zoneId);
+    }
+
+
+    @Test
+    public void zoneOffset_out() {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zone = ZoneId.of("Asia/Shanghai");
+        ZoneOffset zoneOffSet = zone.getRules().getOffset(now);
+        logger.debug("zoneOffSet: {}", zoneOffSet);
+    }
+
+    @Test
+    public void ZonedDateTime_out() {
+        ZoneId zone = ZoneId.of("Asia/Shanghai");
+        ZonedDateTime date = ZonedDateTime.now(zone);
+        logger.debug("date: {}", date);
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/DateUtilsUnitTest.java

@@ -0,0 +1,15 @@
+package com.ossez.datetime;
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
+public class DateUtilsUnitTest {
+
+    @Test
+    public void givenDateAndPattern_thenDateIsCorrectlyReturned() throws ParseException {
+        long milliseconds = new Date(2020 - 1900, 0, 1).getTime();
+        assertEquals(DateUtils.getDate(milliseconds), DateUtils.getDate("2020/01/01", "yyyy/MM/dd"));
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseDateTimeFormatterUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseLocalDateTimeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseLocalDateUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseLocalTimeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalTime;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseOffsetDateTimeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UsePeriodUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.time.LocalDate;
 import java.time.Period;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseSimpleDateFormatTest.java

@@ -0,0 +1,13 @@
+package com.ossez.datetime;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UseSimpleDateFormatTest {
+    private UseSimpleDateFormat useSimpleDateFormat = new UseSimpleDateFormat();
+
+    @Test
+    public void givenValues_whenUsingFactoryOf_thenLocalTime() {
+        Assert.assertEquals("2024-09-04 13:42:22 +0530", useSimpleDateFormat.useFormat());
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseTimeZoneUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseToInstantUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/UseZonedDateTimeUnitTest.java

@@ -1,17 +1,13 @@
-package com.baeldung.datetime;
+package com.ossez.datetime;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.time.*;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class UseZonedDateTimeUnitTest {
 
     private UseZonedDateTime zonedDateTime = new UseZonedDateTime();

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/sql/DateUtilsUnitTest.java

@@ -0,0 +1,20 @@
+package com.ossez.datetime.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.ParseException;
+
+import org.junit.Test;
+
+public class DateUtilsUnitTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenDateAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
+        DateUtils.getDate("2020 01 01");
+    }
+
+    @Test
+    public void givenDateAndPattern_thenDateIsCorrectlyReturned() throws ParseException {
+        assertEquals(DateUtils.getDate("2020-01-01"), DateUtils.getDate("2020/01/01", "yyyy/MM/dd"));
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/sql/TimeUtilsUnitTest.java

@@ -0,0 +1,20 @@
+package com.ossez.datetime.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import java.text.ParseException;
+
+public class TimeUtilsUnitTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenTimeAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
+        TimeUtils.getTime("10 11 12");
+    }
+
+    @Test
+    public void givenTimeAndPattern_thenTimeIsCorrectlyReturned() throws ParseException {
+        assertEquals(TimeUtils.getTime("10:11:12"), TimeUtils.getTime("10 11 12", "hh mm ss"));
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/datetime/sql/TimestampUtilsUnitTest.java

@@ -0,0 +1,20 @@
+package com.ossez.datetime.sql;
+
+import org.junit.Test;
+
+import java.text.ParseException;
+
+import static org.junit.Assert.assertEquals;
+
+public class TimestampUtilsUnitTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenTimestampAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
+        TimestampUtils.getTimestamp("2020/01/01 10:11-12");
+    }
+
+    @Test
+    public void givenTimestampAndPattern_thenTimestampIsCorrectlyReturned() throws ParseException {
+        assertEquals(TimestampUtils.getTimestamp("2020-01-01 10:11:12"), TimestampUtils.getTimestamp("2020/01/01 10:11-12", "yyyy/MM/dd hh:mm-ss"));
+    }
+}

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/temporaladjusters/CustomTemporalAdjusterUnitTest.java

@@ -1,6 +1,6 @@
-package com.baeldung.temporaladjusters;
+package com.ossez.temporaladjusters;
 
-import com.baeldung.temporaladjuster.CustomTemporalAdjuster;
+import com.ossez.temporaladjuster.CustomTemporalAdjuster;
 import org.junit.Test;
 
 import java.time.LocalDate;

core-java-modules/core-java-8-datetime/src/test/java/com/ossez/temporaladjusters/TemporalAdjustersUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.temporaladjusters;
+package com.ossez.temporaladjusters;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;

core-java-modules/core-java-io/pom.xml

@@ -76,7 +76,7 @@
         <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
-            <version>${version.slf4j}</version>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

core-java-modules/pom.xml

@@ -17,6 +17,7 @@
     <modules>
         <module>core-java</module>
         <module>core-java-8</module>
+        <module>core-java-8-datetime</module>
         <module>core-java-9</module>
 <!--        <module>core-java-10</module>-->
         <module>core-java-11</module>

ethereum/.idea/.gitignore

@@ -0,0 +1,12 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Environment-dependent path to Maven home directory
+/mavenHomeManager.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Zeppelin ignored files
+/ZeppelinRemoteNotebooks/

ethereum/.idea/checkstyle-idea.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA" serialisationVersion="2">
+    <checkstyleVersion>10.23.0</checkstyleVersion>
+    <scanScope>JavaOnly</scanScope>
+    <copyLibs>true</copyLibs>
+    <option name="thirdPartyClasspath" />
+    <option name="activeLocationIds" />
+    <option name="locations">
+      <list>
+        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
+        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
+      </list>
+    </option>
+  </component>
+</project>

ethereum/.idea/compiler.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="ethereum" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

ethereum/.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

ethereum/.idea/jarRepositories.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="Ethereum" />
+      <option name="name" value="Ethereum" />
+      <option name="url" value="https://dl.bintray.com/ethereum/maven/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-releases" />
+      <option name="name" value="iSharkFly Private Releases" />
+      <option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-releases/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.isharkfly.com/repository/maven/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ossez-repo-snapshots" />
+      <option name="name" value="iSharkFly Private Snapshots" />
+      <option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>

ethereum/.idea/misc.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
+  <component name="ThriftCompiler">
+    <compilers />
+  </component>
+</project>

ethereum/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

ethereum/pom.xml

@@ -3,15 +3,14 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.ethereum</groupId>
+    <groupId>com.ossez.ethereum</groupId>
     <artifactId>ethereum</artifactId>
     <name>ethereum</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.ossez</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
@@ -76,14 +75,15 @@
         </dependency>
         <!-- Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
-            <artifactId>jstl</artifactId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>${jstl.version}</version>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <version>6.1.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
@@ -91,9 +91,10 @@
             <version>${jstl.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
+            <groupId>jakarta.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
-            <version>${javax.servlet.jsp-api.version}</version>
+            <version>4.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <!-- Spring Testing -->
         <dependency>
@@ -113,19 +114,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
+            <version>7.0.0-M4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
+            <version>7.0.0-M4</version>
             <scope>test</scope>
         </dependency>
         <!-- Testing -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
+            <version>5.17.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.hamcrest</groupId>
@@ -170,15 +171,16 @@
     </build>
 
     <repositories>
-        <repository>
+<!--        <repository>-->
-            <id>Ethereum</id>
+<!--            <id>Ethereum</id>-->
-            <name>Ethereum</name>
+<!--            <name>Ethereum</name>-->
-            <url>https://dl.bintray.com/ethereum/maven/</url>
+<!--            <url>https://dl.bintray.com/ethereum/maven/</url>-->
-        </repository>
+<!--        </repository>-->
     </repositories>
 
     <properties>
-        <ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
+        <spring.version>7.0.0-M4</spring.version>
+        <ethereumj-core.version>1.9.0-RELEASE</ethereumj-core.version>
         <web3j.core.version>3.3.1</web3j.core.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
         <jsonpath.version>2.8.0</jsonpath.version>

ethereum/src/main/java/com/isharkfly/ethereumj/ApplicationMain.java

@@ -1,4 +1,4 @@
-package com.baeldung.ethereumj;
+package com.isharkfly.ethereumj;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -8,7 +8,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 @SpringBootApplication
-public class ApplicationMain extends SpringBootServletInitializer {
+public abstract class ApplicationMain extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(ApplicationMain.class, args);

ethereum/src/main/java/com/isharkfly/ethereumj/Constants.java

@@ -1,4 +1,4 @@
-package com.baeldung.ethereumj;
+package com.isharkfly.ethereumj;
 
 public class Constants {
 

ethereum/src/main/java/com/isharkfly/ethereumj/beans/EthBean.java

@@ -1,6 +1,6 @@
-package com.baeldung.ethereumj.beans;
+package com.isharkfly.ethereumj.beans;
 
-import com.baeldung.ethereumj.listeners.EthListener;
+import com.isharkfly.ethereumj.listeners.EthListener;
 import org.ethereum.core.Block;
 import org.ethereum.facade.Ethereum;
 import org.ethereum.facade.EthereumFactory;

ethereum/src/main/java/com/isharkfly/ethereumj/config/EthConfig.java

@@ -1,6 +1,6 @@
-package com.baeldung.ethereumj.config;
+package com.isharkfly.ethereumj.config;
 
-import com.baeldung.ethereumj.beans.EthBean;
+import com.isharkfly.ethereumj.beans.EthBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

ethereum/src/main/java/com/isharkfly/ethereumj/controllers/EthController.java

@@ -1,8 +1,8 @@
-package com.baeldung.ethereumj.controllers;
+package com.isharkfly.ethereumj.controllers;
 
-import com.baeldung.ethereumj.Constants;
+import com.isharkfly.ethereumj.Constants;
-import com.baeldung.ethereumj.beans.EthBean;
+import com.isharkfly.ethereumj.beans.EthBean;
-import com.baeldung.ethereumj.transfer.EthResponse;
+import com.isharkfly.ethereumj.transfer.EthResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

ethereum/src/main/java/com/isharkfly/ethereumj/listeners/EthListener.java

@@ -1,4 +1,4 @@
-package com.baeldung.ethereumj.listeners;
+package com.isharkfly.ethereumj.listeners;
 
 import org.ethereum.core.Block;
 import org.ethereum.core.TransactionReceipt;

ethereum/src/main/java/com/isharkfly/ethereumj/transfer/EthResponse.java

@@ -1,4 +1,4 @@
-package com.baeldung.ethereumj.transfer;
+package com.isharkfly.ethereumj.transfer;
 
 public class EthResponse {
 

ethereum/src/main/java/com/isharkfly/web3j/Template.java

@@ -1,6 +1,6 @@
-package com.baeldung.web3j;
+package com.isharkfly.web3j;
 
-import com.baeldung.web3j.contracts.Greeting;
+import com.isharkfly.web3j.contracts.Greeting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.web3j.crypto.Credentials;

ethereum/src/main/java/com/isharkfly/web3j/config/AppConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.config;
+package com.isharkfly.web3j.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -18,7 +18,7 @@ import java.util.concurrent.Executor;
 @Configuration
 @EnableWebMvc
 @EnableAsync
-@ComponentScan("com.baeldung.web3j")
+@ComponentScan("com.isharkfly.web3j")
 public class AppConfig implements WebMvcConfigurer {
 
     public void addViewControllers(ViewControllerRegistry registry) {

ethereum/src/main/java/com/isharkfly/web3j/config/WebAppInitializer.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.config;
+package com.isharkfly.web3j.config;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 

ethereum/src/main/java/com/isharkfly/web3j/constants/Constants.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.constants;
+package com.isharkfly.web3j.constants;
 
 public class Constants {
 

ethereum/src/main/java/com/isharkfly/web3j/contracts/Example.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.contracts;
+package com.isharkfly.web3j.contracts;
 
 import java.math.BigInteger;
 import java.util.Arrays;

ethereum/src/main/java/com/isharkfly/web3j/contracts/Greeting.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.contracts;
+package com.isharkfly.web3j.contracts;
 
 import java.math.BigInteger;
 import java.util.Arrays;

ethereum/src/main/java/com/isharkfly/web3j/controllers/EthereumRestController.java

@@ -1,9 +1,9 @@
-package com.baeldung.web3j.controllers;
+package com.isharkfly.web3j.controllers;
 
-import com.baeldung.web3j.constants.Constants;
+import com.isharkfly.web3j.constants.Constants;
-import com.baeldung.web3j.helpers.TimeHelper;
+import com.isharkfly.web3j.helpers.TimeHelper;
-import com.baeldung.web3j.services.Web3Service;
+import com.isharkfly.web3j.services.Web3Service;
-import com.baeldung.web3j.transfers.ResponseTransfer;
+import com.isharkfly.web3j.transfers.ResponseTransfer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +17,7 @@ import java.time.Instant;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
-import static com.baeldung.web3j.constants.Constants.GENERIC_EXCEPTION;
+import static com.isharkfly.web3j.constants.Constants.GENERIC_EXCEPTION;
 
 @RestController
 public class EthereumRestController {

ethereum/src/main/java/com/isharkfly/web3j/helpers/TimeHelper.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.helpers;
+package com.isharkfly.web3j.helpers;
 
 import java.time.Duration;
 import java.time.Instant;

ethereum/src/main/java/com/isharkfly/web3j/services/Web3Service.java

@@ -1,6 +1,6 @@
-package com.baeldung.web3j.services;
+package com.isharkfly.web3j.services;
 
-import com.baeldung.web3j.contracts.Example;
+import com.isharkfly.web3j.contracts.Example;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.web3j.abi.FunctionEncoder;
@@ -22,11 +22,10 @@ import java.io.File;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
-import static com.baeldung.web3j.constants.Constants.DEFAULT_ADDRESS;
+import static com.isharkfly.web3j.constants.Constants.DEFAULT_ADDRESS;
-import static com.baeldung.web3j.constants.Constants.GENERIC_EXCEPTION;
+import static com.isharkfly.web3j.constants.Constants.GENERIC_EXCEPTION;
-import static com.baeldung.web3j.constants.Constants.PLEASE_SUPPLY_REAL_DATA;
+import static com.isharkfly.web3j.constants.Constants.PLEASE_SUPPLY_REAL_DATA;
 
 @Service
 public class Web3Service {

ethereum/src/main/java/com/isharkfly/web3j/transfers/ResponseTransfer.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.transfers;
+package com.isharkfly.web3j.transfers;
 
 import java.time.Duration;
 

ethereum/src/test/java/com/isharkfly/ethereumj/controllers/EthControllerLiveTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.ethereumj.controllers;
+package com.isharkfly.ethereumj.controllers;
 
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertNotNull;
@@ -17,9 +17,9 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
 
-import com.baeldung.ethereumj.ApplicationMain;
+import com.isharkfly.ethereumj.ApplicationMain;
-import com.baeldung.ethereumj.Constants;
+import com.isharkfly.ethereumj.Constants;
-import com.baeldung.ethereumj.transfer.EthResponse;
+import com.isharkfly.ethereumj.transfer.EthResponse;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ApplicationMain.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)

ethereum/src/test/java/com/isharkfly/web3j/controllers/EthereumRestControllerIntegrationTest.java

@@ -1,8 +1,8 @@
-package com.baeldung.web3j.controllers;
+package com.isharkfly.web3j.controllers;
 
 
-import com.baeldung.web3j.config.AppConfig;
+import com.isharkfly.web3j.config.AppConfig;
-import com.baeldung.web3j.constants.Constants;
+import com.isharkfly.web3j.constants.Constants;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

ethereum/src/test/java/com/isharkfly/web3j/controllers/EthereumRestControllerUnitTest.java

@@ -1,7 +1,7 @@
-package com.baeldung.web3j.controllers;
+package com.isharkfly.web3j.controllers;
 
-import com.baeldung.web3j.constants.Constants;
+import com.isharkfly.web3j.constants.Constants;
-import com.baeldung.web3j.services.Web3Service;
+import com.isharkfly.web3j.services.Web3Service;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

ethereum/src/test/java/com/isharkfly/web3j/services/EthereumContractUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.web3j.services;
+package com.isharkfly.web3j.services;
 
 import org.junit.After;
 import org.junit.Before;

jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java

@@ -7,6 +7,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ -103,7 +104,7 @@ public class JavaReadWriteJsonExampleUnitTest {
 
     @Test
     public void wheReadFromUrl_thanCorrect() throws Exception {
-        URL resource = new URL("file:src/test/resources/json_car.json");
+        URL resource = new URI("file:src/test/resources/json_car.json").toURL();
 
         ObjectMapper objectMapper = new ObjectMapper();
         Car fromFile = objectMapper.readValue(resource, Car.class);

libraries-jackson/jackson-conversions/pom.xml

@@ -6,6 +6,10 @@
     <artifactId>jackson-conversions</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>jackson-conversions</name>
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
 
     <parent>
         <groupId>com.ossez</groupId>

libraries-jackson/jackson/src/test/java/com/ossez/jackson/optionalwithjackson/OptionalTypeUnitTest.java

@@ -1,23 +1,19 @@
 package com.ossez.jackson.optionalwithjackson;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-
 import static io.restassured.path.json.JsonPath.from;
-
 import java.io.IOException;
 import java.util.Optional;
-
 import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
 public class OptionalTypeUnitTest {
 
     ObjectMapper mapper = new ObjectMapper().registerModule(new Jdk8Module());
 
+    @Test
     public void givenPresentOptional_whenSerializing_thenValueInJson() throws JsonProcessingException {
 
         String subTitle = "The Parish Boy's Progress";
@@ -30,12 +26,6 @@ public class OptionalTypeUnitTest {
         assertThat(from(result).getString("subTitle")).isEqualTo(subTitle);
     }
 
-    @Test
-    public void givenFieldWithValue_whenDeserializing_thenThrowExceptio() throws JsonProcessingException {
-        String bookJson = "{ \"title\": \"Oliver Twist\", \"subTitle\": \"foo\" }";
-        Book result = mapper.readValue(bookJson, Book.class);
-    }
-
     @Test
     public void givenEmptyOptional_whenSerializing_thenNullValue() throws JsonProcessingException {
 

libraries-jackson/pom.xml

@@ -16,7 +16,7 @@
 
     <modules>
         <module>jackson</module>
-        <module>jackson-annotations</module>
+<!--        <module>jackson-annotations</module>-->
         <module>jackson-conversions</module>
         <module>jackson-conversions-2</module>
         <module>jackson-custom-conversions</module>

lucene/pom.xml

@@ -9,9 +9,9 @@
     <description>An Apache Lucene demo application</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.ossez</groupId>
         <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -33,7 +33,7 @@
     </dependencies>
 
     <properties>
-        <lucene.version>7.4.0</lucene.version>
+        <lucene.version>8.0.0</lucene.version>
     </properties>
 
 </project>

lucene/src/main/java/com/baeldung/lucene/MyCustomAnalyzer.java

@@ -4,10 +4,10 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.StopFilter;
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.en.EnglishAnalyzer;
 import org.apache.lucene.analysis.en.PorterStemFilter;
 import org.apache.lucene.analysis.miscellaneous.CapitalizationFilter;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.standard.ClassicFilter;
-import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 
 public class MyCustomAnalyzer extends Analyzer{
@@ -15,9 +15,9 @@ public class MyCustomAnalyzer extends Analyzer{
     @Override
     protected TokenStreamComponents createComponents(String fieldName) {
         final StandardTokenizer src = new StandardTokenizer();
-        TokenStream result = new StandardFilter(src);
+        TokenStream result = new ClassicFilter(src);
         result = new LowerCaseFilter(result);
-        result = new StopFilter(result,  StandardAnalyzer.STOP_WORDS_SET);
+        result = new StopFilter(result, EnglishAnalyzer.ENGLISH_STOP_WORDS_SET);
         result = new PorterStemFilter(result);
         result = new CapitalizationFilter(result);
         return new TokenStreamComponents(src, result);

lucene/src/test/java/com/baeldung/lucene/LuceneAnalyzerIntegrationTest.java

@@ -42,7 +42,7 @@ public class LuceneAnalyzerIntegrationTest {
 
     @Test
     public void whenUseStopAnalyzer_thenAnalyzed() throws IOException {
-        List<String> result = analyze(SAMPLE_TEXT, new StopAnalyzer());
+        List<String> result = analyze(SAMPLE_TEXT, new StopAnalyzer(EnglishAnalyzer.ENGLISH_STOP_WORDS_SET));
 
         assertThat(result, contains("baeldung", "com", "lucene", "analyzers", "test"));
     }

persistence-modules/activejdbc/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${version.slf4j}</version>
+            <version>${slf4j.version}</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -41,9 +41,12 @@
     <modules>
         <module>apache</module>
         <module>core-java-modules</module>
+        <module>ethereum</module>
+
         <module>image-compressing</module>
         <module>image-processing</module>
         <module>libraries-jackson</module>
+        <module>lucene</module>
         <!--        <module>jackson-simple</module>-->
         <!--        <module>parent-java</module>-->
         <module>parent-boot-2</module>
@@ -51,7 +54,9 @@
         <module>persistence-modules</module>
         <module>testing-modules</module>
         <module>toolkits</module>
-        <!--        <module>xml</module>-->
+        <module>xml</module>
+        <module>xml-2</module>
+        <module>xstream</module>
     </modules>
 
     <properties>
@@ -61,9 +66,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Logging -->
-        <version.slf4j>1.7.36</version.slf4j>
+        <slf4j.version>2.0.0</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
-        <log4j-over-slf4j.version>2.0.7</log4j-over-slf4j.version>
+        <log4j-over-slf4j.version>2.0.17</log4j-over-slf4j.version>
         <version.log4j2>2.18.0</version.log4j2>
 
         <!-- APACHE COMMONS-->
@@ -75,8 +80,6 @@
         <commons-cli.version>1.4</commons-cli.version>
         <commons-io.version>2.11.0</commons-io.version>
 
-
-
         <!-- UTILS -->
         <guava.version>31.1-jre</guava.version>
         <lombok.version>1.18.28</lombok.version>
@@ -84,6 +87,7 @@
         <colt.version>1.2.0</colt.version>
         <trove4j.version>3.0.3</trove4j.version>
         <fastutil.version>5.0.9</fastutil.version>
+        <jstl.version>1.2</jstl.version>
 
         <!-- Hibernate / JPA -->
         <jakarta.persistence.version>3.2.0-M2</jakarta.persistence.version>
@@ -131,6 +135,8 @@
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
     </properties>
 
@@ -139,6 +145,12 @@
         <!-- OSSEZ COMMON -->
 
         <!-- LOG -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/Dog.java

@@ -1,19 +0,0 @@
-package com.baeldung.assertj;
-
-public class Dog {
-    private String name;
-    private Float weight;
-
-    public Dog(String name, Float weight) {
-        this.name = name;
-        this.weight = weight;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Float getWeight() {
-        return weight;
-    }
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/Member.java

@@ -1,19 +0,0 @@
-package com.baeldung.assertj;
-
-public class Member {
-    private String name;
-    private int age;
-
-    public Member(String name, int age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/Person.java

@@ -1,19 +0,0 @@
-package com.baeldung.assertj;
-
-public class Person {
-    private String name;
-    private Integer age;
-
-    public Person(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/custom/Person.java

@@ -1,32 +0,0 @@
-package com.baeldung.assertj.custom;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Person {
-    private String fullName;
-    private int age;
-    private List<String> nicknames;
-
-    public Person(String fullName, int age) {
-        this.fullName = fullName;
-        this.age = age;
-        this.nicknames = new ArrayList<>();
-    }
-
-    public void addNickname(String nickname) {
-        nicknames.add(nickname);
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public List<String> getNicknames() {
-        return nicknames;
-    }
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/exceptions/CityNotFoundException.java

@@ -1,22 +0,0 @@
-package com.baeldung.assertj.exceptions;
-
-public class CityNotFoundException extends RuntimeException {
-
-    private String city;
-    private String message;
-
-    CityNotFoundException(String city, String message) {
-        this.city = city;
-        this.message = message;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/exceptions/CityUtils.java

@@ -1,17 +0,0 @@
-package com.baeldung.assertj.exceptions;
-
-import java.util.Arrays;
-import java.util.List;
-
-public final class CityUtils {
-
-    private static final List<String> CITIES = Arrays.asList("Tamassint", "London", "Madrid", "New york");
-
-    public static String search(String searchedCity) {
-        return CITIES.stream()
-            .filter(searchedCity::equals)
-            .findFirst()
-            .orElseThrow(() -> new CityNotFoundException(searchedCity, "The specified city is not found"));
-    }
-
-}

testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/Address.java

@@ -1,25 +0,0 @@
-package com.baeldung.assertj.extracting;
-
-class Address {
-    private String street;
-    private String city;
-    private ZipCode zipCode;
-
-    Address(String street, String city, ZipCode zipCode) {
-        this.street = street;
-        this.city = city;
-        this.zipCode = zipCode;
-    }
-
-    public String getStreet() {
-        return street;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public ZipCode getZipCode() {
-        return zipCode;
-    }
-}