minor optimizations

robaho · robaho · commit 68d7bf8aa804 · 2025-01-03T13:25:40.000-06:00
diff --git a/src/main/java/robaho/net/httpserver/OptimizedHeaders.java b/src/main/java/robaho/net/httpserver/OptimizedHeaders.java
@@ -72,28 +72,17 @@ private String normalize(String key) {
             if (c == '\r' || c == '\n')
                 throw new IllegalArgumentException("illegal character in key");
             if(i==0) {
-                if (c >= 'a' && c <= 'z') {
+                if (Character.isLowerCase(c)) {
                     break;
                 }
             } else {
-                if (c >= 'A' && c <= 'Z') {
+                if (Character.isUpperCase(c)) {
                     break;
                 }
             }
         }
         if(i==len) return key;
-
-        char[] buffer = key.toCharArray();
-        for(;i<len;i++) {
-            char c = buffer[i];
-            if(i==0 && c >= 'a' && c <= 'z') {
-                buffer[i] = (char)(c - ('a' - 'A'));
-            } else if (i!=0 && c >= 'A' && c <= 'Z') {
-                buffer[i] = (char) (c + ('a' - 'A'));
-            } else if (c == '\r' || c == '\n')
-                throw new IllegalArgumentException("illegal character in key");
-        }
-        return new String(buffer);
+        return Character.toUpperCase(key.charAt(0))+key.substring(1).toLowerCase();
     }
 
     @Override
diff --git a/src/main/java/robaho/net/httpserver/ServerImpl.java b/src/main/java/robaho/net/httpserver/ServerImpl.java
@@ -552,7 +552,7 @@ public void handleStream(HTTP2Stream stream,InputStream in, OutputStream out) th
                 throw new IOException("Invalid HTTP/2 headers: missing :authority or :path");
             }
 
-            request.add("Host",authority);
+            request.set("Host",authority);
 
             URI uri;
             try {
diff --git a/src/main/java/robaho/net/httpserver/http2/HTTP2Stream.java b/src/main/java/robaho/net/httpserver/http2/HTTP2Stream.java
@@ -64,7 +64,9 @@ public HTTP2Stream(int streamId, HTTP2Connection connection, Headers requestHead
         if(setting!=null) {
             sendWindow.addAndGet((int)(setting.value-65535));
         }
-        logger.log(Level.TRACE,() -> "new stream, window size "+sendWindow.get()+" on stream "+streamId);
+        if(logger.isLoggable(Level.TRACE)) {
+            logger.log(Level.TRACE,() -> "new stream, window size "+sendWindow.get()+" on stream "+streamId);
+        }
     }
 
     public OutputStream getOutputStream() {

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ public void handleStream(HTTP2Stream stream,InputStream in, OutputStream out) th`
`552`	`552`	`throw new IOException("Invalid HTTP/2 headers: missing :authority or :path");`
`553`	`553`	`}`
`554`	`554`
`555`		`- request.add("Host",authority);`
	`555`	`+ request.set("Host",authority);`
`556`	`556`
`557`	`557`	`URI uri;`
`558`	`558`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ public HTTP2Stream(int streamId, HTTP2Connection connection, Headers requestHead`
`64`	`64`	`if(setting!=null) {`
`65`	`65`	`sendWindow.addAndGet((int)(setting.value-65535));`
`66`	`66`	`}`
`67`		`- logger.log(Level.TRACE,() -> "new stream, window size "+sendWindow.get()+" on stream "+streamId);`
	`67`	`+ if(logger.isLoggable(Level.TRACE)) {`
	`68`	`+ logger.log(Level.TRACE,() -> "new stream, window size "+sendWindow.get()+" on stream "+streamId);`
	`69`	`+ }`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`public OutputStream getOutputStream() {`