Update java files with correct license text

Change-Id: I95dab947ad10ec85ae4234aa3396dd374e313739
Issue-ID: APPC-575
Signed-off-by: Skip Wonnell <skip@att.com>

3 files changed, 67 insertions, 65 deletions

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
index 3fe545334..12f2850ae 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestFlowExecutorNode.java
@@ -1,30 +1,30 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Properties;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,45 +35,44 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TestFlowExecutorNode {
-    
+
     private final Logger logger = LoggerFactory.getLogger(TestFlowExecutorNode.class);
-    
-            
-    //@Before
-            public void setUp() {
-                Properties props = new Properties();
-                InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
-                if (propStr == null) {
-                }
-                try {
-                    props.load(propStr);
-                    propStr.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                // Add properties to global properties
 
-                Enumeration propNames = props.keys();
 
-                while (propNames.hasMoreElements()) {
-                    
-                    String propName = (String) propNames.nextElement();
-                    System.setProperty(propName, props.getProperty(propName));
-                }
+    // @Before
+    public void setUp() {
+        Properties props = new Properties();
+        InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
+        if (propStr == null) {
+        }
+        try {
+            props.load(propStr);
+            propStr.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // Add properties to global properties
+
+        Enumeration propNames = props.keys();
+
+        while (propNames.hasMoreElements()) {
+            String propName = (String) propNames.nextElement();
+            System.setProperty(propName, props.getProperty(propName));
+        }
+
+    }
 
-	}
-            
     @Ignore("Test is taking 60 seconds")
-	@Test(expected=Exception.class)
-	public void testFlowExecutorNode() throws Exception {
-		
-		SvcLogicContext ctx = new SvcLogicContext();
-		ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
-		ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "Configure");
-		ctx.setAttribute(FlowControllerConstants.VNFC_TYPE, "");;
-		ctx.setAttribute(FlowControllerConstants.REQUEST_ID,"TESTCOMMONFRMWK");
-		HashMap inParams = new HashMap();
-		FlowControlNode fen = new FlowControlNode();
-		fen.processFlow(inParams, ctx);
-	}
+    @Test(expected = Exception.class)
+    public void testFlowExecutorNode() throws Exception {
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
+        ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "Configure");
+        ctx.setAttribute(FlowControllerConstants.VNFC_TYPE, "");;
+        ctx.setAttribute(FlowControllerConstants.REQUEST_ID, "TESTCOMMONFRMWK");
+        HashMap inParams = new HashMap();
+        FlowControlNode fen = new FlowControlNode();
+        fen.processFlow(inParams, ctx);
+    }
 }
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
index ca84ca56a..ff8d4f09d 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestParsingNode.java
@@ -1,23 +1,24 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
index ef661e3db..802601e5c 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/executor/node/TestRestServiceNode.java
@@ -1,23 +1,25 @@
+
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.flow.executor.node;
 
 import java.io.InputStream;
@@ -41,10 +43,10 @@ import org.onap.appc.flow.controller.utils.FlowControllerConstants;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestRestServiceNode {
-    
+
     @Test(expected=Exception.class)
     public void testRestServiceNode() throws Exception {
-        
+
         SvcLogicContext ctx = new SvcLogicContext();
         ctx.setAttribute(FlowControllerConstants.VNF_TYPE, "vUSP - vDBE-IPX HUB");
         ctx.setAttribute(FlowControllerConstants.REQUEST_ACTION, "healthcheck");
@@ -54,22 +56,22 @@ public class TestRestServiceNode {
         ctx.setAttribute("port-number","8888");
         ctx.setAttribute("request-action-type","GET");
         ctx.setAttribute("context", "loader/restconf/operations/appc-provider-lcm:health-check");
-        
+
         HashMap<String, String> inParams = new HashMap<String, String>();
         RestServiceNode rsn = new RestServiceNode();
         inParams.put("output-state", "state");
         inParams.put("responsePrefix", "healthcheck");
         rsn.sendRequest(inParams, ctx);
-        
+
         for (Object key : ctx.getAttributeKeySet()) {
             String parmName = (String) key;
             String parmValue = ctx.getAttribute(parmName);
         }
-        
-        
+
+
     }
-    
-    
+
+
     @Test(expected=Exception.class)
     public void testInputParamsRestServiceNode() throws Exception {
         SvcLogicContext ctx = new SvcLogicContext();
@@ -78,10 +80,10 @@ public class TestRestServiceNode {
         ctx.setAttribute("tmp.vnfInfo.vm[0].vnfc-count", "1");
         RestExecutor restExe = new RestExecutor();
         Transaction transaction = new Transaction();
-        
+
         FlowControlNode node = new FlowControlNode();
         HashMap<String,String>flowSeq= restExe.execute(transaction, ctx);
         String flowSequnce=flowSeq.get("restResponse");
-        
+
     }
 }