From 41778bc934c8f3bf65d9740a42bfa04a154ec23d Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 13:48:50 -0500
Subject: [PATCH 01/11] added web services JDK11 to the jacoco reporting
 pom.xml

---
 jmaqs-jacoco-reporting/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jmaqs-jacoco-reporting/pom.xml b/jmaqs-jacoco-reporting/pom.xml
index 69600e5e4..716590a35 100644
--- a/jmaqs-jacoco-reporting/pom.xml
+++ b/jmaqs-jacoco-reporting/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2020 (C) Magenic, All rights Reserved
+  ~ Copyright 2021 (C) Magenic, All rights Reserved
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -75,6 +75,10 @@
             <groupId>com.magenic.jmaqs.webservices</groupId>
             <artifactId>jmaqs-webservices-jdk8</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.magenic.jmaqs.webservices</groupId>
+            <artifactId>jmaqs-webservices-jdk11</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.magenic.jmaqs.database</groupId>
             <artifactId>jmaqs-database</artifactId>

From 9b0bebac9e845b2ed9a2a17e18b04dd3ae166948 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 14:43:29 -0500
Subject: [PATCH 02/11] updated the poms

---
 jmaqs-jacoco-reporting/pom.xml  | 1 -
 jmaqs-webservices-jdk11/pom.xml | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jmaqs-jacoco-reporting/pom.xml b/jmaqs-jacoco-reporting/pom.xml
index 716590a35..8701d4ded 100644
--- a/jmaqs-jacoco-reporting/pom.xml
+++ b/jmaqs-jacoco-reporting/pom.xml
@@ -57,7 +57,6 @@
         </plugins>
     </build>
 
-
     <dependencies>
         <dependency>
             <groupId>com.magenic.jmaqs.appium</groupId>
diff --git a/jmaqs-webservices-jdk11/pom.xml b/jmaqs-webservices-jdk11/pom.xml
index fddb25130..bbaa8c0ab 100644
--- a/jmaqs-webservices-jdk11/pom.xml
+++ b/jmaqs-webservices-jdk11/pom.xml
@@ -2,15 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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>
     <parent>
         <artifactId>jmaqs-framework</artifactId>
         <groupId>com.magenic.jmaqs</groupId>
         <version>${revision}</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.magenic.jmaqs.webservices</groupId>
     <artifactId>jmaqs-webservices-jdk11</artifactId>
+    <name>JMAQS JDK11 WebServices Testing Module</name>
+    <version>${revision}</version>
 
     <version>${revision}</version>
     <dependencies>
@@ -42,7 +44,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-
                     <source>11</source>
                     <target>11</target>
                 </configuration>

From 5b5f3bac7a286e8d31cfe6990c1df5593c00be76 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 14:48:30 -0500
Subject: [PATCH 03/11] updated the poms

---
 jmaqs-webservices-jdk11/pom.xml | 3 ---
 pom.xml                         | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jmaqs-webservices-jdk11/pom.xml b/jmaqs-webservices-jdk11/pom.xml
index bbaa8c0ab..9d838e36e 100644
--- a/jmaqs-webservices-jdk11/pom.xml
+++ b/jmaqs-webservices-jdk11/pom.xml
@@ -14,7 +14,6 @@
     <name>JMAQS JDK11 WebServices Testing Module</name>
     <version>${revision}</version>
 
-    <version>${revision}</version>
     <dependencies>
         <dependency>
             <groupId>com.magenic.jmaqs.utilities</groupId>
@@ -35,8 +34,6 @@
         </dependency>
     </dependencies>
 
-    <name>JMAQS JDK11 WebServices Testing Module</name>
-
     <build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 0a706c0cf..10661eb80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <module>jmaqs-base</module>
         <module>jmaqs-selenium</module>
         <module>jmaqs-webservices-jdk8</module>
+        <module>jmaqs-webservices-jdk11</module>
         <module>jmaqs-appium</module>
         <module>jmaqs-database</module>
         <module>jmaqs-cucumber</module>
@@ -308,6 +309,11 @@
                 <artifactId>jmaqs-webservices-jdk8</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.magenic.jmaqs.webservices</groupId>
