From 07d7b99e3185a0d3b2eb6fc927cbf93e9280b9cc Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Wed, 6 Mar 2019 10:59:41 -0800
Subject: [PATCH] netty: expose methods of ProtocolNegotiationEvent through
 accessor

---
 .../InternalProtocolNegotiationEvent.java     | 51 +++++++++++++++++++
 .../grpc/netty/ProtocolNegotiationEvent.java  | 14 ++---
 2 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 netty/src/main/java/io/grpc/netty/InternalProtocolNegotiationEvent.java

diff --git a/netty/src/main/java/io/grpc/netty/InternalProtocolNegotiationEvent.java b/netty/src/main/java/io/grpc/netty/InternalProtocolNegotiationEvent.java
new file mode 100644
index 0000000000..88cc0ba60a
--- /dev/null
+++ b/netty/src/main/java/io/grpc/netty/InternalProtocolNegotiationEvent.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc.netty;
+
+import io.grpc.Attributes;
+import io.grpc.InternalChannelz.Security;
+import javax.annotation.Nullable;
+
+/**
+ * Internal accessor for {@link ProtocolNegotiationEvent}.
+ */
+public final class InternalProtocolNegotiationEvent {
+  private InternalProtocolNegotiationEvent() {}
+
+  public static ProtocolNegotiationEvent getDefault() {
+    return ProtocolNegotiationEvent.DEFAULT;
+  }
+
+  public static ProtocolNegotiationEvent withAttributes(
+      ProtocolNegotiationEvent event, Attributes attributes) {
+    return event.withAttributes(attributes);
+  }
+
+  public static ProtocolNegotiationEvent withSecurity(
+      ProtocolNegotiationEvent event, @Nullable Security security) {
+    return event.withSecurity(security);
+  }
+
+  public static Attributes getAttributes(ProtocolNegotiationEvent event) {
+    return event.getAttributes();
+  }
+
+  @Nullable
+  public static Security getSecurity(ProtocolNegotiationEvent event) {
+    return event.getSecurity();
+  }
+}
diff --git a/netty/src/main/java/io/grpc/netty/ProtocolNegotiationEvent.java b/netty/src/main/java/io/grpc/netty/ProtocolNegotiationEvent.java
index 077d69f5bb..16da79e1af 100644
--- a/netty/src/main/java/io/grpc/netty/ProtocolNegotiationEvent.java
+++ b/netty/src/main/java/io/grpc/netty/ProtocolNegotiationEvent.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import io.grpc.Attributes;
+import io.grpc.Internal;
 import io.grpc.InternalChannelz.Security;
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
@@ -29,9 +30,10 @@ import javax.annotation.Nullable;
  * Represents a completion of a protocol negotiation stage.
  */
 @CheckReturnValue
-final class ProtocolNegotiationEvent {
+@Internal
+public final class ProtocolNegotiationEvent {
 
-  public static final ProtocolNegotiationEvent DEFAULT =
+  static final ProtocolNegotiationEvent DEFAULT =
       new ProtocolNegotiationEvent(Attributes.EMPTY, /*security=*/ null);
 
   private final Attributes attributes;
@@ -44,19 +46,19 @@ final class ProtocolNegotiationEvent {
   }
 
   @Nullable
-  public Security getSecurity() {
+  Security getSecurity() {
     return security;
   }
 
-  public Attributes getAttributes() {
+  Attributes getAttributes() {
     return attributes;
   }
 
-  public ProtocolNegotiationEvent withAttributes(Attributes attributes) {
+  ProtocolNegotiationEvent withAttributes(Attributes attributes) {
     return new ProtocolNegotiationEvent(attributes, this.security);
   }
 
-  public ProtocolNegotiationEvent withSecurity(@Nullable Security security) {
+  ProtocolNegotiationEvent withSecurity(@Nullable Security security) {
     return new ProtocolNegotiationEvent(this.attributes, security);
   }