Address the comment from @jrhee17

line · Jan 29, 2024 · af3e49f · af3e49f
1 parent 80b3f0c
commit af3e49f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/xds/src/main/java/com/linecorp/armeria/xds/AbstractResourceNode.java b/xds/src/main/java/com/linecorp/armeria/xds/AbstractResourceNode.java
@@ -33,14 +33,15 @@ abstract class AbstractResourceNode<T extends XdsResource> implements ResourceNo
     private final ConfigSource configSource;
     private final XdsType type;
     private final String resourceName;
-    private final SnapshotWatcher<?> parentWatcher;
+    private final SnapshotWatcher<? extends Snapshot<T>> parentWatcher;
     private final ResourceNodeType resourceNodeType;
     @Nullable
     private T current;
 
     AbstractResourceNode(XdsBootstrapImpl xdsBootstrap, @Nullable ConfigSource configSource,
                          XdsType type, String resourceName,
-                         SnapshotWatcher<?> parentWatcher, ResourceNodeType resourceNodeType) {
+                         SnapshotWatcher<? extends Snapshot<T>> parentWatcher,
+                         ResourceNodeType resourceNodeType) {
         this.xdsBootstrap = xdsBootstrap;
         this.configSource = configSource;
         this.type = type;

diff --git a/xds/src/main/java/com/linecorp/armeria/xds/AbstractResourceNodeWithPrimer.java b/xds/src/main/java/com/linecorp/armeria/xds/AbstractResourceNodeWithPrimer.java
@@ -28,7 +28,7 @@ abstract class AbstractResourceNodeWithPrimer<T extends XdsResourceWithPrimer<T>
 
     AbstractResourceNodeWithPrimer(XdsBootstrapImpl xdsBootstrap, @Nullable ConfigSource configSource,
                                    XdsType type, String resourceName, @Nullable XdsResource primer,
-                                   SnapshotWatcher<?> parentWatcher, ResourceNodeType resourceNodeType) {
+                                   SnapshotWatcher<? extends Snapshot<T>> parentWatcher, ResourceNodeType resourceNodeType) {
         super(xdsBootstrap, configSource, type, resourceName, parentWatcher, resourceNodeType);
         this.primer = primer;
     }

diff --git a/xds/src/main/java/com/linecorp/armeria/xds/XdsResource.java b/xds/src/main/java/com/linecorp/armeria/xds/XdsResource.java
@@ -19,7 +19,7 @@
 import com.linecorp.armeria.common.annotation.UnstableApi;
 
 /**
- * A object for xDS resources. This is a holder object which
+ * An object for xDS resources. This is a holder object which
  * is contained by {@link Snapshot} to:
  * <ul>
  *     <li>Provide additional metadata.</li>