From a3fce05e132aa4ad6878198aec636483346793f4 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Tue, 30 May 2023 16:32:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(yarn-query):=20=E4=BF=AE=E5=A4=8D=20mapper?= =?UTF-8?q?=20=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8=20spring=20boot=20?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=20mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/yarn/service/impl/ClusterServiceImpl.java | 6 ++++-- .../yarn/service/impl/JobAutoRefreshServiceImpl.java | 6 ++++-- .../service/yarn/service/impl/JobServiceImpl.java | 6 ++++-- .../yarn/service/impl/QueueAutoRefreshServiceImpl.java | 6 ++++-- .../service/yarn/service/impl/QueueServiceImpl.java | 6 ++++-- .../lanyuanxiaoyao/service/yarn/QueueResponseParseTest.java | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/ClusterServiceImpl.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/ClusterServiceImpl.java index 3774979..0aa34fc 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/ClusterServiceImpl.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/ClusterServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; @@ -29,9 +30,10 @@ public class ClusterServiceImpl implements ClusterService { private final ObjectMapper mapper; private final YarnConfiguration yarnConfiguration; - public ClusterServiceImpl(ObjectMapper mapper, YarnConfiguration yarnConfiguration) { - this.mapper = mapper; + public ClusterServiceImpl(YarnConfiguration yarnConfiguration, Jackson2ObjectMapperBuilder builder) { this.yarnConfiguration = yarnConfiguration; + + this.mapper = builder.build(); } @Cacheable(value = "cluster-info", sync = true) diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobAutoRefreshServiceImpl.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobAutoRefreshServiceImpl.java index 5138ade..c7b4b8e 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobAutoRefreshServiceImpl.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobAutoRefreshServiceImpl.java @@ -14,6 +14,7 @@ import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -30,9 +31,10 @@ public class JobAutoRefreshServiceImpl implements JobService { private final ObjectMapper mapper; private final YarnConfiguration yarnConfiguration; - public JobAutoRefreshServiceImpl(ObjectMapper mapper, YarnConfiguration yarnConfiguration) { - this.mapper = mapper; + public JobAutoRefreshServiceImpl( YarnConfiguration yarnConfiguration, Jackson2ObjectMapperBuilder builder) { this.yarnConfiguration = yarnConfiguration; + + this.mapper = builder.build(); } private static final AtomicReference> CACHE = new AtomicReference<>(Lists.immutable.empty()); diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobServiceImpl.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobServiceImpl.java index 2814177..3bfefe8 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobServiceImpl.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/impl/JobServiceImpl.java @@ -16,6 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; @@ -33,9 +34,10 @@ public class JobServiceImpl implements JobService { private final ObjectMapper mapper; private final YarnConfiguration yarnConfiguration; - public JobServiceImpl(ObjectMapper mapper, YarnConfiguration yarnConfiguration) { - this.mapper = mapper; + public JobServiceImpl(YarnConfiguration yarnConfiguration, Jackson2ObjectMapperBuilder builder) { this.yarnConfiguration = yarnConfiguration; + + this.mapper = builder.build(); } @Cacheable(value = "job-list", sync = true) 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 2fa030f..a9ad008 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 @@ -16,6 +16,7 @@ import org.eclipse.collections.api.list.ImmutableList; import org.eclipse.collections.api.list.MutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -32,9 +33,10 @@ public class QueueAutoRefreshServiceImpl implements QueueService { private final ObjectMapper mapper; private final YarnConfiguration yarnConfiguration; - public QueueAutoRefreshServiceImpl(ObjectMapper mapper, YarnConfiguration yarnConfiguration) { - this.mapper = mapper; + public QueueAutoRefreshServiceImpl(YarnConfiguration yarnConfiguration, Jackson2ObjectMapperBuilder builder) { this.yarnConfiguration = yarnConfiguration; + + this.mapper = builder.build(); } private static final AtomicReference> CACHE = new AtomicReference<>(Lists.immutable.empty()); 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 d619f39..5b76547 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 @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; @@ -31,9 +32,10 @@ public class QueueServiceImpl implements QueueService { private final ObjectMapper mapper; private final YarnConfiguration yarnConfiguration; - public QueueServiceImpl(ObjectMapper mapper, YarnConfiguration yarnConfiguration) { - this.mapper = mapper; + public QueueServiceImpl(YarnConfiguration yarnConfiguration, Jackson2ObjectMapperBuilder builder) { this.yarnConfiguration = yarnConfiguration; + + this.mapper = builder.build(); } @Cacheable(value = "queue-list", sync = true) diff --git a/service-yarn-query/src/test/java/com/lanyuanxiaoyao/service/yarn/QueueResponseParseTest.java b/service-yarn-query/src/test/java/com/lanyuanxiaoyao/service/yarn/QueueResponseParseTest.java index f010a2d..1b603a4 100644 --- a/service-yarn-query/src/test/java/com/lanyuanxiaoyao/service/yarn/QueueResponseParseTest.java +++ b/service-yarn-query/src/test/java/com/lanyuanxiaoyao/service/yarn/QueueResponseParseTest.java @@ -32,12 +32,12 @@ public class QueueResponseParseTest { } });*/ - YarnConfiguration configuration = new YarnConfiguration(); + /*YarnConfiguration configuration = new YarnConfiguration(); configuration.setCluster("b5"); configuration.setWebUrl("http://b5m2.hdp.dc:8088"); QueueServiceImpl service = new QueueServiceImpl(mapper, configuration); for (YarnQueue yarnQueue : service.list()) { System.out.println(yarnQueue.getQueueName()); - } + }*/ } }