3 files changed, 0 insertions, 226 deletions
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
deleted file mode 100755
index 232023b4..00000000
--- a/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ============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.openecomp.vid.properties;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-
-/**
- * The Class AsdcClientConfiguration.
- */
-@Configuration
-
-@PropertySources({
-		@PropertySource(value="asdc.properties",  ignoreResourceNotFound = true),
-		@PropertySource(value="${container.classpath:}/WEB-INF/conf/asdc.properties", ignoreResourceNotFound = true)
-})
-public class AsdcClientConfiguration {
-
-    @Bean
-    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-        return new PropertySourcesPlaceholderConfigurer();
-    }
-
-	@Value("${asdc.client.type}")
-	private AsdcClientType asdcClientType;
-
-	/** The asdc client host. */
-	@Value("${asdc.client.rest.host}")
-	private String asdcClientHost;
-
-	/** The asdc client port. */
-	@Value("${asdc.client.rest.port}")
-	private int asdcClientPort;
-
-	/** The asdc client auth. */
-	@Value("${asdc.client.rest.auth}")
-	public String asdcClientAuth;
-
-	/** The asdc client protocol. */
-	@Value("${asdc.client.rest.protocol}")
-	public String asdcClientProtocol;
-
-	/**
-	 * Gets the asdc client type.
-	 *
-	 * @return the asdc client type
-	 */
-	public AsdcClientType getAsdcClientType() {
-		return asdcClientType;
-	}
-
-	/**
-	 * Gets the asdc client host.
-	 *
-	 * @return the asdc client host
-	 */
-	public String getAsdcClientHost() {
-		return asdcClientHost;
-	}
-
-	/**
-	 * Gets the asdc client port.
-	 *
-	 * @return the asdc client port
-	 */
-	public int getAsdcClientPort() {
-		return asdcClientPort;
-	}
-
-	/**
-	 * Gets the asdc client auth.
-	 *
-	 * @return the asdc client auth
-	 */
-	public String getAsdcClientAuth() {
-		return asdcClientAuth;
-	}
-
-	/**
-	 * Gets the asdc client protocol.
-	 *
-	 * @return the asdc client protocol
-	 */
-	public String getAsdcClientProtocol() {
-		return asdcClientProtocol;
-	}
-
-	/**
-	 * The Enum AsdcClientType.
-	 */
-	public enum AsdcClientType {
-
-		/** The in memory. */
-		IN_MEMORY,
-
-		/** The rest. */
-		REST,
-
-		/** The local. */
-		LOCAL
-	}
-}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/MsoClientConfiguration.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/MsoClientConfiguration.java
deleted file mode 100644
index f7a331a7..00000000
--- a/vid-app-common/src/main/java/org/openecomp/vid/properties/MsoClientConfiguration.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.openecomp.vid.properties;
-
-/**
- * Created by pickjonathan on 20/06/2017.
- */
-public class MsoClientConfiguration {
-
-
-}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
deleted file mode 100755
index 141b9b27..00000000
--- a/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============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.openecomp.vid.properties;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.openecomp.vid.model.ModelConstants;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-import org.openecomp.vid.controller.VidController;
-/**
- * The Class VidProperties.
- */
-public class VidProperties extends SystemProperties {
-
-	//VID General Properties
-	
-	/** 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(VidController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	/**
-	 * 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, dateFormat.format(new Date()) + 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, dateFormat.format(new Date()) + methodName + "unable to find the value, using the default "
-	    			+ defaultValue);
-	    	propValue = defaultValue;
-	    }
-	    return (propValue);
-	}
-}