diff options
Diffstat (limited to 'server/src/main/java/org/onap/usecaseui')
62 files changed, 170 insertions, 332 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/UuiServerApplication.java b/server/src/main/java/org/onap/usecaseui/server/UuiServerApplication.java index d7695144..88b95692 100644 --- a/server/src/main/java/org/onap/usecaseui/server/UuiServerApplication.java +++ b/server/src/main/java/org/onap/usecaseui/server/UuiServerApplication.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.util.unit.DataSize; import org.springframework.web.client.RestTemplate; -import javax.servlet.MultipartConfigElement; +import jakarta.servlet.MultipartConfigElement; @SpringBootApplication @EnableAutoConfiguration(exclude={JpaRepositoriesAutoConfiguration.class}) diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java index 0a077241..4979ce92 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsHeader.java @@ -18,10 +18,10 @@ package org.onap.usecaseui.server.bean; import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java index f11175ff..568b3961 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/AlarmsInformation.java @@ -17,12 +17,12 @@ package org.onap.usecaseui.server.bean; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java index c6e63bbf..cabe9248 100755 --- a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java @@ -18,10 +18,10 @@ package org.onap.usecaseui.server.bean; import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
@Entity
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java index ef749029..ee6b5761 100755 --- a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceInformation.java @@ -16,12 +16,12 @@ package org.onap.usecaseui.server.bean;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
@Entity
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java index 8a8b0f22..99396011 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceBean.java @@ -15,10 +15,10 @@ */ package org.onap.usecaseui.server.bean; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="service_instances") diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceInstanceOperations.java b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceInstanceOperations.java index 313e2361..3c36e7ee 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/ServiceInstanceOperations.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/ServiceInstanceOperations.java @@ -17,10 +17,10 @@ package org.onap.usecaseui.server.bean; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="service_instance_operations") diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/SortMaster.java b/server/src/main/java/org/onap/usecaseui/server/bean/SortMaster.java index 28a94e24..86aefabe 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/SortMaster.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/SortMaster.java @@ -17,10 +17,10 @@ package org.onap.usecaseui.server.bean; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="sort_master") diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/intent/CCVPNInstance.java b/server/src/main/java/org/onap/usecaseui/server/bean/intent/CCVPNInstance.java index 55eb84a2..3d1c60de 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/intent/CCVPNInstance.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/intent/CCVPNInstance.java @@ -14,7 +14,7 @@ * limitations under the License. */ package org.onap.usecaseui.server.bean.intent; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/intent/InstancePerformance.java b/server/src/main/java/org/onap/usecaseui/server/bean/intent/InstancePerformance.java index 25ddb6f0..37d74d89 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/intent/InstancePerformance.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/intent/InstancePerformance.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.bean.intent; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentInstance.java b/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentInstance.java index d877103c..384fcbe9 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentInstance.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentInstance.java @@ -16,7 +16,7 @@ package org.onap.usecaseui.server.bean.intent; import org.apache.commons.collections.MapUtils; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentModel.java b/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentModel.java index 1e21df25..572e399d 100644 --- a/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentModel.java +++ b/server/src/main/java/org/onap/usecaseui/server/bean/intent/IntentModel.java @@ -16,12 +16,12 @@ package org.onap.usecaseui.server.bean.intent; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="intent_model") diff --git a/server/src/main/java/org/onap/usecaseui/server/conf/intent/IntentScheduleTask.java b/server/src/main/java/org/onap/usecaseui/server/conf/intent/IntentScheduleTask.java index 31296fd5..e727d1cc 100644 --- a/server/src/main/java/org/onap/usecaseui/server/conf/intent/IntentScheduleTask.java +++ b/server/src/main/java/org/onap/usecaseui/server/conf/intent/IntentScheduleTask.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; @Configuration diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java index 68f9fc67..d9684e3e 100755 --- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.onap.usecaseui.server.controller;
import java.text.ParseException;
@@ -25,7 +26,7 @@ import java.util.List; import java.util.Map;
import java.util.Set;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import com.google.common.base.Throwables;
import org.onap.usecaseui.server.bean.AlarmsHeader;
@@ -41,13 +42,12 @@ import org.onap.usecaseui.server.util.UuiCommonUtil; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java index 86d8d6c9..df6530ce 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/IntentController.java @@ -21,7 +21,7 @@ import java.text.ParseException; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import com.alibaba.fastjson.JSONArray; import org.apache.commons.collections.MapUtils; @@ -39,6 +39,7 @@ import org.onap.usecaseui.server.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java index cb433917..45a8bbda 100755 --- a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.PerformanceHeader; import org.onap.usecaseui.server.bean.PerformanceInformation; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/csmf/SlicingController.java b/server/src/main/java/org/onap/usecaseui/server/controller/csmf/SlicingController.java index 97226bae..dc407764 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/csmf/SlicingController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/csmf/SlicingController.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.controller.csmf; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.csmf.SlicingOrder; import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; import org.onap.usecaseui.server.service.csmf.SlicingService; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java index 2b455d60..2735efbc 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java @@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.alibaba.fastjson.JSONObject; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java index 1d4b127b..1e850546 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; @Controller diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java index 8b7bc923..3529279b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java @@ -18,8 +18,8 @@ package org.onap.usecaseui.server.controller.lcm; import java.text.ParseException; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.ServiceBean; import org.onap.usecaseui.server.bean.ServiceInstanceOperations; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java index 9ac0d3d2..47f96de0 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.service.lcm.PackageDistributionService; import org.onap.usecaseui.server.service.lcm.ServiceInstanceService; import org.onap.usecaseui.server.util.UuiCommonUtil; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java index f53a510a..8798fb8c 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java @@ -39,8 +39,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.text.ParseException; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; @Controller @org.springframework.context.annotation.Configuration diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java index 3a874123..602db990 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java @@ -16,7 +16,7 @@ package org.onap.usecaseui.server.controller.lcm; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.lcm.ServiceTemplateInput; import org.onap.usecaseui.server.service.lcm.CustomerService; import org.onap.usecaseui.server.service.lcm.ServiceTemplateService; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java index 951af184..11d75f2d 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java @@ -22,8 +22,8 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; @Controller diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java index c91f28be..453b5f5e 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @Controller @org.springframework.context.annotation.Configuration diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java index bfe22296..48b4057d 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.controller.nsmf; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; import org.onap.usecaseui.server.service.nsmf.ResourceMgtService; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java index 8f35b68b..68b9b54c 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.controller.nsmf; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; import org.onap.usecaseui.server.bean.nsmf.monitor.ServiceList; import org.onap.usecaseui.server.service.nsmf.ResourceMonitorService; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/TaskMgtController.java b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/TaskMgtController.java index f5392983..55a94974 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/TaskMgtController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/TaskMgtController.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.controller.nsmf; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskAuditInfo; import org.onap.usecaseui.server.service.nsmf.TaskMgtService; diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java index 026d1e76..af52a3fe 100644 --- a/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java +++ b/server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.sotn.NetWorkResource; import org.onap.usecaseui.server.bean.sotn.Pinterface; diff --git a/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java b/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java index 09558bc0..c51aa4bd 100755 --- a/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java +++ b/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java @@ -49,7 +49,7 @@ public class HibernateConfiguration private Properties hibernateProperties() {
Properties properties = new Properties();
- properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");
+ properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
properties.setProperty("hibernate.current_session_context_class", environment.getProperty("spring.jpa.properties.hibernate.current_session_context_class"));
properties.setProperty("hibernate.show-sql", environment.getProperty("spring.jpa.properties.hibernate.show-sql"));
properties.setProperty("hibernate.cache.use_second_level_cache", environment.getProperty("spring.jpa.properties.hibernate.cache.use_second_level_cache"));
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java index c7da3ec0..f24ac133 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java @@ -15,7 +15,6 @@ */ package org.onap.usecaseui.server.service.csmf.impl; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; @@ -30,7 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import okhttp3.MediaType; import okhttp3.RequestBody; import org.onap.usecaseui.server.bean.ServiceInstanceOperations; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java index d8e1eaef..3e0777e0 100755 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java @@ -21,13 +21,12 @@ import java.util.ArrayList; import java.util.Collections;
import java.util.List;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.Transactional;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.onap.usecaseui.server.bean.AlarmsHeader;
import org.onap.usecaseui.server.bean.SortMaster;
import org.onap.usecaseui.server.service.AlarmsHeaderService;
@@ -44,7 +43,7 @@ import org.springframework.stereotype.Service; @Transactional
@org.springframework.context.annotation.Configuration
@EnableAspectJAutoProxy
-public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
+public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
private static final Logger logger = LoggerFactory.getLogger(AlarmsHeaderServiceImpl.class);
@@ -115,8 +114,8 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { }
Query query = session.createQuery(count.toString());
if(UuiCommonUtil.isNotNullOrEmpty(alarmsHeader.getStartEpochMicrosec())&&UuiCommonUtil.isNotNullOrEmpty(alarmsHeader.getLastEpochMicroSec())) {
- query.setString("startTime",alarmsHeader.getStartEpochMicrosec());
- query.setString("endTime",alarmsHeader.getLastEpochMicroSec());
+ query.setParameter("startTime",alarmsHeader.getStartEpochMicrosec());
+ query.setParameter("endTime",alarmsHeader.getLastEpochMicroSec());
}
long q=(long)query.uniqueResult();
session.flush();
@@ -159,8 +158,8 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { logger.info("AlarmsHeaderServiceImpl queryAlarmsHeader: alarmsHeader={}", alarmsHeader);
Query query = session.createQuery(hql.toString());
if(UuiCommonUtil.isNotNullOrEmpty(alarmsHeader.getStartEpochMicrosec())&&UuiCommonUtil.isNotNullOrEmpty(alarmsHeader.getLastEpochMicroSec())) {
- query.setString("startTime",alarmsHeader.getStartEpochMicrosec());
- query.setString("endTime",alarmsHeader.getLastEpochMicroSec());
+ query.setParameter("startTime",alarmsHeader.getStartEpochMicrosec());
+ query.setParameter("endTime",alarmsHeader.getLastEpochMicroSec());
}
query.setFirstResult(offset);
query.setMaxResults(pageSize);
@@ -205,13 +204,13 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { //Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' , startEpochMicrosecCleared='"+startEpochMicrosecCleared+"' ,lastEpochMicroSecCleared='"+lastEpochMicroSecCleared+"' where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"'");
Query q=session.createQuery("update AlarmsHeader set status=:status, startEpochMicrosecCleared=:startEpochMicrosecCleared ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");
- q.setString("status",status);
+ q.setParameter("status",status);
- q.setString("startEpochMicrosecCleared",startEpochMicrosecCleared);
- q.setString("lastEpochMicroSecCleared",lastEpochMicroSecCleared);
- q.setString("eventName",eventName);
- q.setString("reportingEntityName",reportingEntityName);
- q.setString("specificProblem",specificProblem);
+ q.setParameter("startEpochMicrosecCleared",startEpochMicrosecCleared);
+ q.setParameter("lastEpochMicroSecCleared",lastEpochMicroSecCleared);
+ q.setParameter("eventName",eventName);
+ q.setParameter("reportingEntityName",reportingEntityName);
+ q.setParameter("specificProblem",specificProblem);
q.executeUpdate();
@@ -232,7 +231,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { hql+=" where a.status = :status";
Query query = session.createQuery(hql);
if (!status.equals("0"))
- query.setString("status",status);
+ query.setParameter("status",status);
return query.uniqueResult().toString();
} catch (Exception e) {
logger.error("exception occurred while performing AlarmsHeaderServiceImpl queryStatusCount. Details:" + e.getMessage());
@@ -247,7 +246,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { String string = "from AlarmsHeader a where 1=1 and a.id=:id";
Query q = session.createQuery(string);
- q.setString("id",id);
+ q.setParameter("id",id);
AlarmsHeader alarmsHeader =(AlarmsHeader)q.uniqueResult();
return alarmsHeader;
@@ -263,7 +262,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService { try{
StringBuffer hql =new StringBuffer("from SortMaster a where 1=1 and a.sortType=:sortType");
Query query = session.createQuery(hql.toString());
- query.setString("sortType",sortType);
+ query.setParameter("sortType",sortType);
List<SortMaster> list= query.list();
return list;
} catch (Exception e) {
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java index 7bd444a9..f48133ef 100755 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java @@ -18,12 +18,11 @@ package org.onap.usecaseui.server.service.impl; import java.util.ArrayList;
import java.util.List;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.Transactional;
-import org.hibernate.Query;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.Transactional;
+import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.onap.usecaseui.server.bean.AlarmsInformation;
import org.onap.usecaseui.server.bean.maxAndMinTimeBean;
import org.onap.usecaseui.server.service.AlarmsInformationService;
@@ -156,15 +155,15 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService { hql += " and (CASE WHEN a.startEpochMicrosec=:zero THEN a.lastEpochMicroSec ELSE a.startEpochMicrosec END) between :startTime and :endTime ";
}
Query query = session.createQuery(hql);
- query.setString("zero",zero);
+ query.setParameter("zero",zero);
if (sourceName != null && !"".equals(sourceName)){
- query.setString("sourceName",sourceName);
+ query.setParameter("sourceName",sourceName);
}
if (UuiCommonUtil.isNotNullOrEmpty(status)){
- query.setString("status",status);
+ query.setParameter("status",status);
}
if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)){
- query.setString("startTime", startTime).setString("endTime", endTime);
+ query.setParameter("startTime", startTime).setParameter("endTime", endTime);
}
long num=(long) query.uniqueResult();
return (int)num;
@@ -180,7 +179,7 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService { Session session = getSession();
try {
String sql = "select MAX(startEpochMicrosec),MIN(startEpochMicrosec) FROM alarms_commoneventheader";
- Query query = session.createSQLQuery(sql);
+ Query query = session.createNativeQuery(sql);
list = query.list();
session.flush();
}catch (Exception e){
@@ -198,7 +197,7 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService { try {
String string = "from AlarmsInformation a where 1=1 and a.headerId=:headerId";
Query query = session.createQuery(string);
- query.setString("headerId",headerId);
+ query.setParameter("headerId",headerId);
List<AlarmsInformation> list = query.list();
session.flush();
return list;
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java index c4af8ddc..68890db5 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/InitializationServiceImpl.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.service.impl; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.onap.usecaseui.server.service.InitializationService; import org.slf4j.Logger; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java index 9ff3dec2..a403858c 100755 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java @@ -19,13 +19,12 @@ package org.onap.usecaseui.server.service.impl; import java.util.ArrayList;
import java.util.List;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.Transactional;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.onap.usecaseui.server.bean.PerformanceHeader;
import org.onap.usecaseui.server.service.PerformanceHeaderService;
import org.onap.usecaseui.server.util.Page;
@@ -102,7 +101,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService { }
Query query = session.createQuery(hql.toString());
if(null!=performanceHeder.getStartEpochMicrosec() && null!=performanceHeder.getLastEpochMicroSec()) {
- query.setString("startTime",performanceHeder.getStartEpochMicrosec()).setString("endTime",performanceHeder.getLastEpochMicroSec());
+ query.setParameter("startTime",performanceHeder.getStartEpochMicrosec()).setParameter("endTime",performanceHeder.getLastEpochMicroSec());
}
long q=(long)query.uniqueResult();
session.flush();
@@ -131,7 +130,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService { }
Query query = session.createQuery(hql.toString());
if(UuiCommonUtil.isNotNullOrEmpty(performanceHeder.getStartEpochMicrosec())&& UuiCommonUtil.isNotNullOrEmpty(performanceHeder.getLastEpochMicroSec())) {
- query.setString("startTime",performanceHeder.getStartEpochMicrosec()).setString("endTime",performanceHeder.getLastEpochMicroSec());
+ query.setParameter("startTime",performanceHeder.getStartEpochMicrosec()).setParameter("endTime",performanceHeder.getLastEpochMicroSec());
}
query.setFirstResult(offset);
query.setMaxResults(pageSize);
@@ -185,7 +184,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService { String string = "from PerformanceHeader a where 1=1 and a.id=:id";
Query q = session.createQuery(string);
- q.setString("id",id);
+ q.setParameter("id",id);
PerformanceHeader performanceHeader =(PerformanceHeader)q.uniqueResult();
session.flush();
return performanceHeader;
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java index 0cc99193..c09bccbc 100755 --- a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java @@ -21,14 +21,13 @@ import java.util.Date; import java.util.List;
-import javax.persistence.EntityManagerFactory;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.transaction.Transactional;
import com.google.common.base.Throwables;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
import org.onap.usecaseui.server.bean.PerformanceInformation;
import org.onap.usecaseui.server.service.PerformanceInformationService;
import org.onap.usecaseui.server.util.UuiCommonUtil;
@@ -148,13 +147,13 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation }
Query query = session.createQuery(hql);
if (resourceId != null && !"".equals(resourceId)){
- query.setString("resourceId",resourceId);
+ query.setParameter("resourceId",resourceId);
}
if (name != null && !"".equals(name)){
- query.setString("name",name);
+ query.setParameter("name",name);
}
if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)){
- query.setString("startTime", startTime).setString("endTime", endTime);
+ query.setParameter("startTime", startTime).setParameter("endTime", endTime);
}
logger.info("PerformanceInformationServiceImpl queryDateBetween: list={}", query.list());
return query.list();
@@ -170,7 +169,7 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation try {
String string = "from PerformanceInformation a where 1=1 and a.headerId=:headerId";
Query query = session.createQuery(string);
- query.setString("headerId",headerId);
+ query.setParameter("headerId",headerId);
List<PerformanceInformation> list = query.list();
session.flush();
return list;
@@ -197,13 +196,13 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation }
Query query = session.createQuery(hql);
if (sourceId != null && !"".equals(sourceId)){
- query.setString("resourceId",sourceId);
+ query.setParameter("resourceId",sourceId);
}
if (name != null && !"".equals(name)){
- query.setString("name",name);
+ query.setParameter("name",name);
}
if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)){
- query.setString("startTime", startTime).setString("endTime", endTime);
+ query.setParameter("startTime", startTime).setParameter("endTime", endTime);
}
String num=(String) query.uniqueResult();
return UuiCommonUtil.isNotNullOrEmpty(num)?num:0+"";
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java index c47cdc15..372a0c1b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java @@ -18,7 +18,7 @@ package org.onap.usecaseui.server.service.intent.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -46,8 +46,8 @@ import org.springframework.stereotype.Service; import retrofit2.Call; import retrofit2.Response; -import javax.annotation.Resource; -import javax.transaction.Transactional; +import jakarta.annotation.Resource; +import jakarta.transaction.Transactional; import java.io.*; import java.text.SimpleDateFormat; import java.util.*; @@ -103,11 +103,11 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { if (null != instance) { if(UuiCommonUtil.isNotNullOrEmpty(instance.getInstanceId())) { String ver =instance.getInstanceId(); - hql.append(" and a.instance_id = '"+ver+"'"); + hql.append(" and a.instanceId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getJobId())) { String ver =instance.getJobId(); - hql.append(" and a.job_id = '"+ver+"'"); + hql.append(" and a.jobId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getStatus())) { String ver =instance.getStatus(); @@ -141,11 +141,11 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { if (null != instance) { if(UuiCommonUtil.isNotNullOrEmpty(instance.getInstanceId())) { String ver =instance.getInstanceId(); - count.append(" and a.instance_id = '"+ver+"'"); + count.append(" and a.instanceId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getJobId())) { String ver =instance.getJobId(); - count.append(" and a.job_id = '"+ver+"'"); + count.append(" and a.jobId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getStatus())) { String ver =instance.getStatus(); diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java index 6d2911a7..57262e63 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -91,7 +91,7 @@ public class IntentServiceImpl implements IntentService { public List<IntentModel> listModels(){ try(Session session = getSession()){ - StringBuffer hql =new StringBuffer("from IntentModel a where 1=1 order by create_time "); + StringBuffer hql =new StringBuffer("from IntentModel a where 1=1 order by createTime "); Query query = session.createQuery(hql.toString()); //query.setString("sortType",sortType); List<IntentModel> list= query.list(); diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java index 3f54718e..dcd8f6db 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/CustomerService.java @@ -22,7 +22,7 @@ import com.alibaba.fastjson.JSONObject; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface CustomerService { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java index 027f096a..2c5da0f1 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java @@ -17,7 +17,7 @@ package org.onap.usecaseui.server.service.lcm; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.lcm.VfNsPackageInfo; import org.onap.usecaseui.server.service.lcm.domain.sdc.bean.SDCServiceTemplate; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java index c0811471..d321fe3a 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/ServiceLcmService.java @@ -24,7 +24,7 @@ import org.onap.usecaseui.server.service.lcm.domain.so.bean.ServiceOperation; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface ServiceLcmService { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java index 7cfb762e..8291307a 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerService.java @@ -47,7 +47,7 @@ import java.util.Collections; import java.util.List; import java.util.ArrayList; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; @Service("CustomerService") @org.springframework.context.annotation.Configuration diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java index e3b758e4..ead2ef5e 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java @@ -27,8 +27,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.ServiceBean; import org.onap.usecaseui.server.bean.lcm.VfNsPackageInfo; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java index 17a44656..63ffd232 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.onap.usecaseui.server.bean.ServiceBean; import org.onap.usecaseui.server.bean.ServiceInstanceOperations; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java index bfd79b5f..0866471a 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java @@ -22,14 +22,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.EntityManagerFactory; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.base.Throwables; -import javax.transaction.Transactional; -import org.hibernate.Query; +import jakarta.transaction.Transactional; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -189,8 +187,8 @@ public class DefaultServiceLcmService implements ServiceLcmService { try { String string = "update ServiceBean set status=:status where 1=1 and serviceInstanceId=:serviceInstanceId"; Query q = session.createQuery(string); - q.setString("status", status); - q.setString("serviceInstanceId", serviceInstanceId); + q.setParameter("status", status); + q.setParameter("serviceInstanceId", serviceInstanceId); q.executeUpdate(); session.flush(); } catch (Exception e) { @@ -208,7 +206,7 @@ public class DefaultServiceLcmService implements ServiceLcmService { String string = "from ServiceBean where 1=1 and serviceInstanceId=:serviceInstanceId"; Query q = session.createQuery(string); - q.setString("serviceInstanceId", serviceInstanceId); + q.setParameter("serviceInstanceId", serviceInstanceId); List<ServiceBean> list = q.list(); session.flush(); if (list.size() > 0) { @@ -232,7 +230,7 @@ public class DefaultServiceLcmService implements ServiceLcmService { String string = "from ServiceBean where 1=1 and parentServiceInstanceId=:parentServiceInstanceId"; Query q = session.createQuery(string); - q.setString("parentServiceInstanceId", parentServiceInstanceId); + q.setParameter("parentServiceInstanceId", parentServiceInstanceId); list = q.list(); session.flush(); } catch (Exception e) { @@ -272,10 +270,10 @@ public class DefaultServiceLcmService implements ServiceLcmService { try { String hql = "select a.* from service_instance_operations a where service_instance_id =:serviceId and operation_type =:operationType and start_time = (select max(start_time) from service_instance_operations where service_instance_id=:serviceInstanceId )"; - Query q = session.createSQLQuery(hql).addEntity(ServiceInstanceOperations.class); - q.setString("serviceId", serviceInstanceId); - q.setString("serviceInstanceId", serviceInstanceId); - q.setString("operationType", operationType); + Query q = session.createNativeQuery(hql).addEntity(ServiceInstanceOperations.class); + q.setParameter("serviceId", serviceInstanceId); + q.setParameter("serviceInstanceId", serviceInstanceId); + q.setParameter("operationType", operationType); list = q.list(); ServiceInstanceOperations serviceOperation = list.get(0); serviceOperation.setOperationResult(operationResult); @@ -301,9 +299,9 @@ public class DefaultServiceLcmService implements ServiceLcmService { try { String hql = "select a.* from service_instance_operations a where service_instance_id =:serviceId and start_time = (select max(start_time) from service_instance_operations where service_instance_id=:serviceInstanceId)"; - Query q = session.createSQLQuery(hql).addEntity(ServiceInstanceOperations.class); - q.setString("serviceId", serviceId); - q.setString("serviceInstanceId", serviceId); + Query q = session.createNativeQuery(hql).addEntity(ServiceInstanceOperations.class); + q.setParameter("serviceId", serviceId); + q.setParameter("serviceInstanceId", serviceId); q.list(); list = q.list(); if (!list.isEmpty()) { diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java index 4d3573a6..07ea2b02 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java @@ -46,13 +46,8 @@ import org.springframework.core.io.Resource; import retrofit2.Response; import org.onap.usecaseui.server.service.lcm.domain.aai.bean.RelationshipData; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.FileReader; +import jakarta.servlet.ServletInputStream; import java.io.IOException; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; import java.util.*; import java.util.stream.Collectors; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java index 9a8f391a..9970ce59 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceConvert.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.apache.commons.beanutils.BeanUtils; import org.onap.usecaseui.server.bean.nsmf.common.PagedResult; import org.onap.usecaseui.server.bean.nsmf.resource.HostedBusinessInfo; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java index a12ddbcf..ac8b3fdc 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMgtServiceImpl.java @@ -23,7 +23,6 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import okhttp3.MediaType; import okhttp3.RequestBody; -import org.apache.commons.beanutils.BeanUtils; import org.onap.usecaseui.server.bean.ServiceInstanceOperations; import org.onap.usecaseui.server.bean.nsmf.common.ResultHeader; import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; @@ -59,20 +58,16 @@ import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.Slice import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.SliceProfileList; import org.onap.usecaseui.server.service.slicingdomain.so.SOSliceService; import org.onap.usecaseui.server.service.slicingdomain.so.bean.ActivateService; -import org.onap.usecaseui.server.service.slicingdomain.so.bean.AnSliceTaskInfo; -import org.onap.usecaseui.server.service.slicingdomain.so.bean.CnSliceTaskInfo; import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOOperation; -import org.onap.usecaseui.server.service.slicingdomain.so.bean.TnBHSliceTaskInfo; import org.onap.usecaseui.server.util.DateUtils; import org.onap.usecaseui.server.util.RestfulServices; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; import retrofit2.Response; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.lang.reflect.Type; import java.util.List; @@ -157,6 +152,9 @@ public class ResourceMgtServiceImpl implements ResourceMgtService { } public void addBusinessProgress(SlicingBusinessList slicingBusinessList) { + System.out.println(aaiSliceService); + System.out.println(serviceLcmService); + System.out.println(generalConvert); if (slicingBusinessList.getSlicingBusinessInfoList() == null || slicingBusinessList.getSlicingBusinessInfoList().size() == 0) { logger.error( diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java index 57de5338..a2857168 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/ResourceMonitorServiceImpl.java @@ -24,7 +24,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import okhttp3.MediaType; import okhttp3.RequestBody; import org.onap.usecaseui.server.bean.nsmf.common.ResultHeader; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java index f84a75b1..e6d2f37b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceConvert.java @@ -21,8 +21,6 @@ import java.util.stream.Collectors; import lombok.Setter; import org.apache.commons.beanutils.BeanUtils; import org.onap.usecaseui.server.bean.nsmf.common.PagedResult; -import org.onap.usecaseui.server.bean.nsmf.common.ResultHeader; -import org.onap.usecaseui.server.bean.nsmf.common.ServiceResult; import org.onap.usecaseui.server.bean.nsmf.task.BusinessDemandInfo; import org.onap.usecaseui.server.bean.nsmf.task.EndPointInfo; import org.onap.usecaseui.server.bean.nsmf.task.NsiAndSubNssiInfo; @@ -32,18 +30,9 @@ import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskCreationInfo; import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskCreationProgress; import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskInfo; import org.onap.usecaseui.server.bean.nsmf.task.SlicingTaskList; -import org.onap.usecaseui.server.constant.nsmf.NsmfCodeConstant; import org.onap.usecaseui.server.service.slicingdomain.aai.AAISliceService; import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLink; import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.ConnectionLinkList; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.EndPointInfoList; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.NetworkPolicy; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.Relationship; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connection.RelationshipData; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connectionvo.ConnectionListVo; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connectionvo.ConnectionVo; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connectionvo.EndPointInfoListVo; -import org.onap.usecaseui.server.service.slicingdomain.aai.bean.connectionvo.PropertiesVo; import org.onap.usecaseui.server.service.slicingdomain.so.bean.AnSliceTaskInfo; import org.onap.usecaseui.server.service.slicingdomain.so.bean.CnSliceTaskInfo; import org.onap.usecaseui.server.service.slicingdomain.so.bean.SOTask; @@ -59,7 +48,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java index af861ef6..55694d1f 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/nsmf/impl/TaskMgtServiceImpl.java @@ -55,7 +55,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import retrofit2.Response; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java b/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java index ea2fe00f..e2066d01 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/sotn/SOTNService.java @@ -17,7 +17,7 @@ package org.onap.usecaseui.server.service.sotn; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.sotn.Pinterface; diff --git a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java index 90e95b0b..d64e3826 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/sotn/impl/SOTNServiceImpl.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.usecaseui.server.bean.sotn.Pinterface; import org.onap.usecaseui.server.bean.sotn.PinterfaceRsp; diff --git a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java index 4fccee8a..600293ec 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java @@ -24,11 +24,12 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.annotation.Resource; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.annotation.Resource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Response; import com.google.common.base.Throwables; import org.glassfish.jersey.client.ClientConfig; @@ -106,7 +107,7 @@ public class DmaapSubscriber implements Runnable { } public List<String> getDMaaPData(String topic) { - Client client = ClientBuilder.newClient(new ClientConfig()); + Client client = ClientBuilder.newClient((Configuration) new ClientConfig()); WebTarget webTarget = client.target(url + "/" + topic + "/" + consumerGroup + "/" + consumer); Response response = webTarget.queryParam("timeout", timeout).request().get(); return response.readEntity(List.class); diff --git a/server/src/main/java/org/onap/usecaseui/server/util/HttpUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/HttpUtil.java index 171ea28c..8e99c2d1 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/HttpUtil.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/HttpUtil.java @@ -38,7 +38,7 @@ import org.onap.usecaseui.server.bean.HttpResponseResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.onap.usecaseui.server.constant.CommonConstant.BLANK; import static org.onap.usecaseui.server.constant.CommonConstant.ENCODING_UTF8; diff --git a/server/src/main/java/org/onap/usecaseui/server/util/MyHttpDelete.java b/server/src/main/java/org/onap/usecaseui/server/util/MyHttpDelete.java deleted file mode 100644 index 7f4dc019..00000000 --- a/server/src/main/java/org/onap/usecaseui/server/util/MyHttpDelete.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. - * - * Licensed 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 - * - * http://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 org.onap.usecaseui.server.util; - -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; - -import java.net.URI; - -public class MyHttpDelete extends HttpEntityEnclosingRequestBase { - public static final String METHOD_NAME = "DELETE"; - - public String getMethod() { - return METHOD_NAME; - } - - public MyHttpDelete(final String uri) { - super(); - setURI(URI.create(uri)); - } - - public MyHttpDelete(final URI uri) { - super(); - setURI(uri); - } - - public MyHttpDelete() { - super(); - } -} diff --git a/server/src/main/java/org/onap/usecaseui/server/util/MyHttpGet.java b/server/src/main/java/org/onap/usecaseui/server/util/MyHttpGet.java deleted file mode 100644 index ccc2e0b6..00000000 --- a/server/src/main/java/org/onap/usecaseui/server/util/MyHttpGet.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 CMCC, Inc. and others. All rights reserved. - * - * Licensed 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 - * - * http://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 org.onap.usecaseui.server.util; - -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; - -import java.net.URI; - -public class MyHttpGet extends HttpEntityEnclosingRequestBase { - public static final String METHOD_NAME = "GET"; - - public String getMethod() { - return METHOD_NAME; - } - - public MyHttpGet(final String uri) { - super(); - setURI(URI.create(uri)); - } - - public MyHttpGet(final URI uri) { - super(); - setURI(uri); - } - - public MyHttpGet() { - super(); - } -}
\ No newline at end of file diff --git a/server/src/main/java/org/onap/usecaseui/server/util/ResponseUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/ResponseUtil.java deleted file mode 100644 index 9891bcf7..00000000 --- a/server/src/main/java/org/onap/usecaseui/server/util/ResponseUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved. - * - * Licensed 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 - * - * http://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 org.onap.usecaseui.server.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -public class ResponseUtil { - - private static Logger logger = LoggerFactory.getLogger(ResponseUtil.class); - - public static boolean responseDownload(String filePath, HttpServletResponse response){ - if (null != response){ - response.setCharacterEncoding("utf-8"); - response.setContentType("application/csv"); - response.setHeader("Content-Disposition","attachment;filename="+filePath); - try(InputStream is = new FileInputStream(filePath); - OutputStream os = response.getOutputStream()){ - byte[] b = new byte[2048]; - int length; - while ((length = is.read(b)) > 0) { - os.write(b, 0, length); - } - return true; - }catch (IOException e){ - logger.error("download csv File error :"+e.getMessage()); - return false; - } - }else{ - logger.error("csvFile generate success,but response is null,don't download to local"); - return false; - } - - } - -} diff --git a/server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java b/server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java index e3ad2744..f20603ec 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/RestfulServices.java @@ -24,7 +24,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/onap/usecaseui/server/util/UploadFileUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/UploadFileUtil.java index 361612e5..155c34d0 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/UploadFileUtil.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/UploadFileUtil.java @@ -15,7 +15,7 @@ */ package org.onap.usecaseui.server.util; -import javax.activation.MimetypesFileTypeMap; +import jakarta.activation.MimetypesFileTypeMap; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; diff --git a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java index 837abee9..596becb9 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.base.Throwables; import org.apache.commons.io.FileUtils; diff --git a/server/src/main/java/org/onap/usecaseui/server/wrapper/WebConfig.java b/server/src/main/java/org/onap/usecaseui/server/wrapper/WebConfig.java index f6475ccf..a82f25c7 100644 --- a/server/src/main/java/org/onap/usecaseui/server/wrapper/WebConfig.java +++ b/server/src/main/java/org/onap/usecaseui/server/wrapper/WebConfig.java @@ -18,11 +18,11 @@ package org.onap.usecaseui.server.wrapper; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @EnableWebMvc -public class WebConfig extends WebMvcConfigurerAdapter { +public class WebConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { |