Code tweaks and comments

Author: voidmain

java-http.ipr

@@ -9,6 +9,10 @@
       <option name="addBlankAfter" value="false" />
     </LanguageOptions>
   </component>
+  <component name="GitScope">
+    <option name="currentTabIndex" value="1" />
+    <option name="modelData" value="[{&quot;targetBranchMap&quot;:{&quot;value&quot;:{&quot;/Users/bpontarelli/dev/inversoft/fusionauth/java-http&quot;:&quot;HEAD~5&quot;}},&quot;customTabName&quot;:&quot;HEAD~5&quot;}]" />
+  </component>
   <component name="InspectionProjectProfileManager">
     <profile version="1.0">
       <option name="myName" value="Project Default" />
@@ -1409,31 +1413,6 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="Java 21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="ProjectRunConfigurationManager">
-    <configuration default="true" type="TestNG">
-      <shortenClasspath name="NONE" />
-      <useClassPathOnly />
-      <option name="SUITE_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="" />
-      <option name="GROUP_NAME" value="" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED" />
-      <option name="PARAMETERS" value="" />
-      <option name="OUTPUT_DIRECTORY" value="" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <option name="PROPERTIES_FILE" value="" />
-      <properties />
-      <listeners>
-        <listener class="io.fusionauth.http.BaseTest$TestListener" />
-      </listeners>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
@@ -1450,4 +1429,4 @@
       </SOURCES>
     </library>
   </component>
-</project>
+</project>

src/main/java/io/fusionauth/http/server/Configurable.java

@@ -187,9 +187,24 @@ default T withMaxPendingSocketConnections(int maxPendingSocketConnections) {
 
   /**
    * Sets the maximum size of the HTTP request body by optionally per Content-Type. If this limit is exceeded, the connection will be closed.
-   * Defaults to 128 Megabytes.
    * <p>
-   * Set this to -1 to disable this limitation.
+   * A key of "*" will be the default value if a key doesn't exist for the specific Content-Type. Additionally, you can specify wildcards
+   * for subtypes of Content-Types such as "application/*". This will be used if the exact Content-Type key is not in the Map.
+   * <p>
+   * An example lookup for the Content-Type "application/x-www-form-urlencoded" is:
+   * <ol>
+   *   <li>application/x-www-form-urlencoded</li>
+   *   <li>application/*</li>
+   *   <li>*</li>
+   * </ol>
+   * <p>
+   * If you pass in a Map that does not contain a default size using the String "*", this will retain the default value set by java-http.
+   * Similarly, the default value for "application/x-www-form-urlencoded" is also retained if the Mapp you provide does not contain that
+   * key.
+   * <p>
+   * Set any value to -1 to disable this limitation.
+   * <p>
+   * Defaults to 128 Megabytes for the wildcard "*" and 10 Megabytes for "application/x-www-form-urlencoded".
    *
    * @param maxRequestBodySize a map specifying the maximum size in bytes for the HTTP request body by Content-Type
    * @return This.

src/main/java/io/fusionauth/http/server/HTTPServerConfiguration.java

@@ -33,8 +33,15 @@
  * @author Brian Pontarelli
  */
 public class HTTPServerConfiguration implements Configurable<HTTPServerConfiguration> {
+  public static final Map<String, Integer> DefaultMaxSizes = Map.of(
+      "*", 128 * 1024 * 1024,                                   // 128 Megabytes
+      "application/x-www-form-urlencoded", 10 * 1024 * 1024     // 10 Megabytes
+  );
+
   private final List<HTTPListenerConfiguration> listeners = new ArrayList<>();
 
+  private final Map<String, Integer> maxRequestBodySize = new HashMap<>(DefaultMaxSizes);
+
   private Path baseDir = Path.of("");
 
   private int chunkedBufferSize = 4 * 1024; // 4 Kilobytes
@@ -59,10 +66,6 @@ public class HTTPServerConfiguration implements Configurable<HTTPServerConfigura
 
   private int maxPendingSocketConnections = 250;
 
-  private Map<String, Integer> maxRequestBodySize = Map.of(
-      "*", 128 * 1024 * 1024,                                   // 128 Megabytes
-      "application/x-www-form-urlencoded", 10 * 1024 * 1024);   // 10 Megabytes
-
   private int maxRequestHeaderSize = 128 * 1024; // 128 Kilobytes
 
   private int maxRequestsPerConnection = 100_000; // 100,000
@@ -487,14 +490,10 @@ public HTTPServerConfiguration withMaxRequestBodySize(Map<String, Integer> maxRe
       }
     }
 
-    // Keep existing default if one was not provided.
-    if (!maxRequestBodySize.containsKey("*")) {
-      Map<String, Integer> copy = new HashMap<>(maxRequestBodySize);
-      copy.put("*", maxRequestBodySize.get("*"));
-      maxRequestBodySize = copy;
-    }
-
-    this.maxRequestBodySize = maxRequestBodySize;
+    // This preserves the default values in the field definition if the incoming Map does not contain them. Otherwise, they are overridden
+    this.maxRequestBodySize.clear();
+    this.maxRequestBodySize.putAll(DefaultMaxSizes);
+    this.maxRequestBodySize.putAll(maxRequestBodySize);
     return this;
   }