+                <artifactId>jmaqs-webservices-jdk11</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 6bbe5091e9af601d5f4c79acc4528c8bb6841fe5 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 14:57:45 -0500
Subject: [PATCH 04/11] updated the poms

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 10661eb80..2393f5875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,10 +51,10 @@
         <module>jmaqs-base</module>
         <module>jmaqs-selenium</module>
         <module>jmaqs-webservices-jdk8</module>
-        <module>jmaqs-webservices-jdk11</module>
         <module>jmaqs-appium</module>
         <module>jmaqs-database</module>
         <module>jmaqs-cucumber</module>
+        <module>jmaqs-webservices-jdk11</module>
     </modules>
 
     <profiles>

From fd474ff596dc8df81d3bca7ce926ee44452785eb Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 15:08:51 -0500
Subject: [PATCH 05/11] updated the poms

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2393f5875..76c374460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
         <module>jmaqs-appium</module>
         <module>jmaqs-database</module>
         <module>jmaqs-cucumber</module>
-        <module>jmaqs-webservices-jdk11</module>
     </modules>
 
     <profiles>

From 9fba7b2cac74aa6e19105b1695d61d85b8cf2d5b Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 9 Jul 2021 15:13:06 -0500
Subject: [PATCH 06/11] updated the poms

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 76c374460..10661eb80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <module>jmaqs-base</module>
         <module>jmaqs-selenium</module>
         <module>jmaqs-webservices-jdk8</module>
+        <module>jmaqs-webservices-jdk11</module>
         <module>jmaqs-appium</module>
         <module>jmaqs-database</module>
         <module>jmaqs-cucumber</module>

From 5bfdc3f5ae759546a541033b2aff925f1398f502 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Fri, 16 Jul 2021 13:48:33 -0500
Subject: [PATCH 07/11] deleted pom copyright

---
 jmaqs-jacoco-reporting/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/jmaqs-jacoco-reporting/pom.xml b/jmaqs-jacoco-reporting/pom.xml
index b8508c359..274314a5a 100644
--- a/jmaqs-jacoco-reporting/pom.xml
+++ b/jmaqs-jacoco-reporting/pom.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2021 (C) Magenic, All rights Reserved
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">

From 9305bf874279d246293b9b35c0d975fa82beea25 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Mon, 23 Aug 2021 13:48:35 -0500
Subject: [PATCH 08/11] code smell revision

---
 .../jmaqs/webservices/jdk11/WebServiceUtilities.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
index 1f6c7fae8..33f72e9db 100644
--- a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
+++ b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
@@ -27,6 +27,11 @@ public class WebServiceUtilities {
    */
   private static final ObjectMapper xmlMapper = new XmlMapper();
 
+  /**
+   * Error exception message.
+   */
+  private static final String errorMessage = "Only xml and json conversions are currently supported";
+
   /**
    * private class constructor.
    */
@@ -61,7 +66,7 @@ public static <T> T getResponseBody(HttpResponse<String> response, MediaType con
       responseBody = deserializeXml(response, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter("Only xml and json conversions are currently supported"));
+          StringProcessor.safeFormatter(errorMessage));
     }
 
     return responseBody;
@@ -85,7 +90,7 @@ public static <T> String createStringEntity(T body, MediaType contentType) throw
       return body.toString();
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter("Only xml and json conversions are currently supported"));
+          StringProcessor.safeFormatter(errorMessage));
     }
   }
 
@@ -130,7 +135,7 @@ public static <T> T deserializeResponse(HttpResponse<String> message, MediaType
       return deserializeJson(message, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter("Only xml and json conversions are currently supported"));
+          StringProcessor.safeFormatter(errorMessage));
     }
   }
 

From e001d65879f27d1d670d85dc4f176703ff935e92 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Mon, 13 Sep 2021 11:12:40 -0500
Subject: [PATCH 09/11] comment rewrite

---
 .../magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
