Changed the core version number in the pom.xml. Removed some comments…

… now that we've reviewed the code.

pom.xml

@@ -16,7 +16,7 @@
        release branch is labeled <major>.<minor>.<patch>-izgw-core-SNAPSHOT 
        main branch is labeled <major>.<minor>.<patch>-izgw-core-RELEASE 
   -->
-  <version>2.2.0-IGDD-1765_optional_mtls_plus_jwt-SNAPSHOT</version>
+  <version>2.1.5-IGDD-1765_optional_mtls_plus_jwt-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>IZ Gateway Core 2.0</name>
   <description>IZ Gateway Core contains the core code for the IZ Gateway Hub and Transformation services</description>

src/main/java/gov/cdc/izgateway/logging/info/EndPointInfo.java

@@ -46,10 +46,6 @@ public abstract class EndPointInfo extends HostInfo implements Serializable {
     @JsonProperty
     protected String organization;
 
-    /*
-        TODO: Discuss during code review.  serialNumber changes to String because info
-              in the JWT that we use for serialNumber is not always a number.
-     */
     @Schema(description="The serial number associated with the with certificate on the endpoint.")
     @JsonProperty
     protected String serialNumber;

src/main/java/gov/cdc/izgateway/security/AccessControlValve.java

@@ -120,7 +120,7 @@ public boolean accessAllowed(HttpServletRequest req, HttpServletResponse resp) {
         if (Boolean.FALSE.equals(check)) {  // NOSONAR Null is still possible here, SONAR flags it as always true
 	        log.error("Access denied to protected URL {} address by {} at {}", path, user, host);
 	        resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-	        return false; // TODO: PCahill - discuss at code review - I assume this should be false here
+	        return false;
         } 
 
         if (isSwagger(path, user)) {

src/main/java/gov/cdc/izgateway/soap/net/MessageSender.java

@@ -508,10 +508,7 @@ public static void logDestinationCertificates(HttpURLConnection con) {
 		if (destination.isConnected() && con instanceof HttpsURLConnection conx) {
 			try {
 				X509Certificate[] certs = (X509Certificate[]) conx.getServerCertificates();
-                // TODO Paul - Principal related code
-                // need to fix this - may need to break out source and destination info because destination won't have a principal'
 				destination.setCertificate(certs[0]);
-                // destination.setPrincipal(RequestContext.getPrincipal());
 				destination.setCipherSuite(conx.getCipherSuite());
 				destination.setConnected(true);
 			} catch (SSLPeerUnverifiedException | IllegalStateException ex) {