diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/response/QueueListResponse.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/response/QueueListResponse.java index abde9ad..a70b3af 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/response/QueueListResponse.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/response/QueueListResponse.java @@ -1,6 +1,8 @@ package com.lanyuanxiaoyao.service.yarn.response; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnQueue; +import org.eclipse.collections.api.list.ImmutableList; + import java.util.List; /** @@ -54,9 +56,9 @@ public final class QueueListResponse { } public static final class Queues { - private List queue; + private ImmutableList queue; - public List getQueue() { + public ImmutableList getQueue() { return queue; } diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueAutoRefreshServiceImpl.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueAutoRefreshServiceImpl.java index 5c81a89..e8a874b 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueAutoRefreshServiceImpl.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueAutoRefreshServiceImpl.java @@ -42,7 +42,7 @@ public class QueueAutoRefreshServiceImpl implements QueueService { String queryUrl = URLUtil.completeUrl(yarnConfiguration.getWebUrl(), "/ws/v1/cluster/scheduler"); String body = HttpUtil.createGet(queryUrl).setMaxRedirectCount(10).execute().body(); QueueListResponse response = mapper.readValue(body, QueueListResponse.class); - ImmutableList queues = Lists.immutable.ofAll(response.getScheduler().getSchedulerInfo().getQueues().getQueue()) + ImmutableList queues = response.getScheduler().getSchedulerInfo().getQueues().getQueue() .tap(q -> q.setCluster(yarnConfiguration.getCluster())); CACHE.set(queues); } diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueServiceImpl.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueServiceImpl.java index 4453fa6..ce907ce 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueServiceImpl.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/QueueServiceImpl.java @@ -44,7 +44,7 @@ public class QueueServiceImpl implements QueueService { String queryUrl = URLUtil.completeUrl(yarnConfiguration.getWebUrl(), "/ws/v1/cluster/scheduler"); String body = HttpUtil.createGet(queryUrl).setMaxRedirectCount(10).execute().body(); QueueListResponse response = mapper.readValue(body, QueueListResponse.class); - return Lists.immutable.ofAll(response.getScheduler().getSchedulerInfo().getQueues().getQueue()).tap(q -> q.setCluster(yarnConfiguration.getCluster())); + return response.getScheduler().getSchedulerInfo().getQueues().getQueue().tap(q -> q.setCluster(yarnConfiguration.getCluster())); } @Cacheable(value = "queue-detail", sync = true, key = "#name")