revert parser impl

Author: jrhee17

xds/src/main/java/com/linecorp/armeria/xds/ClusterResourceFactory.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you 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:
+ *
+ *   https://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 com.linecorp.armeria.xds;
+
+import io.envoyproxy.envoy.config.cluster.v3.Cluster;
+
+final class ClusterResourceParser extends ResourceParser<Cluster, ClusterXdsResource> {
+
+    static final ClusterResourceParser INSTANCE = new ClusterResourceParser();
+
+    private ClusterResourceParser() {}
+
+    @Override
+    ClusterXdsResource parse(Cluster cluster, XdsExtensionRegistry registry,
+                             String version, long revision) {
+        return new ClusterXdsResource(cluster, version);
+    }
+
+    @Override
+    String name(Cluster cluster) {
+        return cluster.getName();
+    }
+
+    @Override
+    Class<Cluster> clazz() {
+        return Cluster.class;
+    }
+
+    @Override
+    boolean isFullStateOfTheWorld() {
+        return true;
+    }
+
+    @Override
+    XdsType type() {
+        return XdsType.CLUSTER;
+    }
+}

xds/src/main/java/com/linecorp/armeria/xds/ClusterResourceParser.java

@@ -218,13 +218,12 @@ public void onNext(DeltaDiscoveryResponse value) {
         }
         lifecycleObserver.responseReceived(value);
 
-        final XdsResourceFactory factory =
-                extensionRegistry.queryByTypeUrl(value.getTypeUrl(), XdsResourceFactory.class);
-        if (factory == null) {
+        final ResourceParser<?, ?> parser = XdsResourceParserUtil.fromTypeUrl(value.getTypeUrl());
+        if (parser == null) {
             logger.warn("Delta XDS stream received unexpected type: {}", value.getTypeUrl());
             return;
         }
-        handleResponse(factory, value);
+        handleResponse(parser, value);
     }
 
     @Override
@@ -249,11 +248,11 @@ public void onCompleted() {
         owner.retryOrClose(false);
     }
 
-    private void handleResponse(XdsResourceFactory factory, DeltaDiscoveryResponse response) {
-        final XdsType type = factory.type();
+    private void handleResponse(ResourceParser<?, ?> parser, DeltaDiscoveryResponse response) {
+        final XdsType type = parser.type();
         final List<Resource> deltaResources = response.getResourcesList();
         final ParsedResourcesHolder holder =
-                XdsResourceParseUtil.parseDeltaResources(factory, extensionRegistry, deltaResources);
+                parser.parseDeltaResources(deltaResources, extensionRegistry);
 
         if (!holder.errors().isEmpty()) {
             holder.invalidResources().forEach((name, error) ->

xds/src/main/java/com/linecorp/armeria/xds/DeltaActualStream.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you 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:
+ *
+ *   https://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 com.linecorp.armeria.xds;
+
+import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment;
+
+final class EndpointResourceParser extends ResourceParser<ClusterLoadAssignment, EndpointXdsResource> {
+
+    static final EndpointResourceParser INSTANCE = new EndpointResourceParser();
+
+    private EndpointResourceParser() {}
+
+    @Override
+    EndpointXdsResource parse(ClusterLoadAssignment message, XdsExtensionRegistry registry,
+                              String version, long revision) {
+        return new EndpointXdsResource(message, version);
+    }
+
+    @Override
+    String name(ClusterLoadAssignment message) {
+        return message.getClusterName();
+    }
+
+    @Override
+    Class<ClusterLoadAssignment> clazz() {
+        return ClusterLoadAssignment.class;
+    }
+
+    @Override
+    boolean isFullStateOfTheWorld() {
+        return false;
+    }
+
+    @Override
+    XdsType type() {
+        return XdsType.ENDPOINT;
+    }
+}

xds/src/main/java/com/linecorp/armeria/xds/EndpointResourceFactory.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you 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:
+ *
+ *   https://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 com.linecorp.armeria.xds;
+
+import java.util.List;
+
+import com.linecorp.armeria.xds.filter.XdsHttpFilter;
+
+import io.envoyproxy.envoy.config.listener.v3.Listener;
+import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager;
+
+final class ListenerResourceParser extends ResourceParser<Listener, ListenerXdsResource> {
+
+    static final ListenerResourceParser INSTANCE = new ListenerResourceParser();
+
+    private ListenerResourceParser() {}
+
+    @Override
+    ListenerXdsResource parse(Listener message, XdsExtensionRegistry registry,
+                              String version, long revision) {
+        final HttpConnectionManager connectionManager =
+                XdsUnpackUtil.unpackConnectionManager(message, registry);
+        final List<XdsHttpFilter> downstreamFilters =
+                XdsUnpackUtil.resolveDownstreamFilters(connectionManager, registry);
+        return new ListenerXdsResource(message, connectionManager, downstreamFilters,
+                                       version, revision);
+    }
+
+    @Override
+    String name(Listener message) {
+        return message.getName();
+    }
+
+    @Override
+    Class<Listener> clazz() {
+        return Listener.class;
+    }
+
+    @Override
+    boolean isFullStateOfTheWorld() {
+        return true;
+    }
+
+    @Override
+    XdsType type() {
+        return XdsType.LISTENER;
+    }
+}