22 added javadoc & site configurations

iuliana · iuliana · commit 4c4f4d0d7760 · 2022-01-14T00:13:43.000Z
diff --git a/chapter00/pom.xml b/chapter00/pom.xml
@@ -44,8 +44,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/chapter04/src/main/java/com/apress/bgn/four/sealed/Mammal.java b/chapter04/src/main/java/com/apress/bgn/four/sealed/Mammal.java
@@ -30,4 +30,5 @@ of this software and associated documentation files (the "Software"),
 
 public sealed interface Mammal permits Human {
 
-}
+}
+
diff --git a/chapter05/arrays/pom.xml b/chapter05/arrays/pom.xml
@@ -15,14 +15,25 @@
     <description>Contains sources for Chapter 5.</description>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>arrays</module>
-        <module>calendar-date</module>
-        <module>collections</module>
-        <module>concurrency</module>
-        <module>primitives</module>
-        <module>references</module>
-    </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
+                            <mainClass>
+                                com.apress.bgn.five.ArrayDemo
+                            </mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>
diff --git a/chapter07/pom.xml b/chapter07/pom.xml
@@ -50,8 +50,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                     <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
diff --git a/chapter08/pom.xml b/chapter08/pom.xml
@@ -40,7 +40,7 @@
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>libs/</classpathPrefix>
                             <mainClass>
-                                com.apress.bgn.eigth.IntroductoryMain
+                                com.apress.bgn.eight.IntroductoryMain
                             </mainClass>
                         </manifest>
                     </archive>
diff --git a/chapter08/src/main/java/module-info.java b/chapter08/src/main/java/module-info.java
@@ -3,8 +3,6 @@
  */
 module chapter.eight {
     requires jsefa;
-    exports com.apress.bgn.eight;
-    opens com.apress.bgn.eigth.util;
-    opens com.apress.bgn.eigth;
-
+    opens com.apress.bgn.eight.util;
+    opens com.apress.bgn.eight;
 }
diff --git a/chapter09/logging-jul/src/main/resources/logging.properties b/chapter09/logging-jul/src/main/resources/logging.properties
@@ -1,12 +1,8 @@
 #handlers=java.util.logging.FileHandler
 handlers=java.util.logging.ConsoleHandler
 #java.util.logging.FileHandler.pattern=chapter09/out/chapter09-log.xml
-<<<<<<< HEAD
 .level=WARNING
 #java.util.logging.ConsoleHandler.level=ALL
-=======
-java.util.logging.ConsoleHandler.level=ALL
->>>>>>> 020 Added sorting algorithms
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
 #java.util.logging.ConsoleHandler.formatter=java.util.logging.XMLFormatter
 java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] [%4$-4s] %5$s %n
diff --git a/chapter09/logging-slf4j/src/main/java/com/apress/bgn/nine/AssertionDemo.java b/chapter09/logging-slf4j/src/main/java/com/apress/bgn/nine/AssertionDemo.java
@@ -30,7 +30,9 @@ of this software and associated documentation files (the "Software"),
 import com.apress.bgn.nine.algs.IntSorter;
 import com.apress.bgn.nine.algs.QuickSort;
 
+import java.time.Duration;
 import java.util.Arrays;
+import java.util.function.Function;
 
 import static com.apress.bgn.nine.SortingSlf4jDemo.getInts;
 
diff --git a/chapter09/logging-slf4j/src/main/resources/logback.xml b/chapter09/logging-slf4j/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
             <fileNamePattern>chapter09/logging-slf4j/out/output_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-            <maxFileSize>10MB</maxFileSize>
+                <maxFileSize>2MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
diff --git a/chapter09/pom.xml b/chapter09/pom.xml
@@ -13,54 +13,13 @@
     <artifactId>chapter09</artifactId>
     <name>Chapter 09</name>
     <packaging>pom</packaging>
+    <description>Contains sources for Chapter 9.</description>
 
     <modules>
         <module>logging-jul</module>
+        <module>logging-slf4j</module>
+        <module>processapi</module>
+        <module>testing</module>
     </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.apress.bgn</groupId>
-            <artifactId>chapter00</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <!-- Necessary for the toString in Performer -->
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
-
-        <!-- commented because Lombok keeps the project from compiling-->
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <!--  <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.18</version>
-            <scope>compile</scope>
-        </dependency>-->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>libs/</classpathPrefix>
-                            <mainClass>
-                                com.apress.bgn.four.MathSample
-                            </mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/chapter09/processapi/pom.xml b/chapter09/processapi/pom.xml
@@ -3,9 +3,9 @@
          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">
     <parent>
-        <artifactId>java-17-for-absolute-beginners</artifactId>
+        <artifactId>chapter09</artifactId>
         <groupId>com.apress.bgn</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,6 @@
     <description>Contains code samples showing process monitorization and manipulation.</description>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <!-- slf4j-api is a transitive dependency -->
         <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
@@ -44,4 +43,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
diff --git a/chapter09/processapi/src/main/java/com/apress/bgn/nine/ProcessCreationDemo.java b/chapter09/processapi/src/main/java/com/apress/bgn/nine/ProcessCreationDemo.java
@@ -24,7 +24,6 @@ of this software and associated documentation files (the "Software"),
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-<<<<<<< HEAD
 */
 package com.apress.bgn.nine;
 
