Updates from review

Signed-off-by: 이현수 <[email protected]>

Author: znight1020

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java

@@ -41,15 +41,14 @@
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.TypeUtil;
-import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.eclipse.jetty.util.thread.ExecutionStrategy;
 import org.eclipse.jetty.util.thread.strategy.AdaptiveExecutionStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class HTTP2Connection extends AbstractConnection implements Parser.Listener, Connection.UpgradeTo, Dumpable
+public class HTTP2Connection extends AbstractConnection implements Parser.Listener, Connection.UpgradeTo
 {
     private static final Logger LOG = LoggerFactory.getLogger(HTTP2Connection.class);
 
@@ -334,12 +333,6 @@ public String toConnectionString()
         return "%s@%x[%s]".formatted(TypeUtil.toShortName(getClass()), hashCode(), strategy);
     }
 
-    @Override
-    public void dump(Appendable out, String indent) throws IOException
-    {
-        Dumpable.dumpObjects(out, indent, this, session);
-    }
-
     protected class HTTP2Producer implements ExecutionStrategy.Producer
     {
         private static final RetainableByteBuffer.Mutable STOPPED = new RetainableByteBuffer.NonRetainableByteBuffer(BufferUtil.EMPTY_BUFFER);

jetty-core/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java

@@ -23,7 +23,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EventListener;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +34,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -94,11 +92,11 @@ public abstract class HTTP2Session extends AbstractLifeCycle implements Session,
     private static final int MAX_TOTAL_LOCAL_STREAMS = Integer.MAX_VALUE / 2;
 
     private final Map<Integer, HTTP2Stream> streams = new ConcurrentHashMap<>();
+    private final Map<Integer, Integer> localSettings = new ConcurrentHashMap<>();
+    private final Map<Integer, Integer> remoteSettings = new ConcurrentHashMap<>();
     private final Set<Integer> priorityStreams = ConcurrentHashMap.newKeySet();
     private final List<FrameListener> frameListeners = new CopyOnWriteArrayList<>();
     private final List<LifeCycleListener> lifeCycleListeners = new CopyOnWriteArrayList<>();
-    private final AtomicReference<Map<Integer, Integer>> localSettingsSnapshot = new AtomicReference<>(Map.of());
-    private final AtomicReference<Map<Integer, Integer>> remoteSettingsSnapshot = new AtomicReference<>(Map.of());
     private final AtomicLong streamsOpened = new AtomicLong();
     private final AtomicLong streamsClosed = new AtomicLong();
     private final StreamsState streamsState = new StreamsState();
@@ -304,26 +302,6 @@ public long getBytesWritten()
         return bytesWritten.get();
     }
 
-    /**
-     * Returns a snapshot of the last SETTINGS that this endpoint sent
-     * <p>The map keys are SETTINGS ids as defined in {@link SettingsFrame}.
-     * @return local (sent) SETTINGS
-     */
-    public Map<Integer, Integer> getCurrentLocalSettings()
-    {
-        return localSettingsSnapshot.get();
-    }
-
-    /**
-     * Returns a snapshot of the last SETTINGS that the peer sent
-     * <p>The map keys are SETTINGS ids as defined in {@link SettingsFrame}.
-     * @return remote (received) SETTINGS
-     */
-    public Map<Integer, Integer> getCurrentRemoteSettings()
-    {
-        return remoteSettingsSnapshot.get();
-    }
-
     @Override
     public void onData(DataFrame frame)
     {
@@ -470,15 +448,7 @@ public void onSettings(SettingsFrame frame, boolean reply)
             return;
 
         Map<Integer, Integer> settings = frame.getSettings();
-        remoteSettingsSnapshot.updateAndGet(origin ->
-        {
-            if (settings.isEmpty())
-                return origin;
-            Map<Integer, Integer> updated = new HashMap<>(origin);
-            updated.putAll(settings);
-            return Map.copyOf(updated);
-        });
-
+        remoteSettings.putAll(settings);
         configure(settings, false);
         notifySettings(this, frame);
 
@@ -846,17 +816,8 @@ public void succeeded(Stream pushed)
     public void settings(SettingsFrame frame, Callback callback)
     {
         if (!frame.isReply())
-        {
-            Map<Integer, Integer> settings = frame.getSettings();
-            localSettingsSnapshot.updateAndGet(origin ->
-            {
-                if (settings.isEmpty())
-                    return origin;
-                Map<Integer, Integer> updated = new HashMap<>(origin);
-                updated.putAll(settings);
-                return Map.copyOf(updated);
-            });
-        }
+         localSettings.putAll(frame.getSettings());
+
         control(null, callback, frame);
     }
 
@@ -1488,9 +1449,10 @@ protected static boolean isClientStream(int streamId)
     @Override
     public void dump(Appendable out, String indent) throws IOException
     {
-        DumpableMap localSettings = new DumpableMap("local settings", getCurrentLocalSettings());
-        DumpableMap remoteSettings = new DumpableMap("remote settings", getCurrentRemoteSettings());
-        Dumpable.dumpObjects(out, indent, this, flowControl, flusher, new DumpableCollection("streams", streams.values()), localSettings, remoteSettings);
+        DumpableCollection streams = new DumpableCollection("streams", this.streams.values());
+        DumpableMap localSettings = new DumpableMap("local settings", this.localSettings);
+        DumpableMap remoteSettings = new DumpableMap("remote settings", this.remoteSettings);
+        Dumpable.dumpObjects(out, indent, this, flowControl, flusher, streams, localSettings, remoteSettings);
     }
 
     @Override