Merge pull request #63 from jonathannewman/PE-38702/main/add-reused-code

(PE-38702) consolidate reused code

.github/workflows/mend.yml

@@ -13,18 +13,18 @@ jobs:
       with:
         service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
     - name: checkout repo content
-      uses: actions/checkout@v2 # checkout the repository content to github runner.
+      uses: actions/checkout@v4 # checkout the repository content to github runner.
       with:
         fetch-depth: 1
     # install java which is required for mend and clojure
     - name: setup java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 17
     # install clojure tools
     - name: Install Clojure tools
-      uses: DeLaGuardo/setup-clojure@10.1
+      uses: DeLaGuardo/setup-clojure@12.5
       with:
         # Install just one or all simultaneously
         # The value must indicate a particular version of the tool, or use 'latest'

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.0.2
+* update to clj parent 7.3.31
+* optimize the `wrap-uncaught-errors` to avoid anonymous functions, and ensure streams are closed
+* add new wrappers: 
+  * `wrap-accepts-content-type`
+  * `wrap-accepts-json`
+  * `wrap-content-type`
+  * `wrap-content-type-json`
+  * `wrap-json-parse-exception-handler`
+
 # 2.0.1
 * Updates tk-jetty-10 to 1.0.7 which includes a fix for ring handler's getRequestCharacterEncoding() function.
 

README.md

