From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../controllers/AsyncInstantiationController.java | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controllers/AsyncInstantiationController.java (limited to 'vid-app-common/src/main/java/org/onap/vid/controllers/AsyncInstantiationController.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/AsyncInstantiationController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/AsyncInstantiationController.java deleted file mode 100644 index c5621a307..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controllers/AsyncInstantiationController.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.onap.vid.controllers; - - -import org.onap.vid.exceptions.OperationNotAllowedException; -import org.onap.vid.model.ExceptionResponse; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; - -import org.onap.vid.model.JobAuditStatus; -import org.onap.vid.model.ServiceInfo; -import org.onap.vid.model.serviceInstantiation.ServiceInstantiation; -import org.onap.vid.mso.MsoResponseWrapper2; -import org.onap.vid.services.AsyncInstantiationBusinessLogic; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.UUID; -import static org.springframework.http.HttpStatus.METHOD_NOT_ALLOWED; - - -@RestController -@RequestMapping(AsyncInstantiationController.ASYNC_INSTANTIATION) -public class AsyncInstantiationController extends VidRestrictedBaseController { - - public static final String ASYNC_INSTANTIATION = "asyncInstantiation"; - - protected final AsyncInstantiationBusinessLogic asyncInstantiationBL; - - @Autowired - public AsyncInstantiationController(AsyncInstantiationBusinessLogic asyncInstantiationBL) { - this.asyncInstantiationBL = asyncInstantiationBL; - } - - @ExceptionHandler(OperationNotAllowedException.class) - @ResponseStatus(value=METHOD_NOT_ALLOWED) - public ExceptionResponse illegalStateExceptionHandler(Exception e) { - return ControllersUtils.handleException(e, LOGGER); - } - - /** - * Gets the new services status. - * @param request the request - * @return the services list - */ - @RequestMapping(method = RequestMethod.GET) - public List getServicesInfo(HttpServletRequest request) { - return asyncInstantiationBL.getAllServicesInfo(); - } - - @RequestMapping(value = "bulk", method = RequestMethod.POST) - public MsoResponseWrapper2> createBulkOfServices(@RequestBody ServiceInstantiation request, HttpServletRequest httpServletRequest) { - //Push to DB according the model - - String userId = ControllersUtils.extractUserId(httpServletRequest); - List uuids = asyncInstantiationBL.pushBulkJob(request, userId); - - return new MsoResponseWrapper2(200, uuids); - } - - @RequestMapping(value = "job/{jobId}", method = RequestMethod.DELETE) - public void deleteServiceInfo(@PathVariable("jobId") UUID jobId) { - asyncInstantiationBL.deleteJob(jobId); - } - - @RequestMapping(value = "hide/{jobId}", method = RequestMethod.POST) - public void hideServiceInfo(@PathVariable("jobId") UUID jobId) { - asyncInstantiationBL.hideServiceInfo(jobId); - } - - @RequestMapping(value = "auditStatus/{jobId}", method = RequestMethod.GET) - public List getJobAuditStatus(HttpServletRequest request, @PathVariable(value="jobId") UUID jobId, @RequestParam(value="source") JobAuditStatus.SourceStatus source){ - return asyncInstantiationBL.getAuditStatuses(jobId, source); - } - - -} -- cgit 1.2.3-korg