index 33f72e9db..d9a660d92 100644
--- a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
+++ b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
@@ -73,7 +73,7 @@ public static <T> T getResponseBody(HttpResponse<String> response, MediaType con
   }
 
   /**
-   * Create string entity string entity.
+   * Create a string entity.
    *
    * @param <T>         the type parameter
    * @param body        the body

From 380722b965495d8cf8e95ce658a2717159cf5cc9 Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Mon, 13 Sep 2021 14:33:05 -0500
Subject: [PATCH 10/11] changed message variable name

---
 .../webservices/jdk11/WebServiceUtilities.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
index d9a660d92..8aa098545 100644
--- a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
+++ b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
@@ -30,7 +30,7 @@ public class WebServiceUtilities {
   /**
    * Error exception message.
    */
-  private static final String errorMessage = "Only xml and json conversions are currently supported";
+  private static final String message = "Only xml and json conversions are currently supported";
 
   /**
    * private class constructor.
@@ -66,7 +66,7 @@ public static <T> T getResponseBody(HttpResponse<String> response, MediaType con
       responseBody = deserializeXml(response, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(errorMessage));
+          StringProcessor.safeFormatter(message));
     }
 
     return responseBody;
@@ -90,7 +90,7 @@ public static <T> String createStringEntity(T body, MediaType contentType) throw
       return body.toString();
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(errorMessage));
+          StringProcessor.safeFormatter(message));
     }
   }
 
@@ -121,21 +121,21 @@ public static <T> String serializeXml(T body) throws JsonProcessingException {
   /**
    * Deserialize the response based on the media type.
    * @param <T>         the type parameter
-   * @param message the String Http Response message
+   * @param response the String Http Response message
    * @param mediaType the type the message is going to be turned into
    * @param type the class or java object to be transferred into
    * @return the response type
    * @throws IOException the io exception
    */
-  public static <T> T deserializeResponse(HttpResponse<String> message, MediaType mediaType, Type type)
+  public static <T> T deserializeResponse(HttpResponse<String> response, MediaType mediaType, Type type)
       throws IOException {
     if (mediaType.equals(MediaType.APP_XML)) {
-      return deserializeXml(message, type);
+      return deserializeXml(response, type);
     } else if (mediaType.equals(MediaType.APP_JSON)) {
-      return deserializeJson(message, type);
+      return deserializeJson(response, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(errorMessage));
+          StringProcessor.safeFormatter(message));
     }
   }
 

From 21396ac9a8620ac49c36a8569b84382ffc7f32ec Mon Sep 17 00:00:00 2001
From: Jon Reding <jonr@magenic.com>
Date: Mon, 13 Sep 2021 14:48:06 -0500
Subject: [PATCH 11/11] changed message variable name

---
 .../jmaqs/webservices/jdk11/WebServiceUtilities.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
index 8aa098545..b2a4c85ef 100644
--- a/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
+++ b/jmaqs-webservices-jdk11/src/main/java/com/magenic/jmaqs/webservices/jdk11/WebServiceUtilities.java
@@ -30,7 +30,7 @@ public class WebServiceUtilities {
   /**
    * Error exception message.
    */
-  private static final String message = "Only xml and json conversions are currently supported";
+  private static final String EXCEPTION_MESSAGE = "Only xml and json conversions are currently supported";
 
   /**
    * private class constructor.
@@ -66,7 +66,7 @@ public static <T> T getResponseBody(HttpResponse<String> response, MediaType con
       responseBody = deserializeXml(response, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(message));
+          StringProcessor.safeFormatter(EXCEPTION_MESSAGE));
     }
 
     return responseBody;
@@ -90,7 +90,7 @@ public static <T> String createStringEntity(T body, MediaType contentType) throw
       return body.toString();
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(message));
+          StringProcessor.safeFormatter(EXCEPTION_MESSAGE));
     }
   }
 
@@ -135,7 +135,7 @@ public static <T> T deserializeResponse(HttpResponse<String> response, MediaType
       return deserializeJson(response, type);
     } else {
       throw new IllegalArgumentException(
-          StringProcessor.safeFormatter(message));
+          StringProcessor.safeFormatter(EXCEPTION_MESSAGE));
     }
   }