diff --git a/chapter09/processapi/src/main/java/com/apress/bgn/nine/ProcessListingDemo.java b/chapter09/processapi/src/main/java/com/apress/bgn/nine/ProcessListingDemo.java
@@ -24,7 +24,6 @@ of this software and associated documentation files (the "Software"),
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-<<<<<<< HEAD
 */
 package com.apress.bgn.nine;
 
diff --git a/chapter09/processapi/src/main/java/com/apress/bgn/nine/ThreeProcessesDemo.java b/chapter09/processapi/src/main/java/com/apress/bgn/nine/ThreeProcessesDemo.java
@@ -24,7 +24,6 @@ of this software and associated documentation files (the "Software"),
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-<<<<<<< HEAD
 */
 package com.apress.bgn.nine;
 
diff --git a/chapter09/processapi/src/main/java/module-info.java b/chapter09/processapi/src/main/java/module-info.java
@@ -1,7 +1,6 @@
 /**
  * Created by iuliana.cosmina on 3/6/18.
  */
-
 module chapter.nine.processapi {
     requires org.slf4j;
 }
diff --git a/chapter09/testing/pom.xml b/chapter09/testing/pom.xml
@@ -15,11 +15,6 @@
 
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <!-- slf4j-api is a transitive dependency -->
         <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
@@ -47,14 +42,14 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>3.11.0</version>
+            <version>4.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.0-M1</version>
+            <version>${jupiter.junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -68,20 +63,13 @@
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>
                         <artifactId>junit-jupiter-engine</artifactId>
-                        <version>5.8.0-M1</version>
+                        <version>${jupiter.junit.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>
                     <testFailureIgnore>true</testFailureIgnore> <!-- this causes the build to pass, but allows the test failures to be recorded in the report. -->
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <generateReports>true</generateReports>
-                </configuration>
-            </plugin>
             <!-- needed to generate the reports during test execution-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -105,7 +93,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-
 </project>
diff --git a/chapter09/testing/src/main/java/com/apress/bgn/nine/Application.java b/chapter09/testing/src/main/java/com/apress/bgn/nine/Application.java
@@ -25,6 +25,9 @@ of this software and associated documentation files (the "Software"),
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 22 added javadoc & site configurations
 */
 package com.apress.bgn.nine;
 
diff --git a/chapter09/testing/src/main/java/com/apress/bgn/nine/service/AccountService.java b/chapter09/testing/src/main/java/com/apress/bgn/nine/service/AccountService.java
@@ -25,7 +25,6 @@ of this software and associated documentation files (the "Software"),
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-
 package com.apress.bgn.nine.service;
 
 import com.apress.bgn.nine.Account;
diff --git a/chapter09/testing/src/main/java/module-info.java b/chapter09/testing/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 /**
  * Created by iuliana.cosmina on 3/6/18.
- * This module is declared with "open" to allow reflection during testing.
+ * This module is decalred with "open" to allow reflection during testing.
  */
 open module chapter.nine.testing {
     requires org.slf4j;
diff --git a/chapter09/testing/src/test/java/com/apress/bgn/nine/FakeAccountRepoTest.java b/chapter09/testing/src/test/java/com/apress/bgn/nine/FakeAccountRepoTest.java
@@ -25,11 +25,9 @@ of this software and associated documentation files (the "Software"),
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-
 package com.apress.bgn.nine;
 
 import com.apress.bgn.nine.Account;
-
 import com.apress.bgn.nine.db.DbConnection;
 import com.apress.bgn.nine.fake.db.FakeDBConnection;
 import com.apress.bgn.nine.repo.AccountRepo;
diff --git a/chapter09/testing/src/test/java/com/apress/bgn/nine/service/AccountServiceTest.java b/chapter09/testing/src/test/java/com/apress/bgn/nine/service/AccountServiceTest.java
@@ -32,6 +32,9 @@ of this software and associated documentation files (the "Software"),
 import com.apress.bgn.nine.service.stub.AccountRepoStub;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -114,19 +117,17 @@ public void testNegativeIntAmount() {
     @Test
     public void testCreateAccount() {
         repo.set(1);
-         Account expected = service.createAccount("Gigi", "112233", "2100");
-         assertEquals("Gigi", expected.getHolder());
-         assertEquals("112233", expected.getNumber());
-         assertEquals(2100, expected.getSum());
+        Account expected = service.createAccount("Gigi", "112233", "2100");
+        assertEquals("Gigi", expected.getHolder());
+        assertEquals("112233", expected.getNumber());
+        assertEquals(2100, expected.getSum());
     }
 
     @Test
     public void testCreateAccountAlreadyExists() {
+        repo.set(0);
         AccountCreationException expected = assertThrows(
-                AccountCreationException.class, () -> {
-                    service.createAccount("Gigi", "112233", "2100");
-                }
-        );
+                AccountCreationException.class, () -> service.createAccount("Gigi", "112233", "2100"));
         assertEquals("Account already exists for holder Gigi", expected.getMessage());
     }
 
diff --git a/chapter10/embedded-web-app/src/main/java/module-info.java b/chapter10/embedded-web-app/src/main/java/module-info.java
@@ -28,4 +28,4 @@ of this software and associated documentation files (the "Software"),
 open module chapter.ten {
     requires org.apache.tomcat.embed.core;
     requires java.logging;
-}
+}
diff --git a/chapter10/pom.xml b/chapter10/pom.xml
@@ -32,5 +32,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/chapter11/pom.xml b/chapter11/pom.xml
@@ -43,5 +43,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/pom.xml b/pom.xml

-Original file line number
+Diff line change
 public sealed interface Mammal permits Human {
 -}
 +}
++