Merge pull request apache#1 from saicaca/fix

fix: update envoy-api version and fix error

Author: wcy666103

dubbo-dependencies-bom/pom.xml

@@ -120,7 +120,7 @@
     <apollo_client_version>2.2.0</apollo_client_version>
     <snakeyaml_version>2.2</snakeyaml_version>
     <commons_lang3_version>3.14.0</commons_lang3_version>
-    <envoy_api_version>0.1.35</envoy_api_version>
+    <envoy_api_version>1.0.45</envoy_api_version>
     <micrometer.version>1.13.1</micrometer.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>

dubbo-xds/src/main/java/org/apache/dubbo/xds/resource/grpc/BootstrapperImpl.java

@@ -343,7 +343,7 @@ private static ChannelCredentials parseChannelCredentials(List<Map<String, ?>> j
 //
 //        return provider.newChannelCredentials(config);
 //      }
-//    }
+    }
     return null;
   }
 }

dubbo-xds/src/main/java/org/apache/dubbo/xds/resource/grpc/SslContextProviderSupplier.java

@@ -19,7 +19,6 @@
 import org.apache.dubbo.xds.resource.grpc.EnvoyServerProtoData.BaseTlsContext;
 import org.apache.dubbo.xds.resource.grpc.EnvoyServerProtoData.DownstreamTlsContext;
 import org.apache.dubbo.xds.resource.grpc.EnvoyServerProtoData.UpstreamTlsContext;
-import org.apache.dubbo.xds.resource.grpc.third.TlsContextManager;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
@@ -40,7 +39,7 @@
 public final class SslContextProviderSupplier implements Closeable {
 
   private final BaseTlsContext tlsContext;
-  private final org.apache.dubbo.xds.resource.grpc.third.TlsContextManager tlsContextManager;
+  private final org.apache.dubbo.xds.resource.grpc.TlsContextManager tlsContextManager;
   private SslContextProvider sslContextProvider;
   private boolean shutdown;
 

dubbo-xds/src/main/java/org/apache/dubbo/xds/resource/grpc/XdsClient.java

@@ -16,7 +16,6 @@
 
 package org.apache.dubbo.xds.resource.grpc;
 
-import org.apache.dubbo.xds.bootstrap.Bootstrapper;
 import org.apache.dubbo.xds.resource.grpc.Bootstrapper.ServerInfo;
 import org.apache.dubbo.xds.resource.grpc.LoadStatsManager2.ClusterDropStats;
 import org.apache.dubbo.xds.resource.grpc.LoadStatsManager2.ClusterLocalityStats;