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 --- .../org/onap/vid/controllers/VidController.java | 114 --------------------- 1 file changed, 114 deletions(-) delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java (limited to 'vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java deleted file mode 100644 index b9d67b6df..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java +++ /dev/null @@ -1,114 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Modifications Copyright 2018 Nokia - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controllers; - -import org.onap.vid.asdc.AsdcCatalogException; -import org.onap.vid.asdc.beans.SecureServices; -import org.onap.vid.exceptions.VidServiceUnavailableException; -import org.onap.vid.model.PombaInstance.PombaRequest; -import org.onap.vid.model.ServiceModel; -import org.onap.vid.roles.Role; -import org.onap.vid.roles.RoleProvider; -import org.onap.vid.services.AaiService; -import org.onap.vid.services.PombaService; -import org.onap.vid.services.VidService; -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@RestController -public class VidController extends RestrictedBaseController { - - private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VidController.class); - - private final VidService vidService; - private final AaiService aaiService; - private final RoleProvider roleProvider; - private final PombaService pombaService; - - @Autowired - public VidController(VidService vidService, AaiService aaiService, RoleProvider roleProvider, - PombaService pombaService) { - this.vidService = vidService; - this.aaiService = aaiService; - this.roleProvider = roleProvider; - this.pombaService = pombaService; - } - - /** - * @param request the request - * @return the services - */ - @RequestMapping(value = {"/rest/models/services"}, method = RequestMethod.GET) - public SecureServices getServices(HttpServletRequest request) { - LOG.info("Start API for browse ASDC was called"); - SecureServices secureServices = new SecureServices(); - List roles = roleProvider.getUserRoles(request); - secureServices.setServices(aaiService.getServicesByDistributionStatus()); - secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles)); - return secureServices; - } - - - /** - * @param uuid the uuid - * @return the services - * @throws VidServiceUnavailableException the vid service unavailable exception - */ - @RequestMapping(value = {"/rest/models/services/{uuid}"}, method = RequestMethod.GET) - public ServiceModel getService(@PathVariable("uuid") String uuid) throws VidServiceUnavailableException { - try { - return vidService.getService(uuid); - } catch (AsdcCatalogException e) { - LOG.error("Failed to retrieve service definitions from SDC. Error: " + e.getMessage(), e); - throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e); - } - } - - @RequestMapping(value = "/rest/models/reset", method = RequestMethod.POST) - @ResponseStatus(HttpStatus.ACCEPTED) - public void invalidateServiceModelCache() { - vidService.invalidateServiceCache(); - } - - /** - * @return the services view - * @throws VidServiceUnavailableException the vid service unavailable exception - */ - // FIX ME: Circular view path [serviceModels]: would dispatch back to the current handler URL [/serviceModels] again. - @RequestMapping(value = {"/serviceModels"}, method = RequestMethod.GET) - public ModelAndView getServicesView() { - return new ModelAndView("serviceModels"); - } - - @RequestMapping(value = {"/rest/models/services/verifyService"}, method = RequestMethod.POST) - public void verifyServiceInstance(@RequestBody PombaRequest pombaRequest) { - pombaService.verify(pombaRequest); - } -} -- cgit 1.2.3-korg