From 9042880234791fbe2e0ef033091ba93cb7f088f5 Mon Sep 17 00:00:00 2001
From: Marcus G K Williams <marcus.williams@intel.com>
Date: Wed, 23 Aug 2017 11:47:08 -0700
Subject: Conform ccsdk/sli/plugins to ONAP Style

Per ONAP Style Guide:
1. Convert tabs to 4 spaces.
2. Break lines to be less than 120 characters
3. Clean ecomp references
4. Remove extraneous spaces

Issue-Id: CCSDK-1
Change-Id: I5638326170aa3ab26774b373ab573643840e97ab
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
---
 properties-node/provider/pom.xml                   | 152 ++++++++++-----------
 .../ccsdk/sli/plugins/prop/PropertiesNode.java     | 100 +++++++-------
 .../META-INF/spring/properties-node-context.xml    |   4 +-
 .../spring/properties-node-osgi-context.xml        |   8 +-
 4 files changed, 132 insertions(+), 132 deletions(-)

(limited to 'properties-node/provider')

diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index 1c5eff74..a5249d98 100755
--- a/properties-node/provider/pom.xml
+++ b/properties-node/provider/pom.xml
@@ -1,89 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>properties-node</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<version>0.1.0-SNAPSHOT</version>
-	<artifactId>properties-node-provider</artifactId>
-	<packaging>bundle</packaging>
-	<name>Properties Node - Provider</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sli-common</artifactId>
-			<version>${sdnctl.sli.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sli-provider</artifactId>
-			<version>${sdnctl.sli.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-	</dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>properties-node</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <version>0.1.0-SNAPSHOT</version>
+    <artifactId>properties-node-provider</artifactId>
+    <packaging>bundle</packaging>
+    <name>Properties Node - Provider</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${sdnctl.sli.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <version>${sdnctl.sli.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
+    <build>
+        <plugins>
 
 
 
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>org.onap.ccsdk.sli.prop</Bundle-SymbolicName>
-						<Export-Package>org.onap.ccsdk.sli.prop</Export-Package>
-						<Import-Package>*</Import-Package>
-					</instructions>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>org.onap.ccsdk.sli.prop</Bundle-SymbolicName>
+                        <Export-Package>org.onap.ccsdk.sli.prop</Export-Package>
+                        <Import-Package>*</Import-Package>
+                    </instructions>
 
 
-				</configuration>
+                </configuration>
 
-			</plugin>
+            </plugin>
 
 
-		</plugins>
+        </plugins>
 
-	</build>
+    </build>
 </project>
diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
index 165b706b..b4886d55 100644
--- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
+++ b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
@@ -35,63 +35,63 @@ import org.slf4j.LoggerFactory;
 
 public class PropertiesNode implements SvcLogicJavaPlugin {
 
-	private static final Logger log = LoggerFactory.getLogger(PropertiesNode.class);
+    private static final Logger log = LoggerFactory.getLogger(PropertiesNode.class);
 
-	public void readProperties(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
-		String fileName = parseParam(paramMap, "fileName", true, null);
-		String contextPrefix = parseParam(paramMap, "contextPrefix", false, null);
+    public void readProperties(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
+        String fileName = parseParam(paramMap, "fileName", true, null);
+        String contextPrefix = parseParam(paramMap, "contextPrefix", false, null);
 
-		try {
-			Properties pp = new Properties();
-			InputStream in = new FileInputStream(fileName);
-			pp.load(in);
-			for (Object key : pp.keySet()) {
-				String pfx = contextPrefix != null ? contextPrefix + '.' : "";
-				String name = (String) key;
-				String value = pp.getProperty(name);
-				if (value != null && value.trim().length() > 0) {
-					ctx.setAttribute(pfx + name, value.trim());
-					log.info("+++ " + pfx + name + ": [" + value + "]");
-				}
-			}
-		} catch (IOException e) {
-			throw new SvcLogicException("Cannot read property file: " + fileName + ": " + e.getMessage(), e);
-		}
-	}
+        try {
+            Properties pp = new Properties();
+            InputStream in = new FileInputStream(fileName);
+            pp.load(in);
+            for (Object key : pp.keySet()) {
+                String pfx = contextPrefix != null ? contextPrefix + '.' : "";
+                String name = (String) key;
+                String value = pp.getProperty(name);
+                if (value != null && value.trim().length() > 0) {
+                    ctx.setAttribute(pfx + name, value.trim());
+                    log.info("+++ " + pfx + name + ": [" + value + "]");
+                }
+            }
+        } catch (IOException e) {
+            throw new SvcLogicException("Cannot read property file: " + fileName + ": " + e.getMessage(), e);
+        }
+    }
 
-	private String parseParam(Map<String, String> paramMap, String name, boolean required, String def)
-	        throws SvcLogicException {
-		String s = paramMap.get(name);
+    private String parseParam(Map<String, String> paramMap, String name, boolean required, String def)
+            throws SvcLogicException {
+        String s = paramMap.get(name);
 
-		if (s == null || s.trim().length() == 0) {
-			if (!required)
-				return def;
-			throw new SvcLogicException("Parameter " + name + " is required in PropertiesNode");
-		}
+        if (s == null || s.trim().length() == 0) {
+            if (!required)
+                return def;
+            throw new SvcLogicException("Parameter " + name + " is required in PropertiesNode");
+        }
 
-		s = s.trim();
-		String value = "";
-		int i = 0;
-		int i1 = s.indexOf('%');
-		while (i1 >= 0) {
-			int i2 = s.indexOf('%', i1 + 1);
-			if (i2 < 0)
-				throw new SvcLogicException("Cannot parse parameter " + name + ": " + s + ": no matching %");
+        s = s.trim();
+        String value = "";
+        int i = 0;
+        int i1 = s.indexOf('%');
+        while (i1 >= 0) {
+            int i2 = s.indexOf('%', i1 + 1);
+            if (i2 < 0)
+                throw new SvcLogicException("Cannot parse parameter " + name + ": " + s + ": no matching %");
 
-			String varName = s.substring(i1 + 1, i2);
-			String varValue = System.getenv(varName);
-			if (varValue == null)
-				varValue = "";
+            String varName = s.substring(i1 + 1, i2);
+            String varValue = System.getenv(varName);
+            if (varValue == null)
+                varValue = "";
 
-			value += s.substring(i, i1);
-			value += varValue;
+            value += s.substring(i, i1);
+            value += varValue;
 
-			i = i2 + 1;
-			i1 = s.indexOf('%', i);
-		}
-		value += s.substring(i);
+            i = i2 + 1;
+            i1 = s.indexOf('%', i);
+        }
+        value += s.substring(i);
 
-		log.info("Parameter " + name + ": " + value);
-		return value;
-	}
+        log.info("Parameter " + name + ": " + value);
+        return value;
+    }
 }
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
index fd7ace8a..52d1cd96 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
@@ -26,7 +26,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="propertiesNode" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode">
-	</bean>
+    <bean id="propertiesNode" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode">
+    </bean>
 
 </beans>
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
index 19275fc9..a46e37c7 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
@@ -21,12 +21,12 @@
   -->
 
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+             xsi:schemaLocation="http://www.springframework.org/schema/osgi
        http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<service ref="propertiesNode" interface="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
+    <service ref="propertiesNode" interface="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
 
 </beans:beans>
-- 
cgit 1.2.3-korg