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 <ittay.stern@att.com>

1 files changed, 126 insertions, 0 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java
new file mode 100644
index 000000000..2f8d6e299
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java
@@ -0,0 +1,126 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.controller;
+
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.category.CategoryParametersResponse;
+import org.onap.vid.model.CategoryParameter.Family;
+import org.onap.vid.services.CategoryParameterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.onap.vid.utils.Logging.getMethodName;
+
+/**
+ * The Class PropertyController.
+ */
+@RestController
+public class PropertyController extends RestrictedBaseController{
+	
+
+	/** The logger. */
+	private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(PropertyController.class);
+
+	@Autowired
+	protected CategoryParameterService categoryParameterService;
+
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/propertyhome" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== PropertyController welcome start");
+		return new ModelAndView(getViewName());		
+	}
+	
+	/**
+	 * Gets the property.
+	 *
+	 * @param name the name
+	 * @param defaultvalue the defaultvalue
+	 * @param request the request
+	 * @return the property
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/get_property/{name}/{defaultvalue}", method = RequestMethod.GET)
+	public ResponseEntity<String> getProperty (@PathVariable("name") String name, @PathVariable("defaultvalue") String defaultvalue,
+			HttpServletRequest request) {
+		
+		String methodName = "getProperty";	
+		ResponseEntity<String> resp = null;
+		String pvalue = null;
+		LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " start");
+		
+		try {
+			// convert "_" to "." in the property name
+			if (name == null || name.length() == 0 ) {
+				return ( new ResponseEntity<String> (defaultvalue, HttpStatus.OK));
+			}
+			// convert "_" to "." in the property name
+			String propertyName = name.replace('_', '.');
+			pvalue = SystemProperties.getProperty(propertyName);
+			if ( ( pvalue == null ) || ( pvalue.length() == 0 ) ) {
+				pvalue = defaultvalue;
+			}
+			resp = new ResponseEntity<>(pvalue, HttpStatus.OK);
+		}
+		catch (Exception e) {
+			LOGGER.info(EELFLoggerDelegate.errorLogger,  "<== " + "." + methodName + e.toString());
+			LOGGER.debug(EELFLoggerDelegate.debugLogger,  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " returning " + pvalue);
+  		return ( resp );
+	}
+
+	/**
+	 * Gets the owning entity properties.
+	 * @param request the request
+	 * @return the property
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/category_parameter", method = RequestMethod.GET)
+	public ResponseEntity getCategoryParameter(HttpServletRequest request, @RequestParam(value="familyName", required = true) Family familyName) {
+		LOGGER.debug(EELFLoggerDelegate.debugLogger, "start {}({})", getMethodName());
+		try {
+			CategoryParametersResponse response = categoryParameterService.getCategoryParameters(familyName);
+			LOGGER.debug(EELFLoggerDelegate.debugLogger, "end {}() => {}", getMethodName(), response);
+			return new ResponseEntity<>(response, HttpStatus.OK);
+		}
+		catch (Exception exception) {
+			LOGGER.error("failed to retrieve category parameter list from DB.", exception);
+			return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+
+}