diff options
author | GuangrongFu <fu.guangrong@zte.com.cn> | 2021-12-18 15:08:14 +0800 |
---|---|---|
committer | Guangrong Fu <fu.guangrong@zte.com.cn> | 2022-08-11 18:51:35 +0800 |
commit | c4bd70c1f74cd04c441f76de4359e166a089660a (patch) | |
tree | 634a0da7181a1fa8030fb6beb14d8a7d2f6d86c3 /engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling | |
parent | 61da3e3d053548815054384e5e18750e87463ee9 (diff) |
Switched from Dropwizard to Springboot
Issue-ID: HOLMES-511
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Change-Id: I72b53ad4073e0a07a4c6a234781dc0d139584dda
Diffstat (limited to 'engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling')
-rw-r--r-- | engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/DMaaPResponseUtil.java | 14 | ||||
-rw-r--r-- | engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/DMaaPResponseUtil.java b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/DMaaPResponseUtil.java index 394dc08..4abf296 100644 --- a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/DMaaPResponseUtil.java +++ b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/DMaaPResponseUtil.java @@ -15,22 +15,18 @@ */ package org.onap.holmes.dsa.dmaappolling; +import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.jvnet.hk2.annotations.Service; -import org.onap.holmes.common.api.stat.VesAlarm; import org.onap.holmes.common.api.stat.AlarmAdditionalField; -import com.google.gson.Gson; +import org.onap.holmes.common.api.stat.VesAlarm; +import org.springframework.stereotype.Component; -import java.util.Map; -import java.util.TimeZone; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; +import java.util.*; import static org.onap.holmes.common.utils.GsonUtil.*; -@Service +@Component public class DMaaPResponseUtil { public VesAlarm convertJsonToVesAlarm(String responseJson) { diff --git a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java index af772fb..4fd52ef 100644 --- a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java +++ b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 ZTE Corporation. + * Copyright 2017-2022 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,10 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.onap.holmes.common.api.stat.VesAlarm; -import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder; import org.onap.holmes.common.exception.CorrelationException; import org.onap.holmes.common.utils.JerseyClient; +import org.onap.holmes.common.utils.SpringContextUtil; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -34,8 +33,7 @@ import java.util.UUID; @Slf4j public class Subscriber { - private DMaaPResponseUtil dMaaPResponseUtil = ServiceLocatorHolder.getLocator() - .getService(DMaaPResponseUtil.class); + private DMaaPResponseUtil dMaaPResponseUtil = SpringContextUtil.getBean(DMaaPResponseUtil.class); /** * The number of milliseconds to wait for messages if none are immediately available. This |