@@ -321,6 +321,55 @@ Returns valid [`ResponseType`](#schemas)s, eg:
 ```clj
 (wrap-uncaught-errors handler :plain)
 ```
+### wrap-accepts-content-type
+```clj
+(wrap-accepts-content-type handler content-type)
+```
+Returns a wrapper that evaluates the accept header of the incoming request and validate that it accepts a type
+that this endpoint will produce.
+
+For example, if the endpoint will accept json
+```clj
+(wrap-accepts-content-type handler "application/json")
+```
+
+If the request supplies a result with `text/plain` a `406 not-acceptable` error will be returned
+
+### wrap-accepts-json
+```clj
+(wrap-accepts-json handler)
+```
+Returns a wrapper that evaluates the accept header of the incoming request and validates
+that it matches `application/json`
+
+If it doesn't, a response with a `406 not acceptable` is returned.
+
+### wrap-content-type
+```clj
+(wrap-content-type handler <sequence of content types>)
+```
+
+Ensure that the content type of the body of the incoming request matches the acceptable
+content types this endpoint supports.
+For example:
+```clj
+(wrap-content-type handler [json-encoding-type])
+```
+If the content type is not matched, a `415 Unsupported Media Type` is returned.
+
+### wrap-content-type-json
+```clj
+(wrap-content-type-json handler)
+```
+Ensure that the content type of the body of the incoming request matches the a json type.
+If the content type is not matched, a `415 Unsupported Media Type` is returned.
+
+### wrap-json-parse-exception-handler
+```clj
+(wrap-json-parse-exception-handler handler)
+```
+Ensure that if a JsonParseException is thrown while the handler is being executed, an 
+appropriate error is returned.  a `400 Bad Request` with appropriate messaging will be returned.
 
 ## Support
 

dev-resources/config/jetty/ssl/certs/ca.pem

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+wl8jJh/tD/b9
 -----END CERTIFICATE-----

dev-resources/config/jetty/ssl/certs/localhost.pem

@@ -1,25 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEJzCCAg8CCQD1LykrEEjpTzANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCT1IxETAPBgNVBAcMCFBvcnRsYW5kMRQwEgYDVQQKDAtQdXBw
-ZXQsIEluYzEPMA0GA1UEAwwGcHVwcGV0MB4XDTE5MDYxMDIwNTYxNloXDTI0MDYw
-ODIwNTYxNlowVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk9SMREwDwYDVQQHDAhQ
-b3J0bGFuZDEUMBIGA1UECgwLUHVwcGV0LCBJbmMxEjAQBgNVBAMMCWxvY2FsaG9z
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK57VOCcL3c6uQk/mhnH
-b5OOMdGQaIF4nSiEKlMxIDeL7jKqPCx+QPXnvr/eCSXwW2oSIoXEGLJZHwi5/8pC
-H0xILMZas9XzgDBpvuMxbwHQtkaBg6ok7OU0h2KTY01V7kQeWNu4+4wut8XBbAzH
-58P7X+pgrkkMXFXyW5bVVgBrXQVA+oC4990+LsrPGRi3dYO+wbU9QiIy0WnNqCc/
-WnZ/c/pcCkCNlsZmlYspfnsKrRUW8+qzx0Ei1zyxRLdgg0RzLZe3uGh+MszkIEXY
-w2UG1RliZZdvsJ2osKeUDN6jUcYKhsxdOVWI7LMfz5T4eX8sjjGC4aF2JwXAXdfB
-hMkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAWu7qoX1JbihvKMks7TjBaGnellZq
-4fT1omO5+NZAfc2xW8Xez0lB0gzPPEEtCPuULivtwwmqQriTO7IJ8ZtpjHGwzrEF
-RWdrmeHQSF9PZNrZocV8WYWDX9liCHZrekDAWGBWtWSP3Dypmt1lILtJo4m5sJzT
-cxylSMD7+3FyHbBsvexSWoyI8kMckXIQ/SjImeJYmOHDiR7yUzpaHjvnmTuTx1sB
-NnyyG68gXj0S+SLdjY0A8LzhsvKTc850eUNYhcfEkIRQEVi6LU+uw8Hflk5O4Pf5
-ClxmsHXqobKzAkKDu1jZuolFc21w85KEA2z3lojlmhxPBh7e1zWpz6lxDXSyMD4Y
-UgS44X+vaWbN6V/Er5LGeI9WkDPwNK1s5XpJe6qsWFMEC0xoQxDojT/JzHZmPFCs
-1+j4AbPngu0GX8jab27dC/6ZuUmdO/HcIfnook8dxrZNaYnkyDzcGbm8Fhbn9QJo
-Y1wIOmwstrkdzMltkxjv+rw7HZiGxzopY+HQdjlGQGeLbSxgDwRi7hhbwUp7sGb3
-jOjnRGC+IV4+dsJyJXIR+K6RdIfYdwzTZNUFBmrdaNdxDOHPmE8ot63Ty9ixqDSw
-CaY9ZpzBYouWXwpGstfpUJSO9rHqkToIpYuDMdh77EX66oPAsXOlNN70g/s12/X+
-5NRSoyCNqrVFFQk=
+MIIEezCCAmOgAwIBAgIUJLNMHcPnF90Y6dhr39MCIhnkwiswDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk9SMREwDwYDVQQHDAhQb3J0bGFu
+ZDEUMBIGA1UECgwLUHVwcGV0LCBJbmMxDzANBgNVBAMMBnB1cHBldDAeFw0yNDA3
+MDkyMzQ3NDVaFw0yOTA3MDgyMzQ3NDVaMFcxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJPUjERMA8GA1UEBwwIUG9ydGxhbmQxFDASBgNVBAoMC1B1cHBldCwgSW5jMRIw
+EAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCs1R5uSRH5xV6qxvMiz9X7lvAxwI55nZZmgxKHZz7EqWcVtR1VKlKW4K3khGAr
+0Sm9ihpM2KvaPEhGBQq6hhLBRDMKLkt1JaUmSyTeoz2EGGYXWMLZaoFEMPlBDY2t
+Hz03CF4WSDPp8MIKW7PBwspmHdkizFrrtQqLRYDtf01w4tgMflqgwWhLVPuO2eOf
+0XmGVScRlQnAcS8WVFPAKJCstZNF3aqK5cGzhRkGeiDYqEfq29HyRbjPSO3M9vyg
+WIGSetR9DBM8VIpaGO457iEBZOGdgHqG84Ma8pjBj4pdPuTwjavh9coYQp0Tongt
+xF5Undf+fmkiPUfEVC5cZy2jAgMBAAGjQjBAMB0GA1UdDgQWBBQpfykU4gAMP6Pm
+mBsC1LUYCcM96zAfBgNVHSMEGDAWgBQu69ueqs80Ioqd8f+hI2YUdTswFDANBgkq
+hkiG9w0BAQsFAAOCAgEAeM5ME8mvkznGiepHQqDojpxaNIT9N4QDCAxW8y1LVfEF
+S2ufMva22q4loK+NJetaTNjDDv0lcCwUtdAqGQxngrSW8mmVL3qZrm/fFKDsRp0T
+7r7qp0+nZIM+QkovxqPvDO39G70yKATOeXo5ureUK7bbXoU3h8SuPjZNT58XMjKN
+VDZ7f70ejaxjA45wU8jJ2kkotm62jyY7Osh5hA4doE6zLhGYrZZLoE6+kHTiTW1x
+UVnLcm0+MHBGFtydnK3BnnB4muWlWJggJhsmvOxTXK4kuIt1SMxp4fI4F21A/FUi
+qnVG9+pJ/+bm3vFAH5a+fxy/1Jq3yEgKKmn/bVRc+1cP0zgNMFSx7IvC+h2AgbpL
+74lMKd74a5YqbnQraV0FGVY2q0b9W7Ce95kOm//aoFtlxGiAnftwwuFgzOe/pIdb
+r0AtiNkzfBOvqnXAwTHBU16042LtD9kO4aNjw7E2C7E8v5IyUwrYQxBM9pcj0waB
+PvjaT6aVrepQl5+17YzuQGd9YaTucS2ikGMJCQuaFY6ZupNZsQY3AeD8FKWkAgLU
+lKEBbbNZlCLmHBIxk/DGUyiBy6Q3BsBMivOzdWDpkhnHwhwpumFPJCF8yh9BXeba
+Xu89BP1D0Dme9r0dD4daCsa9UOqkmaSELd9c8sstojcRK7rD0tCBQI8fFzdwGNo=
 -----END CERTIFICATE-----

dev-resources/config/jetty/ssl/private_keys/localhost.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEArntU4Jwvdzq5CT+aGcdvk44x0ZBogXidKIQqUzEgN4vuMqo8
-LH5A9ee+v94JJfBbahIihcQYslkfCLn/ykIfTEgsxlqz1fOAMGm+4zFvAdC2RoGD
-qiTs5TSHYpNjTVXuRB5Y27j7jC63xcFsDMfnw/tf6mCuSQxcVfJbltVWAGtdBUD6
-gLj33T4uys8ZGLd1g77BtT1CIjLRac2oJz9adn9z+lwKQI2WxmaViyl+ewqtFRbz
-6rPHQSLXPLFEt2CDRHMtl7e4aH4yzOQgRdjDZQbVGWJll2+wnaiwp5QM3qNRxgqG
-zF05VYjssx/PlPh5fyyOMYLhoXYnBcBd18GEyQIDAQABAoIBAGmvKmoiMF33o7yG
-WcDjnCG0L1jQL3y8ofS4mSpqxyjeCRmHI4uPralFBbURuFjSjYxiD6cWcB8W/EU8
-5EKOaoa58OT0a5lcNHkelBDpEGP5F279Y9LbKuJqPtbmj294bSm1d/0evr7aTVXr
-IpdbPnbm++HrTaXRZtxoQDHMZps5a85j4//2Fl1Hcc4MmScldzb3gmPpRdjSGUHU
-C5zCcIHJ4NfmXZvK2kVBsUbHbU31Q/+P+RYQ/V2Jl8gytXo7rAAHBfy/9fw9C4Ia
-0U/fypbSRuPhmKNNhzcnoWNLdVmMXHDCy6LOGwJzy0htWcImQSK7fm/IorKuFTLw
-ufMRBEECgYEA5pAzU/FQylPNFj9xCSD2fXee29JtZNZ9KSpVZFU9BfIEyygHy2hx
-wEXnrEiXyC6Q6y66WYAbL8MrVFts4E8wMFE5SYDkRi2hzOVJ6dRRvowFykqgvmIH
-J+bo695imV0Lr+ypgJwS1KTbIns24b6MKFehPF7ba4AQMisOkpBdV1MCgYEAwbs4
-dOdbptwbQKXK+ns4KEHkTOSyf0gMAk1qw6kOutlVL8Zqmda2eM9awSuAw3i5naar
-5WRxdnuMeZTyRcfvsMWz0N9gsA/QRorMi2X2sy+y8lAyqYzeZ97/lanYc17pUMPR
-hKgGTkurU/5hbyFwHRd4HqyIl+bjRkKQEqhqu/MCgYBkmHHspBMt09ZdaJy28Oza
-3UAwhOU54+OD/HZ5aj9PwsKYqQSNmSpYS6fDIYEn1Dlig2bG+f/inPLgwWsFi0dp
-LWcjTNtMS0iXD0tqfDqWOp2kH1928WpR3Iuvrb2zUEdzIHzsIiyNHsiFiODvKaYZ
-S/KLVo/BnYRzfxnClL5FBQKBgQCS6Qi9Dh0ggdVgxtkP7ZT+YklgTiVWBCqnLFIE
-IhV7eAfzfMGl+37QSl4GEplIoioP9S5xfCPWt4YlROAcLqwDH0lm4Z4OpU9Jz0Oh
-iib0Zv2KZ2qjzKFzn1WuBuiPRLAlgPlHYau2gAdiYIs+nNrKFNwQVsIWfw5mX1+l
-5nVaJQKBgDMHcaAARv+R8PJI/bdj6+VUJXiUzE74cHp49jKGnfSBaL5+Kas3wJEF
-SD7GzNQlrFhU1E0zV428FNH9UiUsbcI5yQ834L3pxq9jVCqz6Tfgu747M87ZoBor
-TaeoVI49U0j421QC/BqFHcIBsRcneCLVjqw4M9LfshgkOpvFTYai
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCs1R5uSRH5xV6q
+xvMiz9X7lvAxwI55nZZmgxKHZz7EqWcVtR1VKlKW4K3khGAr0Sm9ihpM2KvaPEhG
+BQq6hhLBRDMKLkt1JaUmSyTeoz2EGGYXWMLZaoFEMPlBDY2tHz03CF4WSDPp8MIK
+W7PBwspmHdkizFrrtQqLRYDtf01w4tgMflqgwWhLVPuO2eOf0XmGVScRlQnAcS8W
+VFPAKJCstZNF3aqK5cGzhRkGeiDYqEfq29HyRbjPSO3M9vygWIGSetR9DBM8VIpa
+GO457iEBZOGdgHqG84Ma8pjBj4pdPuTwjavh9coYQp0TongtxF5Undf+fmkiPUfE
+VC5cZy2jAgMBAAECggEAEuU1737DnVgLsoYPvOWWEmx9FCNmMDufXtPDqdQK07tl
+jsT/UPlQkDg+KraiQQgcFSHNIEur9i8TA7y3YI8Z69FF9z36d/NGq/oZLNIR/qgg
+OTs2CkkPmuHzzj3qGFxK+AJNLwhzzIbK4BEIhQ2DzUhEHf7TjeN8JJ/TqaN6VvX3
+r8j5G++uc1XKvDs4j5l/TbGfDKCNc6SPMCuI4LpuKMx+egpUBZE5HXGZhlhIL7OH
+91m8YjWd0N0YXgsORof8nXzfzlYowDs9q2ZEtFOxiKyUzGQEnAReu4Y3ruANq3BS
+0J6jv6F2Az+6CCJsOtooaSTKrGOkgQhmqtvoDG25cQKBgQDtIVtNZY6lWpNwbdYH
+jHU9vQ2cZL/xjYKhjzpavYNdILlQchWDMV19qxIUMtelAq9H8Xaimgpf9G7aA7Kt
+EMyTJimAG5JNPfZftp0ASJDp6YlT+uEYMqmfsZ0Mnx8UeQ7sn4qV/4WcGbfw6cU8
+FD3hodMm58Ek3SG6fNAhZ+Cu+QKBgQC6le9RzIQ+/eVOUSTYXb8ZjQHFjEwbFgbI
+hsEKePg0Ux3ofBLTWqGSyspzDap31bJpKlG41S1N+d42sFAN57eNL9ipVl15BNXK
+paFMbObQQFWx1Hiwd8S8AYG8r+++jAso6QYS1n9FKD888YDBJUQzMU1Av+fuY3H0
+tMqDEGb8ewKBgQDJFctOA7wGPpve8FVaS2K0exgKsmkOlpjbFhE/F4xJMdHUBRp3
+CSqlwabwF/lERdWL5Zhb5NK9chN6rz4agq9obSkuKLNU6yF9IudacS7qHQ9Gdu3g
+zj2HXV+3b0w02T+tqtEjx+5uZGTWV/bYrrWXG9pqGIdyEk9izCrW2TbwSQKBgAad
+F+2LVUiyUTV0dNzifcqXD/ADqBLxte3XsPIBFbMtGwtJkpVBSibc304yts8mmPtX
+T6xAiimQaMsBduT3SK9Ned2OvSN0A2v6cPw3g/rvvNnf0SNYK3YKi6G3jsTvS9n4
+YIm8Zqh547vyR4ERJBi4b6eS5dKyXbCx09fPdgcPAoGACqY7TwE1SFf19GxDDudd
+sstRyphb6uuQyZHqvQFtriHti2GtaETIjfHz/wO5exjLGwo9RfCMzimhbxtbzOPx
+DSj7QiBHWlQrw1PD4x3n2SXTvj5BV9+Fe95mO1/+dH2BPCSdNw/sWSn0wMJ3csOA
+a7h0CZrZsfivsBQcvUXq5WY=
+-----END PRIVATE KEY-----

dev-resources/ssl/cert.pem

@@ -1,31 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIFSjCCAzKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRQdXBw
-ZXQgQ0E6IGV4cGxvc2l2bzAeFw0xMzAxMDEyMTQ0MjhaFw0xODAxMDEyMTQ0Mjha
-MBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBANCEYBvEIdTXFOMwz18wahs6tg26C+LT2XOwQspb/Aj5WT2EBwnG2leD
-CzfOAKyhHDL6jRqrYU32jqoqBzmzkeVsHzqOMNFosyvcBLU8zyLZU+IP1rjJCyE8
-xx9HsdhPKJj93f/gSNR5NQlRcZfqahhOwh/nYdY3pFiNgjUoRwhV2Q01n+ku8WJw
-kLVT1TREW9TiSWk7cHWF/ZltPOMMxvJ9q0kXh8sVYK4Gtt3pphTUW0qgXQ2NnNWT
-W+7vciRjnHxeoY3q6ZG7vZ8HewYKR4W8D6FA32xCsWELSsWlAABt1lBjKGas/fiY
-SeDqSfIxknFn/CIM9AIp2PLS3wh5e0o98qey9AN2WRyG7Qs0ijhwKx9bsMxbM0LR
-5jXuXjBnjGQ69fwCjwlUsOSpNPWLibM+GmxvhghJgAlH5dD4+GqN77WLncQTWYXX
-GnOw5efVivS4bgU3t8l8mHLH6quLolR1KLfCv+HuqkvRposAqqLwKH+dhlbq1Y+i
-4siPxfYV5NZ092Z9R0F4BPEmLhKngkK+/eQXxLY2zfaR6Ns83yRJfMXRyElECX/+
-RBT1LyIRZg+MbsRg7DsKWI0plzxso/4CgSmYSfPku5nkekrMN34YhUtcxsdHSmY1
-5/p2olvKpTJj3e5fa2KVswcv77FsC17gIfMXqvN3tITP+q1LLJHNAgMBAAGjgZsw
-gZgwNwYJYIZIAYb4QgENBCoWKFB1cHBldCBSdWJ5L09wZW5TU0wgSW50ZXJuYWwg
-Q2VydGlmaWNhdGUwDgYDVR0PAQH/BAQDAgWgMCAGA1UdJQEB/wQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT3awXrPXSWNszZ
-tlLKoXQ8LRjJ3DANBgkqhkiG9w0BAQsFAAOCAgEAYTFx++uptZxgptFmkPfT1f2W
-6djOOVULmlLGPC6Ovbe5v0ksA2hbLW3eSmfL28Ku0WC8gRl0/PhyiyW77M1jp9dV
-ztsFkXjMiIIcY0B7Hgqh1kpK1CFvSbsD3piXcDLlZ1CwSAXuohp+J2fUblHRfAUD
-Th9qrm3g4uNFp0wXxO1+GgXeDrGRqYosb0wAhB7/BhW2WbOFtVYdFoyyXJFJYx/3
-Gj7ZTE3rvGGxOEEuww0pFmuGCflZYxEu15Rynej7soGaE80+wRk+gMS26WKwRQ/0
-TGovOHSLo/fpOjjHIoqbQLH3S08jUfAYjjP7Rd01SiztUjZMILC2WCnpdYN+2O9O
-rGTj2Zl3oRtE67NwxgKlo2GIFghSF366XOF8O4z1e9id6u5XEdoz8uGFkHyMu79N
-cdYcUtmAqLvJ0Ubewg+TfNDcfk1akNtHtIJDNqFwHlZ9R1GIupHQs10R4YxJv3I2
-LojJbtcgWcDg9StwCHRA0SuLrWnHPnm+glzXM5HTNJZ6vcrM0SrcnZ59p3o3ZULL
-JTJikA+pcs+WAWz1yTNg/ywxYPnFrs8A4MEC43XFe2dS96a7VcNqpMMya+DAWWCS
-+51lDlMLuz+q5WHDGh3ouTNYMdcSLo8bHzKInDYnK/DzUpdJ5OKYwqfxv5n0bJs6
-fRA2buaQo0zJeid7G2Q=
+MIIEezCCAmOgAwIBAgIUJLNMHcPnF90Y6dhr39MCIhnkwiswDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk9SMREwDwYDVQQHDAhQb3J0bGFu
+ZDEUMBIGA1UECgwLUHVwcGV0LCBJbmMxDzANBgNVBAMMBnB1cHBldDAeFw0yNDA3
+MDkyMzQ3NDVaFw0yOTA3MDgyMzQ3NDVaMFcxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJPUjERMA8GA1UEBwwIUG9ydGxhbmQxFDASBgNVBAoMC1B1cHBldCwgSW5jMRIw
+EAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCs1R5uSRH5xV6qxvMiz9X7lvAxwI55nZZmgxKHZz7EqWcVtR1VKlKW4K3khGAr
+0Sm9ihpM2KvaPEhGBQq6hhLBRDMKLkt1JaUmSyTeoz2EGGYXWMLZaoFEMPlBDY2t
+Hz03CF4WSDPp8MIKW7PBwspmHdkizFrrtQqLRYDtf01w4tgMflqgwWhLVPuO2eOf
+0XmGVScRlQnAcS8WVFPAKJCstZNF3aqK5cGzhRkGeiDYqEfq29HyRbjPSO3M9vyg
+WIGSetR9DBM8VIpaGO457iEBZOGdgHqG84Ma8pjBj4pdPuTwjavh9coYQp0Tongt
+xF5Undf+fmkiPUfEVC5cZy2jAgMBAAGjQjBAMB0GA1UdDgQWBBQpfykU4gAMP6Pm
+mBsC1LUYCcM96zAfBgNVHSMEGDAWgBQu69ueqs80Ioqd8f+hI2YUdTswFDANBgkq
+hkiG9w0BAQsFAAOCAgEAeM5ME8mvkznGiepHQqDojpxaNIT9N4QDCAxW8y1LVfEF
+S2ufMva22q4loK+NJetaTNjDDv0lcCwUtdAqGQxngrSW8mmVL3qZrm/fFKDsRp0T
+7r7qp0+nZIM+QkovxqPvDO39G70yKATOeXo5ureUK7bbXoU3h8SuPjZNT58XMjKN
+VDZ7f70ejaxjA45wU8jJ2kkotm62jyY7Osh5hA4doE6zLhGYrZZLoE6+kHTiTW1x
+UVnLcm0+MHBGFtydnK3BnnB4muWlWJggJhsmvOxTXK4kuIt1SMxp4fI4F21A/FUi
+qnVG9+pJ/+bm3vFAH5a+fxy/1Jq3yEgKKmn/bVRc+1cP0zgNMFSx7IvC+h2AgbpL
+74lMKd74a5YqbnQraV0FGVY2q0b9W7Ce95kOm//aoFtlxGiAnftwwuFgzOe/pIdb
+r0AtiNkzfBOvqnXAwTHBU16042LtD9kO4aNjw7E2C7E8v5IyUwrYQxBM9pcj0waB
+PvjaT6aVrepQl5+17YzuQGd9YaTucS2ikGMJCQuaFY6ZupNZsQY3AeD8FKWkAgLU
+lKEBbbNZlCLmHBIxk/DGUyiBy6Q3BsBMivOzdWDpkhnHwhwpumFPJCF8yh9BXeba
+Xu89BP1D0Dme9r0dD4daCsa9UOqkmaSELd9c8sstojcRK7rD0tCBQI8fFzdwGNo=
 -----END CERTIFICATE-----

project.clj

@@ -3,7 +3,7 @@
 
   :min-lein-version "2.7.1"
 
-  :parent-project {:coords [puppetlabs/clj-parent "7.0.1"]
+  :parent-project {:coords [puppetlabs/clj-parent "7.3.31"]
                    :inherit [:managed-dependencies]}
 
   ;; Abort when version ranges or version conflicts are detected in
@@ -20,8 +20,8 @@
                                      :sign-releases false}]
                         ["snapshots" "http://nexus.delivery.puppetlabs.net/content/repositories/snapshots/"]]
 
