Remove 'Internal' prefix from class name InternalXdsAttributes because it is causing package leakage check to fail.

Author: kannanjgithub

…io/grpc/internal/InternalAttributes.java …o/grpc/internal/XdsCommonAttributes.javaxds/src/main/java/io/grpc/internal/InternalAttributes.java renamed to xds/src/main/java/io/grpc/internal/XdsCommonAttributes.java xds/src/main/java/io/grpc/internal/InternalAttributes.java renamed to xds/src/main/java/io/grpc/internal/XdsCommonAttributes.java

@@ -19,7 +19,7 @@
 import io.grpc.Attributes;
 import io.grpc.EquivalentAddressGroup;
 
-public final class InternalAttributes {
+public final class XdsCommonAttributes {
   /** Name associated with individual address, if available (e.g., DNS name). */
   @EquivalentAddressGroup.Attr
   public static final Attributes.Key<String> ATTR_ADDRESS_NAME =

xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java

@@ -36,7 +36,7 @@
 import io.grpc.Status;
 import io.grpc.internal.ForwardingClientStreamTracer;
 import io.grpc.internal.GrpcUtil;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.internal.ObjectPool;
 import io.grpc.services.MetricReport;
 import io.grpc.util.ForwardingLoadBalancerHelper;
@@ -242,9 +242,9 @@ public Subchannel createSubchannel(CreateSubchannelArgs args) {
           .set(ATTR_CLUSTER_LOCALITY, localityAtomicReference);
       if (GrpcUtil.getFlag("GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE", false)) {
         String hostname = args.getAddresses().get(0).getAttributes()
-            .get(InternalAttributes.ATTR_ADDRESS_NAME);
+            .get(XdsCommonAttributes.ATTR_ADDRESS_NAME);
         if (hostname != null) {
-          attrsBuilder.set(InternalAttributes.ATTR_ADDRESS_NAME, hostname);
+          attrsBuilder.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, hostname);
         }
       }
       args = args.toBuilder().setAddresses(addresses).setAttributes(attrsBuilder.build()).build();
@@ -439,7 +439,7 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
             result = PickResult.withSubchannel(result.getSubchannel(),
                 result.getStreamTracerFactory(),
                 result.getSubchannel().getAttributes().get(
-                    InternalAttributes.ATTR_ADDRESS_NAME));
+                    XdsCommonAttributes.ATTR_ADDRESS_NAME));
           }
         }
         return result;

xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java

@@ -29,7 +29,7 @@
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.Status;
 import io.grpc.StatusOr;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.util.GracefulSwitchLoadBalancer;
 import io.grpc.util.OutlierDetectionLoadBalancer.OutlierDetectionLoadBalancerConfig;
 import io.grpc.xds.ClusterImplLoadBalancerProvider.ClusterImplConfig;
@@ -195,7 +195,7 @@ StatusOr<ClusterResolutionResult> edsUpdateToResult(
                     .set(XdsAttributes.ATTR_LOCALITY_WEIGHT,
                         localityLbInfo.localityWeight())
                     .set(XdsAttributes.ATTR_SERVER_WEIGHT, weight)
-                    .set(InternalAttributes.ATTR_ADDRESS_NAME, endpoint.hostname())
+                    .set(XdsCommonAttributes.ATTR_ADDRESS_NAME, endpoint.hostname())
                     .build();
             EquivalentAddressGroup eag;
             if (config.isHttp11ProxyAvailable()) {

xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java

@@ -23,7 +23,7 @@
 import io.grpc.Attributes;
 import io.grpc.Grpc;
 import io.grpc.internal.GrpcUtil;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.internal.ObjectPool;
 import io.grpc.netty.GrpcHttp2ConnectionHandler;
 import io.grpc.netty.InternalProtocolNegotiationEvent;
@@ -150,7 +150,7 @@ public ChannelHandler newHandler(GrpcHttp2ConnectionHandler grpcHandler) {
         return fallbackProtocolNegotiator.newHandler(grpcHandler);
       }
       return new ClientSecurityHandler(grpcHandler, localSslContextProviderSupplier,
-          grpcHandler.getEagAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME));
+          grpcHandler.getEagAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME));
     }
 
     @Override

xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java

@@ -55,7 +55,7 @@
 import io.grpc.Status.Code;
 import io.grpc.SynchronizationContext;
 import io.grpc.internal.FakeClock;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.internal.ObjectPool;
 import io.grpc.internal.PickFirstLoadBalancerProvider;
 import io.grpc.internal.PickSubchannelArgsImpl;
