Implant vid-app-common org.onap.vid.job (main and test)

Issue-ID: VID-378

Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 48 insertions, 45 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
index 24b72fdff..8331886c0 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
@@ -7,9 +7,9 @@
  * 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.
@@ -21,9 +21,9 @@
 package org.onap.vid.properties;
 
 import org.apache.commons.lang3.StringUtils;
+import org.onap.vid.model.ModelConstants;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.model.ModelConstants;
 /**
  * The Class VidProperties.
  */
@@ -38,59 +38,62 @@ public class VidProperties extends SystemProperties {
 
 	/** The Constant VID_TRUSTSTORE_FILENAME. */
 	public static final String VID_TRUSTSTORE_FILENAME = "vid.truststore.filename";
-	
+
 	/** The Constant VID_TRUSTSTORE_PASSWD_X. */
 	public static final String VID_TRUSTSTORE_PASSWD_X = "vid.truststore.passwd.x";
-	
+
 	/** The Constant FILESEPARATOR. */
 	public static final String FILESEPARATOR = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
-	
+
 	/** The Constant LOG. */
 	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VidProperties.class);
 
-    public static final String VID_JOB_MAX_HOURS_IN_PROGRESS = "vid.asyncJob.maxHoursInProgress";
+	public static final String VID_JOB_MAX_HOURS_IN_PROGRESS = "vid.asyncJob.maxHoursInProgress";
+
+	public static final String VID_THREAD_COUNT = "vid.thread.count";
+	public static final String VID_THREAD_TIMEOUT = "vid.thread.timeout";
 
 	/**
 	 * Gets the asdc model namespace prefix property
-	 * 
+	 *
 	 * @return the property value or a default value
 	 */
 	public static String getAsdcModelNamespace() {
 		String methodName = "getAsdcModelNamespace ";
 		String asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
-	    try {
-	        asdcModelNamespace = SystemProperties.getProperty(ModelConstants.ASDC_MODEL_NAMESPACE);
-	        if ( asdcModelNamespace == null || asdcModelNamespace.isEmpty()) {
-		    	asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
-		    }
-	    }
-	    catch ( Exception e ) {
-	    	LOG.error (EELFLoggerDelegate.errorLogger, methodName + "unable to find the value, using the default "
-	    			+ ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE);
-	    	asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
-	    }
-	    return (asdcModelNamespace);
+		try {
+			asdcModelNamespace = SystemProperties.getProperty(ModelConstants.ASDC_MODEL_NAMESPACE);
+			if ( asdcModelNamespace == null || asdcModelNamespace.isEmpty()) {
+				asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
+			}
+		}
+		catch ( Exception e ) {
+			LOG.error (EELFLoggerDelegate.errorLogger, methodName + "unable to find the value, using the default "
+					+ ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE);
+			asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
+		}
+		return (asdcModelNamespace);
 	}
 	/**
 	 * Gets the specified property value. If the property is not defined, returns a default value.
-	 * 
+	 *
 	 * @return the property value or a default value
 	 */
 	public static String getPropertyWithDefault ( String propName, String defaultValue ) {
 		String methodName = "getPropertyWithDefault ";
 		String propValue = defaultValue;
-	    try {
-	        propValue = SystemProperties.getProperty(propName);
-	        if ( propValue == null || propValue.isEmpty()) {
-		    	propValue = defaultValue;
-		    }
-	    }
-	    catch ( Exception e ) {
-	    	LOG.error (EELFLoggerDelegate.errorLogger, methodName + "unable to find the value, using the default "
-	    			+ defaultValue);
-	    	propValue = defaultValue;
-	    }
-	    return (propValue);
+		try {
+			propValue = SystemProperties.getProperty(propName);
+			if ( propValue == null || propValue.isEmpty()) {
+				propValue = defaultValue;
+			}
+		}
+		catch ( Exception e ) {
+			LOG.error (EELFLoggerDelegate.errorLogger, methodName + "unable to find the value, using the default "
+					+ defaultValue);
+			propValue = defaultValue;
+		}
+		return (propValue);
 	}
 
 	public static long getLongProperty(String key) {
@@ -98,16 +101,16 @@ public class VidProperties extends SystemProperties {
 	}
 
 	public static long getLongProperty(String key, long defaultValue) {
-	    if (!containsProperty(key)) {
-            LOG.debug(EELFLoggerDelegate.debugLogger, "No such property: {}. {} value is used", key, defaultValue);
-            return defaultValue;
-        }
-        String configValue = getProperty(key);
-        if (StringUtils.isNumeric(configValue)) {
-            return Long.parseLong(configValue);
-        } else {
-            LOG.debug(EELFLoggerDelegate.debugLogger, "{} property value is not valid: {}. {} value is used", key, configValue, defaultValue);
-            return defaultValue;
-        }
-    }
+		if (!containsProperty(key)) {
+			LOG.debug(EELFLoggerDelegate.debugLogger, "No such property: {}. {} value is used", key, defaultValue);
+			return defaultValue;
+		}
+		String configValue = getProperty(key);
+		if (StringUtils.isNumeric(configValue)) {
+			return Long.parseLong(configValue);
+		} else {
+			LOG.debug(EELFLoggerDelegate.debugLogger, "{} property value is not valid: {}. {} value is used", key, configValue, defaultValue);
+			return defaultValue;
+		}
+	}
 }