-  :profiles {:dev {:dependencies [[com.puppetlabs/trapperkeeper-webserver-jetty10 "1.0.7"]
-                                  [org.bouncycastle/bcpkix-jdk15on]
+  :profiles {:dev {:dependencies [[com.puppetlabs/trapperkeeper-webserver-jetty10]
+                                  [org.bouncycastle/bcpkix-jdk18on]
                                   [puppetlabs/kitchensink nil :classifier "test" :scope "test"]
                                   [puppetlabs/trapperkeeper nil :classifier "test" :scope "test"]
                                   [compojure]]}})

src/puppetlabs/ring_middleware/common.clj

@@ -1,9 +1,10 @@
 (ns puppetlabs.ring-middleware.common
-  (:require [clojure.tools.logging :as log]
-            [clojure.string :refer [join split replace-first]]
+  (:require [clojure.string :refer [replace-first]]
+            [clojure.tools.logging :as log]
             [puppetlabs.http.client.sync :refer [request]]
-            [puppetlabs.i18n.core :as i18n :refer [trs]])
-  (:import (java.net URI)))
+            [puppetlabs.i18n.core :refer [trs]])
+  (:import (java.net URI)
+           (java.util.regex Pattern)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Private utility functions
@@ -33,7 +34,7 @@
         remote-uri (URI. (.getScheme uri)
                          (.getAuthority uri)
                          (str (.getPath uri)
-                              (if (instance? java.util.regex.Pattern proxied-path)
+                              (if (instance? Pattern proxied-path)
                                 (:uri req)
                                 (replace-first (:uri req) proxied-path "")))
                          nil