@@ -812,10 +812,10 @@ public void endpointAddressesAttachedWithClusterName() {
               new FixedResultPicker(PickResult.withSubchannel(subchannel)));
         }
       });
-      assertThat(subchannel.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo(
+      assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo(
           "authority-host-name");
       for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
-        assertThat(eag.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME))
+        assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME))
             .isEqualTo("authority-host-name");
       }
 
@@ -864,9 +864,9 @@ public void endpointAddressesAttachedWithClusterName() {
       }
     });
     // Sub Channel wrapper args won't have the address name although addresses will.
-    assertThat(subchannel.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)).isNull();
+    assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isNull();
     for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
-      assertThat(eag.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME))
+      assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME))
           .isEqualTo("authority-host-name");
     }
 
@@ -1021,7 +1021,7 @@ public String toString() {
         // Unique but arbitrary string
         .set(EquivalentAddressGroup.ATTR_LOCALITY_NAME, locality.toString());
     if (authorityHostname != null) {
-      attributes.set(InternalAttributes.ATTR_ADDRESS_NAME, authorityHostname);
+      attributes.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, authorityHostname);
     }
     EquivalentAddressGroup eag = new EquivalentAddressGroup(new FakeSocketAddress(name),
         attributes.build());

xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java

@@ -82,7 +82,7 @@
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.internal.FakeClock;
 import io.grpc.internal.GrpcUtil;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.testing.GrpcCleanupRule;
 import io.grpc.util.GracefulSwitchLoadBalancer;
 import io.grpc.util.GracefulSwitchLoadBalancerAccessor;
@@ -409,7 +409,7 @@ public void edsClustersEndpointHostname_addedToAddressAttribute() {
 
     assertThat(
         childBalancer.addresses.get(0).getAttributes()
-            .get(InternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo("hostname1");
+            .get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo("hostname1");
   }
 
   @Test
@@ -898,7 +898,7 @@ public void onlyLogicalDnsCluster_endpointsResolved() {
             newInetSocketAddress("127.0.2.1", 9000), newInetSocketAddress("127.0.2.2", 9000)))),
         childBalancer.addresses);
     assertThat(childBalancer.addresses.get(0).getAttributes()
-        .get(InternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo(DNS_HOST_NAME + ":9000");
+        .get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo(DNS_HOST_NAME + ":9000");
   }
 
   @Test

xds/src/test/java/io/grpc/xds/XdsSecurityClientServerTest.java

@@ -52,7 +52,7 @@
 import io.grpc.Status;
 import io.grpc.StatusOr;
 import io.grpc.StatusRuntimeException;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcCleanupRule;
 import io.grpc.testing.protobuf.SimpleRequest;
@@ -842,7 +842,7 @@ private SimpleServiceGrpc.SimpleServiceBlockingStub getBlockingStub(
                 upstreamTlsContext, tlsContextManagerForClient))
         : Attributes.newBuilder();
     if (addrNameAttribute != null) {
-      sslContextAttributesBuilder.set(InternalAttributes.ATTR_ADDRESS_NAME, addrNameAttribute);
+      sslContextAttributesBuilder.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, addrNameAttribute);
     }
     sslContextAttributes = sslContextAttributesBuilder.build();
     fakeNameResolverFactory.setServers(

xds/src/test/java/io/grpc/xds/internal/security/SecurityProtocolNegotiatorsTest.java

@@ -39,7 +39,7 @@
 import io.grpc.ChannelLogger;
 import io.grpc.ChannelLogger.ChannelLogLevel;
 import io.grpc.internal.FakeClock;
-import io.grpc.internal.InternalAttributes;
+import io.grpc.internal.XdsCommonAttributes;
 import io.grpc.internal.TestUtils.NoopChannelLogger;
 import io.grpc.netty.GrpcHttp2ConnectionHandler;
 import io.grpc.netty.InternalProtocolNegotiationEvent;
@@ -168,7 +168,7 @@ public void clientSecurityProtocolNegotiator_autoHostSni_hostnamePassedToClientS
               Attributes.newBuilder()
                   .set(SecurityProtocolNegotiators.ATTR_SSL_CONTEXT_PROVIDER_SUPPLIER,
                       new SslContextProviderSupplier(upstreamTlsContext, mockTlsContextManager))
-                  .set(InternalAttributes.ATTR_ADDRESS_NAME, FAKE_AUTHORITY)
+                  .set(XdsCommonAttributes.ATTR_ADDRESS_NAME, FAKE_AUTHORITY)
                   .build());
       ChannelHandler newHandler = pn.newHandler(mockHandler);
       assertThat(newHandler).isNotNull();