From 8c86de79d9b531585051e9c3914769ccf18f5540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branislav=20Bedn=C3=A1r?=
 <60175324+branislavbednar@users.noreply.github.com>
Date: Tue, 9 Jan 2024 08:01:31 +0100
Subject: [PATCH] AUTOPAY-26733: Add Servlet-friendly methods to
 http-signatures library (#66)

* AUTOPAY-26733: Add Servlet-friendly methods to http-signatures library

* AUTOPAY-26733: Add Servlet-friendly methods to http-signatures library

* AUTOPAY-26733: Add Servlet-friendly methods to http-signatures library

License header updated

* AUTOPAY-26733: Add Servlet-friendly methods to http-signatures library

JavaDoc and Readme updated

---------

Co-authored-by: Robert Borys <robert.borys@visma.com>
---
 Jenkinsfile                                   |   2 +-
 LICENSE                                       |   2 +-
 README.md                                     |   6 ++
 pom.xml                                       |   2 +-
 .../autopay/http/digest/DigestAlgorithm.java  |   2 +-
 .../autopay/http/digest/DigestCalculator.java |   2 +-
 .../autopay/http/digest/DigestException.java  |   2 +-
 .../autopay/http/digest/DigestHeaders.java    |   2 +-
 .../autopay/http/digest/DigestVerifier.java   |   2 +-
 .../http/signature/CheckedFunction.java       |   2 +-
 .../autopay/http/signature/Component.java     |   2 +-
 .../http/signature/ComponentFactory.java      |   2 +-
 .../autopay/http/signature/DataSigner.java    |   2 +-
 .../autopay/http/signature/DataVerifier.java  |   2 +-
 .../http/signature/DerivedComponent.java      |   2 +-
 .../http/signature/DerivedComponentType.java  |   2 +-
 .../signature/EllipticCurveValidator.java     |   2 +-
 .../http/signature/HeaderComponent.java       |   2 +-
 .../autopay/http/signature/PublicKeyInfo.java |   2 +-
 .../http/signature/SignatureAlgorithm.java    |   2 +-
 .../http/signature/SignatureComponents.java   |   2 +-
 .../http/signature/SignatureContext.java      | 101 +++++++++++++++++-
 .../http/signature/SignatureException.java    |   2 +-
 .../http/signature/SignatureHeaders.java      |   2 +-
 .../http/signature/SignatureKeyAlgorithm.java |   2 +-
 .../http/signature/SignatureKeyFactory.java   |   2 +-
 .../signature/SignatureParameterType.java     |   2 +-
 .../http/signature/SignatureParameters.java   |   2 +-
 .../http/signature/SignatureResult.java       |   2 +-
 .../http/signature/SignatureSigner.java       |   2 +-
 .../autopay/http/signature/SignatureSpec.java |   2 +-
 .../http/signature/SignatureVerifier.java     |   2 +-
 .../http/signature/VerificationSpec.java      |   2 +-
 .../http/structured/CharacterValidator.java   |   2 +-
 .../http/structured/StructuredBoolean.java    |   2 +-
 .../http/structured/StructuredBytes.java      |   2 +-
 .../http/structured/StructuredCollection.java |   2 +-
 .../http/structured/StructuredDecimal.java    |   2 +-
 .../http/structured/StructuredDictionary.java |   2 +-
 .../http/structured/StructuredException.java  |   2 +-
 .../http/structured/StructuredField.java      |   2 +-
 .../http/structured/StructuredInnerList.java  |   2 +-
 .../http/structured/StructuredInteger.java    |   2 +-
 .../http/structured/StructuredItem.java       |   2 +-
 .../http/structured/StructuredList.java       |   2 +-
 .../http/structured/StructuredMap.java        |   2 +-
 .../http/structured/StructuredParameters.java |   2 +-
 .../http/structured/StructuredParser.java     |   2 +-
 .../http/structured/StructuredString.java     |   2 +-
 .../http/structured/StructuredToken.java      |   2 +-
 .../http/digest/DigestCalculatorTest.java     |   2 +-
 .../http/digest/DigestVerifierTest.java       |   2 +-
 .../http/signature/DataSignerTest.java        |   2 +-
 .../http/signature/DataVerifierTest.java      |   2 +-
 .../autopay/http/signature/ObjectMother.java  |   2 +-
 .../http/signature/PublicKeyInfoTest.java     |   2 +-
 .../SignatureBaseSpecificationTest.java       |   2 +-
 .../signature/SignatureComponentsTest.java    |   2 +-
 .../http/signature/SignatureContextTest.java  |  99 ++++++++++++++++-
 .../signature/SignatureParameterTypeTest.java |   2 +-
 .../http/signature/SignatureResultTest.java   |   2 +-
 .../http/signature/SignatureSignerTest.java   |   2 +-
 .../http/signature/SignatureSpecTest.java     |   2 +-
 .../signature/SignatureSpecificationTest.java |   2 +-
 .../http/signature/SignatureVerifierTest.java |   2 +-
 .../http/signature/VerificationSpecTest.java  |   2 +-
 .../autopay/http/structured/MapUtil.java      |   2 +-
 .../structured/StructuredBooleanTest.java     |   2 +-
 .../http/structured/StructuredBytesTest.java  |   2 +-
 .../structured/StructuredDecimalTest.java     |   2 +-
 .../structured/StructuredDictionaryTest.java  |   2 +-
 .../structured/StructuredInnerListTest.java   |   2 +-
 .../structured/StructuredIntegerTest.java     |   2 +-
 .../http/structured/StructuredItemTest.java   |   2 +-
 .../http/structured/StructuredListTest.java   |   2 +-
 .../structured/StructuredParametersTest.java  |   2 +-
 .../http/structured/StructuredParserTest.java |   2 +-
 .../http/structured/StructuredStringTest.java |   2 +-
 .../http/structured/StructuredTokenTest.java  |   2 +-
 .../spec/StructuredSpecificationTest.java     |   2 +-
 .../http/structured/spec/TestRecord.java      |   2 +-
 .../structured/spec/TestRecordMapper.java     |   2 +-
 82 files changed, 283 insertions(+), 81 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ae3c38..2943dfc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE b/LICENSE
index 54f8ab2..9d1a734 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2023 Visma Autopay AS
+Copyright (c) 2022-2024 Visma Autopay AS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index c9233c4..e862632 100644
--- a/README.md
+++ b/README.md
@@ -254,6 +254,8 @@ var requestContext = SignatureContext.builder()
         .method("POST")
         // Can be provided as a String or URI
         .targetUri("https://example.com/foo")
+        // Or from HttpServletRequest object
+        .targetUri(request.getRequestURL(), request.getQueryString())
         // Status for response signature
         .status(200)
 
@@ -264,6 +266,10 @@ var requestContext = SignatureContext.builder()
         .headers(Map.of("Header-One", "valueOne", "Header-Two", "valueTwo"))
         // Or as a "MultivaluedMap", often used in frameworks
         .headers(Map.of("Header-One", List.of("valueOne", "valueTwo")))
+        // Or from HttpServletRequest object
+        .headers(request.getHeaderNames(), request::getHeaders)
+        // Or from HttpServletResponse object
+        .headers(response.getHeaderNames(), response::getHeaders)
 
         // Context of related request if used in response signature
         .relatedRequest(relatedRequestContext)
diff --git a/pom.xml b/pom.xml
index 7da08c1..5e459bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2022-2023 Visma Autopay AS
+  Copyright (c) 2022-2024 Visma Autopay AS
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/digest/DigestAlgorithm.java b/src/main/java/net/visma/autopay/http/digest/DigestAlgorithm.java
index 9745c63..f62d12e 100644
--- a/src/main/java/net/visma/autopay/http/digest/DigestAlgorithm.java
+++ b/src/main/java/net/visma/autopay/http/digest/DigestAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/digest/DigestCalculator.java b/src/main/java/net/visma/autopay/http/digest/DigestCalculator.java
index 689dd10..2a4ea49 100644
--- a/src/main/java/net/visma/autopay/http/digest/DigestCalculator.java
+++ b/src/main/java/net/visma/autopay/http/digest/DigestCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/digest/DigestException.java b/src/main/java/net/visma/autopay/http/digest/DigestException.java
index e07080a..988d3da 100644
--- a/src/main/java/net/visma/autopay/http/digest/DigestException.java
+++ b/src/main/java/net/visma/autopay/http/digest/DigestException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/digest/DigestHeaders.java b/src/main/java/net/visma/autopay/http/digest/DigestHeaders.java
index 7373ecf..85db222 100644
--- a/src/main/java/net/visma/autopay/http/digest/DigestHeaders.java
+++ b/src/main/java/net/visma/autopay/http/digest/DigestHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/digest/DigestVerifier.java b/src/main/java/net/visma/autopay/http/digest/DigestVerifier.java
index 941e80d..5e661da 100644
--- a/src/main/java/net/visma/autopay/http/digest/DigestVerifier.java
+++ b/src/main/java/net/visma/autopay/http/digest/DigestVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/CheckedFunction.java b/src/main/java/net/visma/autopay/http/signature/CheckedFunction.java
index d057318..0cb690f 100644
--- a/src/main/java/net/visma/autopay/http/signature/CheckedFunction.java
+++ b/src/main/java/net/visma/autopay/http/signature/CheckedFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/Component.java b/src/main/java/net/visma/autopay/http/signature/Component.java
index 0f807de..e7fb62d 100644
--- a/src/main/java/net/visma/autopay/http/signature/Component.java
+++ b/src/main/java/net/visma/autopay/http/signature/Component.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/ComponentFactory.java b/src/main/java/net/visma/autopay/http/signature/ComponentFactory.java
index a4e57a9..84684a5 100644
--- a/src/main/java/net/visma/autopay/http/signature/ComponentFactory.java
+++ b/src/main/java/net/visma/autopay/http/signature/ComponentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/DataSigner.java b/src/main/java/net/visma/autopay/http/signature/DataSigner.java
index 3d51160..dbea10c 100644
--- a/src/main/java/net/visma/autopay/http/signature/DataSigner.java
+++ b/src/main/java/net/visma/autopay/http/signature/DataSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/DataVerifier.java b/src/main/java/net/visma/autopay/http/signature/DataVerifier.java
index f7f8a21..ab5649a 100644
--- a/src/main/java/net/visma/autopay/http/signature/DataVerifier.java
+++ b/src/main/java/net/visma/autopay/http/signature/DataVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/DerivedComponent.java b/src/main/java/net/visma/autopay/http/signature/DerivedComponent.java
index 0831f99..247bf28 100644
--- a/src/main/java/net/visma/autopay/http/signature/DerivedComponent.java
+++ b/src/main/java/net/visma/autopay/http/signature/DerivedComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/DerivedComponentType.java b/src/main/java/net/visma/autopay/http/signature/DerivedComponentType.java
index a27a1e4..dd16811 100644
--- a/src/main/java/net/visma/autopay/http/signature/DerivedComponentType.java
+++ b/src/main/java/net/visma/autopay/http/signature/DerivedComponentType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/EllipticCurveValidator.java b/src/main/java/net/visma/autopay/http/signature/EllipticCurveValidator.java
index a0bacda..692f511 100644
--- a/src/main/java/net/visma/autopay/http/signature/EllipticCurveValidator.java
+++ b/src/main/java/net/visma/autopay/http/signature/EllipticCurveValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/HeaderComponent.java b/src/main/java/net/visma/autopay/http/signature/HeaderComponent.java
index 4b77f73..b7e0f7c 100644
--- a/src/main/java/net/visma/autopay/http/signature/HeaderComponent.java
+++ b/src/main/java/net/visma/autopay/http/signature/HeaderComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/PublicKeyInfo.java b/src/main/java/net/visma/autopay/http/signature/PublicKeyInfo.java
index d8e4269..b222772 100644
--- a/src/main/java/net/visma/autopay/http/signature/PublicKeyInfo.java
+++ b/src/main/java/net/visma/autopay/http/signature/PublicKeyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureAlgorithm.java b/src/main/java/net/visma/autopay/http/signature/SignatureAlgorithm.java
index b4e64bc..3e71201 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureAlgorithm.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureComponents.java b/src/main/java/net/visma/autopay/http/signature/SignatureComponents.java
index e3f43e8..64319d9 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureComponents.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureComponents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureContext.java b/src/main/java/net/visma/autopay/http/signature/SignatureContext.java
index 1d6020e..1834aee 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureContext.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,13 @@
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -162,6 +165,8 @@ public Builder method(String method) {
 
         /**
          * Sets target URI
+         * <p>
+         * {@code targetUri} is not the same as servlet's {@code requestUri}
          *
          * @param targetUri Target URI given as {@link URI} object
          * @return This builder
@@ -173,6 +178,8 @@ public Builder targetUri(URI targetUri) {
 
         /**
          * Sets target URI
+         * <p>
+         * {@code targetUri} is not the same as servlet's {@code requestUri}.
          *
          * @param targetUri Target URI given as {@link String}
          * @return This builder
@@ -182,6 +189,38 @@ public Builder targetUri(String targetUri) {
             return this;
         }
 
+        /**
+         * Sets target URI
+         * <p>
+         * Method offers compatibility with {@code HttpServletRequest} methods.
+         * {@code targetUri} is not the same as servlet's {@code requestUri}.
+         * <p>
+         * Example:
+         * <pre>
+         * SignatureContext.builder()
+         *     ...
+         *     .targetUri(request.getRequestURL(), request.getQueryString())
+         *     ...
+         *     .build();
+         * </pre>
+         *
+         * @param requestUrl  request URL
+         * @param queryString query string
+         * @return This builder
+         */
+        @SuppressWarnings("java:S1149")
+        public Builder targetUri(StringBuffer requestUrl, String queryString) {
+            var targetUriTmp = requestUrl.toString();
+
+            if (queryString != null) {
+                targetUriTmp += "?" + queryString;
+            }
+
+            this.targetUri = URI.create(targetUriTmp);
+
+            return this;
+        }
+
         /**
          * Adds an HTTP header of given name and value
          * <p>
@@ -220,6 +259,66 @@ public Builder headers(Map<String, ?> headers) {
             return this;
         }
 
+        /**
+         * Adds HTTP headers.
+         * <p>
+         * Method offers compatibility with {@code HttpServletRequest} methods.
+         * <p>
+         * Example:
+         * <pre>
+         * SignatureContext.builder()
+         *     ...
+         *     .headers(request.getHeaderNames(), request::getHeaders)
+         *     ...
+         *     .build();
+         * </pre>
+         *
+         * @param headerNames   enumeration of HTTP servlet request header names
+         * @param headersGetter getter of HTTP servlet request headers enumeration
+         * @return This builder
+         */
+        public Builder headers(Enumeration<String> headerNames, Function<String, Enumeration<String>> headersGetter) {
+            while (headerNames.hasMoreElements()) {
+                var headerName = headerNames.nextElement();
+                var headerValues = headersGetter.apply(headerName);
+
+                while (headerValues.hasMoreElements()) {
+                    populateHeaderOrTrailer(headers, headerName, headerValues.nextElement());
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Adds HTTP headers.
+         * <p>
+         * Method offers compatibility with {@code HttpServletResponse} methods.
+         * <p>
+         * Example:
+         * <pre>
+         * SignatureContext.builder()
+         *     ...
+         *     .headers(response.getHeaderNames(), response::getHeaders)
+         *     ...
+         *     .build();
+         * </pre>
+         *
+         * @param headerNames   collection of HTTP servlet response header names
+         * @param headersGetter getter of HTTP servlet response headers collection
+         * @return This builder
+         */
+        public Builder headers(Collection<String> headerNames, Function<String, Collection<String>> headersGetter) {
+            for (String headerName : headerNames) {
+                var headerValues = headersGetter.apply(headerName);
+
+                for (String headerValue : headerValues) {
+                    populateHeaderOrTrailer(headers, headerName, headerValue);
+                }
+            }
+
+            return this;
+        }
+
         /**
          * Adds an HTTP trailer of given name and value
          * <p>
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureException.java b/src/main/java/net/visma/autopay/http/signature/SignatureException.java
index cc50394..a34f20f 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureException.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureHeaders.java b/src/main/java/net/visma/autopay/http/signature/SignatureHeaders.java
index 8ded2c5..b9b5898 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureHeaders.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureKeyAlgorithm.java b/src/main/java/net/visma/autopay/http/signature/SignatureKeyAlgorithm.java
index 5ad3cb2..ac4cfd9 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureKeyAlgorithm.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureKeyAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureKeyFactory.java b/src/main/java/net/visma/autopay/http/signature/SignatureKeyFactory.java
index e12d0cd..626db02 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureKeyFactory.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureParameterType.java b/src/main/java/net/visma/autopay/http/signature/SignatureParameterType.java
index b1d57cb..0660523 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureParameterType.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureParameterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureParameters.java b/src/main/java/net/visma/autopay/http/signature/SignatureParameters.java
index b2e95de..3ce9000 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureParameters.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureResult.java b/src/main/java/net/visma/autopay/http/signature/SignatureResult.java
index d3e3a26..bc5a7e7 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureResult.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureSigner.java b/src/main/java/net/visma/autopay/http/signature/SignatureSigner.java
index efb22f3..1cdf18d 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureSigner.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureSpec.java b/src/main/java/net/visma/autopay/http/signature/SignatureSpec.java
index 3515f4e..2bfead1 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureSpec.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/SignatureVerifier.java b/src/main/java/net/visma/autopay/http/signature/SignatureVerifier.java
index 015fb19..49a065b 100644
--- a/src/main/java/net/visma/autopay/http/signature/SignatureVerifier.java
+++ b/src/main/java/net/visma/autopay/http/signature/SignatureVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/signature/VerificationSpec.java b/src/main/java/net/visma/autopay/http/signature/VerificationSpec.java
index a0793f4..21f4ab0 100644
--- a/src/main/java/net/visma/autopay/http/signature/VerificationSpec.java
+++ b/src/main/java/net/visma/autopay/http/signature/VerificationSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/CharacterValidator.java b/src/main/java/net/visma/autopay/http/structured/CharacterValidator.java
index 312da8c..9767eba 100644
--- a/src/main/java/net/visma/autopay/http/structured/CharacterValidator.java
+++ b/src/main/java/net/visma/autopay/http/structured/CharacterValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredBoolean.java b/src/main/java/net/visma/autopay/http/structured/StructuredBoolean.java
index 0797179..ce7b8a1 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredBoolean.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredBytes.java b/src/main/java/net/visma/autopay/http/structured/StructuredBytes.java
index 84ba6a0..bfa4244 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredBytes.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredBytes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredCollection.java b/src/main/java/net/visma/autopay/http/structured/StructuredCollection.java
index b1eaf8f..cad82be 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredCollection.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredDecimal.java b/src/main/java/net/visma/autopay/http/structured/StructuredDecimal.java
index 3f340ba..eda22ad 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredDecimal.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredDecimal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredDictionary.java b/src/main/java/net/visma/autopay/http/structured/StructuredDictionary.java
index c87e026..181e85d 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredDictionary.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredDictionary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredException.java b/src/main/java/net/visma/autopay/http/structured/StructuredException.java
index 6128f68..1320dd0 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredException.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredField.java b/src/main/java/net/visma/autopay/http/structured/StructuredField.java
index f0bc826..4c57d60 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredField.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredInnerList.java b/src/main/java/net/visma/autopay/http/structured/StructuredInnerList.java
index 7579a39..b35769b 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredInnerList.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredInnerList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredInteger.java b/src/main/java/net/visma/autopay/http/structured/StructuredInteger.java
index 59554bb..43d5554 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredInteger.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredItem.java b/src/main/java/net/visma/autopay/http/structured/StructuredItem.java
index 5fb6e7f..18bd7d8 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredItem.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredList.java b/src/main/java/net/visma/autopay/http/structured/StructuredList.java
index 0dacad9..a80de8e 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredList.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredMap.java b/src/main/java/net/visma/autopay/http/structured/StructuredMap.java
index 85b8847..92ed2e7 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredMap.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredParameters.java b/src/main/java/net/visma/autopay/http/structured/StructuredParameters.java
index c74e954..68060b4 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredParameters.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredParser.java b/src/main/java/net/visma/autopay/http/structured/StructuredParser.java
index b077b12..5a7978e 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredParser.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredString.java b/src/main/java/net/visma/autopay/http/structured/StructuredString.java
index 0d1b836..660bd56 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredString.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/visma/autopay/http/structured/StructuredToken.java b/src/main/java/net/visma/autopay/http/structured/StructuredToken.java
index d941598..e896623 100644
--- a/src/main/java/net/visma/autopay/http/structured/StructuredToken.java
+++ b/src/main/java/net/visma/autopay/http/structured/StructuredToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/digest/DigestCalculatorTest.java b/src/test/java/net/visma/autopay/http/digest/DigestCalculatorTest.java
index 3317f7c..30ee6b0 100644
--- a/src/test/java/net/visma/autopay/http/digest/DigestCalculatorTest.java
+++ b/src/test/java/net/visma/autopay/http/digest/DigestCalculatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/digest/DigestVerifierTest.java b/src/test/java/net/visma/autopay/http/digest/DigestVerifierTest.java
index 303c735..3f69e56 100644
--- a/src/test/java/net/visma/autopay/http/digest/DigestVerifierTest.java
+++ b/src/test/java/net/visma/autopay/http/digest/DigestVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/DataSignerTest.java b/src/test/java/net/visma/autopay/http/signature/DataSignerTest.java
index 42f5713..6634f62 100644
--- a/src/test/java/net/visma/autopay/http/signature/DataSignerTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/DataSignerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/DataVerifierTest.java b/src/test/java/net/visma/autopay/http/signature/DataVerifierTest.java
index 08f16b2..4be9171 100644
--- a/src/test/java/net/visma/autopay/http/signature/DataVerifierTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/DataVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/ObjectMother.java b/src/test/java/net/visma/autopay/http/signature/ObjectMother.java
index 1ad4231..bdf5bc7 100644
--- a/src/test/java/net/visma/autopay/http/signature/ObjectMother.java
+++ b/src/test/java/net/visma/autopay/http/signature/ObjectMother.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/PublicKeyInfoTest.java b/src/test/java/net/visma/autopay/http/signature/PublicKeyInfoTest.java
index 91dab0f..00e9df7 100644
--- a/src/test/java/net/visma/autopay/http/signature/PublicKeyInfoTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/PublicKeyInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureBaseSpecificationTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureBaseSpecificationTest.java
index 0d67446..206c32b 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureBaseSpecificationTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureBaseSpecificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureComponentsTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureComponentsTest.java
index 07ebe9e..672c86f 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureComponentsTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureComponentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureContextTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureContextTest.java
index a3c7f79..a190a08 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureContextTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,12 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -46,4 +51,96 @@ void multipleHeadersAreAdded() {
         // verify
         assertThat(signatureContext.getHeaders()).containsOnly(entry("header-1", List.of("one", "two")), entry("header-2", List.of("", "xx", "yy")));
     }
+
+    @Test
+    void signatureContextCreatedFromHttpServletRequest() {
+        // setup
+        HttpServletRequestStub request = new HttpServletRequestStub(new StringBuffer("http://localhost"), "country=NO");
+        request.addHttpHeaders("header1", List.of("header1Value1", "header1Value2"));
+        request.addHttpHeaders("header2", List.of("header2Value"));
+
+        // execute
+        var signatureContext = SignatureContext.builder()
+                .headers(request.getHeaderNames(), request::getHeaders)
+                .targetUri(request.getRequestUrl(), request.getQueryString())
+                .build();
+
+        // verify
+        assertThat(signatureContext.getHeaders()).containsOnly(
+                entry("header1", List.of("header1Value1", "header1Value2")), entry("header2", List.of("header2Value")));
+        assertThat(signatureContext.getTargetUri()).isNotNull();
+        assertThat(signatureContext.getTargetUri()).hasToString("http://localhost?country=NO");
+    }
+
+    @Test
+    void signatureContextCreatedFromHttpServletResponse() {
+        HttpServletResponseStub response = new HttpServletResponseStub();
+        response.addHttpHeaders("header1", List.of("header1Value1", "header1Value2"));
+        response.addHttpHeaders("header2", List.of("header2Value"));
+
+        // execute
+        var signatureContext = SignatureContext.builder()
+                .headers(response.getHeaderNames(), response::getHeaders)
+                .build();
+
+        // verify
+        assertThat(signatureContext.getHeaders()).containsOnly(
+                entry("header1", List.of("header1Value1", "header1Value2")), entry("header2", List.of("header2Value")));
+    }
+
+    private static class HttpServletRequestStub {
+
+        private final StringBuffer requestUrl;
+        private final String queryString;
+        private final Map<String, List<String>> httpHeaders = new HashMap<>();
+        private final List<String> headerNames = new ArrayList<>();
+
+        public HttpServletRequestStub(StringBuffer requestUrl, String queryString) {
+            this.requestUrl = requestUrl;
+            this.queryString = queryString;
+        }
+
+        public void addHttpHeaders(String headerName, List<String> headerValues) {
+            this.headerNames.add(headerName);
+            this.httpHeaders.put(headerName, headerValues);
+        }
+
+        public Enumeration<String> getHeaderNames() {
+            return Collections.enumeration(this.headerNames);
+        }
+
+        public Enumeration<String> getHeaders(String name) {
+            return Collections.enumeration(this.httpHeaders.get(name));
+        }
+
+        public StringBuffer getRequestUrl() {
+            return this.requestUrl;
+        }
+
+        public String getQueryString() {
+            return this.queryString;
+        }
+    }
+
+    private static class HttpServletResponseStub {
+
+        private final Map<String, List<String>> httpHeaders = new HashMap<>();
+        private final List<String> headerNames = new ArrayList<>();
+
+        public HttpServletResponseStub() {
+        }
+
+        public Collection<String> getHeaderNames() {
+            return this.headerNames;
+        }
+
+        public Collection<String> getHeaders(String name) {
+            return this.httpHeaders.get(name);
+        }
+
+        public void addHttpHeaders(String headerName, List<String> headerValues) {
+            this.headerNames.add(headerName);
+            this.httpHeaders.put(headerName, headerValues);
+        }
+    }
 }
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureParameterTypeTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureParameterTypeTest.java
index 07fc879..eab52a8 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureParameterTypeTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureParameterTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureResultTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureResultTest.java
index 3566aae..d6fa17e 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureResultTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureSignerTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureSignerTest.java
index e0beff8..4750886 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureSignerTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureSignerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureSpecTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureSpecTest.java
index 09da23d..c13fefa 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureSpecTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureSpecificationTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureSpecificationTest.java
index 8c5ad7a..726c294 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureSpecificationTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureSpecificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/SignatureVerifierTest.java b/src/test/java/net/visma/autopay/http/signature/SignatureVerifierTest.java
index da26fdf..fc8115d 100644
--- a/src/test/java/net/visma/autopay/http/signature/SignatureVerifierTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/SignatureVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/signature/VerificationSpecTest.java b/src/test/java/net/visma/autopay/http/signature/VerificationSpecTest.java
index cd8d343..54a9920 100644
--- a/src/test/java/net/visma/autopay/http/signature/VerificationSpecTest.java
+++ b/src/test/java/net/visma/autopay/http/signature/VerificationSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/MapUtil.java b/src/test/java/net/visma/autopay/http/structured/MapUtil.java
index 0a8e60e..16ef3ad 100644
--- a/src/test/java/net/visma/autopay/http/structured/MapUtil.java
+++ b/src/test/java/net/visma/autopay/http/structured/MapUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredBooleanTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredBooleanTest.java
index 872396f..de74ed2 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredBooleanTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredBooleanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredBytesTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredBytesTest.java
index 4bb0be7..1ff1c5b 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredBytesTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredBytesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredDecimalTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredDecimalTest.java
index dda86dc..a8875d5 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredDecimalTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredDecimalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredDictionaryTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredDictionaryTest.java
index 7d8f9fd..8ecd27a 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredDictionaryTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredDictionaryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredInnerListTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredInnerListTest.java
index 532e048..ea764ee 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredInnerListTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredInnerListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredIntegerTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredIntegerTest.java
index 26fd12a..e545f75 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredIntegerTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredIntegerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredItemTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredItemTest.java
index 7107d82..f20f824 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredItemTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredItemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredListTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredListTest.java
index 52d0fe5..c09cb2b 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredListTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredParametersTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredParametersTest.java
index 585a6ae..806efa9 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredParametersTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredParserTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredParserTest.java
index 81b1d91..e7ae522 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredParserTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredStringTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredStringTest.java
index a1f071d..117d6cd 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredStringTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/StructuredTokenTest.java b/src/test/java/net/visma/autopay/http/structured/StructuredTokenTest.java
index d0f7f80..b33d0b3 100644
--- a/src/test/java/net/visma/autopay/http/structured/StructuredTokenTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/StructuredTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/spec/StructuredSpecificationTest.java b/src/test/java/net/visma/autopay/http/structured/spec/StructuredSpecificationTest.java
index bca2905..5debe4a 100644
--- a/src/test/java/net/visma/autopay/http/structured/spec/StructuredSpecificationTest.java
+++ b/src/test/java/net/visma/autopay/http/structured/spec/StructuredSpecificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/spec/TestRecord.java b/src/test/java/net/visma/autopay/http/structured/spec/TestRecord.java
index 81d7c57..8712075 100644
--- a/src/test/java/net/visma/autopay/http/structured/spec/TestRecord.java
+++ b/src/test/java/net/visma/autopay/http/structured/spec/TestRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/test/java/net/visma/autopay/http/structured/spec/TestRecordMapper.java b/src/test/java/net/visma/autopay/http/structured/spec/TestRecordMapper.java
index 3072a7f..2f00451 100644
--- a/src/test/java/net/visma/autopay/http/structured/spec/TestRecordMapper.java
+++ b/src/test/java/net/visma/autopay/http/structured/spec/TestRecordMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Visma Autopay AS
+ * Copyright (c) 2022-2024 Visma Autopay AS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal