update odlux and featureaggregator

v2 update odlux and featureaggregator bundles

Issue-ID: SDNC-1008
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I0018d7bfa3a0e6896c1b210b539a574af9808e22
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>

7 files changed, 584 insertions, 0 deletions

diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml
new file mode 100644
index 000000000..1618e7aa1
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/pom.xml
@@ -0,0 +1,54 @@
+<?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>
+
+    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+    <artifactId>sdnr-wt-odlux-core-model</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
+    <packaging>bundle</packaging>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>*</Import-Package>
+                        <Export-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*,com.opensymphony.*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java b/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
new file mode 100644
index 000000000..133b08494
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2002-2003,2009 The Apache Software Foundation.
+ *
+ * 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.
+ */
+package com.opensymphony.xwork2.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.*;
+
+
+/**
+ * This class is extremely useful for loading resources and classes in a fault tolerant manner
+ * that works across different applications servers.
+ *
+ * It has come out of many months of frustrating use of multiple application servers at Atlassian,
+ * please don't change things unless you're sure they're not going to break in one server or another!
+ *
+ * It was brought in from oscore trunk revision 147.
+ *
+ * @author $Author$
+ * @version $Revision$
+ */
+public class ClassLoaderUtil {
+    //~ Methods ////////////////////////////////////////////////////////////////
+
+    /**
+     * Load all resources with a given name, potentially aggregating all results
+     * from the searched classloaders.  If no results are found, the resource name
+     * is prepended by '/' and tried again.
+     *
+     * This method will try to load the resources using the following methods (in order):
+     * <ul>
+     *  <li>From Thread.currentThread().getContextClassLoader()
+     *  <li>From ClassLoaderUtil.class.getClassLoader()
+     *  <li>callingClass.getClassLoader()
+     * </ul>
+     *
+     * @param resourceName The name of the resources to load
+     * @param callingClass The Class object of the calling object
+     */
+     public static Iterator<URL> getResources(String resourceName, Class<?> callingClass, boolean aggregate) throws IOException {
+
+         AggregateIterator<URL> iterator = new AggregateIterator<>();
+
+         iterator.addEnumeration(Thread.currentThread().getContextClassLoader().getResources(resourceName));
+
+         if (!iterator.hasNext() || aggregate) {
+             iterator.addEnumeration(ClassLoaderUtil.class.getClassLoader().getResources(resourceName));
+         }
+
+         if (!iterator.hasNext() || aggregate) {
+             ClassLoader cl = callingClass.getClassLoader();
+
+             if (cl != null) {
+                 iterator.addEnumeration(cl.getResources(resourceName));
+             }
+         }
+
+         if (!iterator.hasNext() && resourceName != null && (resourceName.length() == 0 || resourceName.charAt(0) != '/')) {
+             return getResources('/' + resourceName, callingClass, aggregate);
+         }
+
+         return iterator;
+     }
+
+    /**
+    * Load a given resource.
+    *
+    * This method will try to load the resource using the following methods (in order):
+    * <ul>
+    *  <li>From Thread.currentThread().getContextClassLoader()
+    *  <li>From ClassLoaderUtil.class.getClassLoader()
+    *  <li>callingClass.getClassLoader()
+    * </ul>
+    *
+    * @param resourceName The name IllegalStateException("Unable to call ")of the resource to load
+    * @param callingClass The Class object of the calling object
+    */
+    public static URL getResource(String resourceName, Class<?> callingClass) {
+        URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
+
+        if (url == null) {
+            url = ClassLoaderUtil.class.getClassLoader().getResource(resourceName);
+        }
+
+        if (url == null) {
+            ClassLoader cl = callingClass.getClassLoader();
+
+            if (cl != null) {
+                url = cl.getResource(resourceName);
+            }
+        }
+
+        if (url == null && resourceName != null && (resourceName.length() == 0 || resourceName.charAt(0) != '/')) {
+            return getResource('/' + resourceName, callingClass);
+        }
+
+        return url;
+    }
+
+    /**
+    * This is a convenience method to load a resource as a stream.
+    *
+    * The algorithm used to find the resource is given in getResource()
+    *
+    * @param resourceName The name of the resource to load
+    * @param callingClass The Class object of the calling object
+    */
+    public static InputStream getResourceAsStream(String resourceName, Class<?> callingClass) {
+        URL url = getResource(resourceName, callingClass);
+
+        try {
+            return url != null ? url.openStream() : null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    /**
+    * Load a class with a given name.
+    *
+    * It will try to load the class in the following order:
+    * <ul>
+    *  <li>From Thread.currentThread().getContextClassLoader()
+    *  <li>Using the basic Class.forName()
+    *  <li>From ClassLoaderUtil.class.getClassLoader()
+    *  <li>From the callingClass.getClassLoader()
+    * </ul>
+    *
+    * @param className The name of the class to load
+    * @param callingClass The Class object of the calling object
+    * @throws ClassNotFoundException If the class cannot be found anywhere.
+    */
+    public static Class<?> loadClass(String className, Class<?> callingClass) throws ClassNotFoundException {
+        try {
+            return Thread.currentThread().getContextClassLoader().loadClass(className);
+        } catch (ClassNotFoundException e) {
+            try {
+                return Class.forName(className);
+            } catch (ClassNotFoundException ex) {
+                try {
+                    return ClassLoaderUtil.class.getClassLoader().loadClass(className);
+                } catch (ClassNotFoundException exc) {
+                    return callingClass.getClassLoader().loadClass(className);
+                }
+            }
+        }
+    }
+
+    /**
+     * Aggregates Enumeration instances into one iterator and filters out duplicates.  Always keeps one
+     * ahead of the enumerator to protect against returning duplicates.
+     */
+    static class AggregateIterator<E> implements Iterator<E> {
+
+        LinkedList<Enumeration<E>> enums = new LinkedList<>();
+        Enumeration<E> cur = null;
+        E next = null;
+        Set<E> loaded = new HashSet<>();
+
+        public AggregateIterator<E> addEnumeration(Enumeration<E> e) {
+            if (e.hasMoreElements()) {
+                if (cur == null) {
+                    cur = e;
+                    next = e.nextElement();
+                    loaded.add(next);
+                } else {
+                    enums.add(e);
+                }
+            }
+            return this;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return next != null;
+        }
+
+        @Override
+        public E next() {
+            if (next != null) {
+                E prev = next;
+                next = loadNext();
+                return prev;
+            } else {
+                throw new NoSuchElementException();
+            }
+        }
+
+        private Enumeration<E> determineCurrentEnumeration() {
+            if (cur != null && !cur.hasMoreElements()) {
+                if (enums.size() > 0) {
+                    cur = enums.removeLast();
+                } else {
+                    cur = null;
+                }
+            }
+            return cur;
+        }
+
+        private E loadNext() {
+            if (determineCurrentEnumeration() != null) {
+                E tmp = cur.nextElement();
+                int loadedSize = loaded.size();
+                while (loaded.contains(tmp)) {
+                    tmp = loadNext();
+                    if (tmp == null || loaded.size() > loadedSize) {
+                        break;
+                    }
+                }
+                if (tmp != null) {
+                    loaded.add(tmp);
+                }
+                return tmp;
+            }
+            return null;
+
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.java
new file mode 100644
index 000000000..4b58aac44
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.odlux.model.bundles;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Iterator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+
+public class ClassLoaderUtilExt {
+
+    final static Logger LOG = LoggerFactory.getLogger(ClassLoaderUtilExt.class);
+
+    public static URL getResource(String resourceName, Class<?> callingClass) {
+
+        Iterator<URL> urls = null;
+        URL url = null;
+        try {
+            urls = getResources(resourceName, callingClass, true);
+        } catch (IOException e) {
+            LOG.debug("No resource {}",resourceName);
+        }
+        if (urls != null) {
+            while (urls.hasNext()) {
+                URL u = urls.next();
+                LOG.debug("found " + u.toString());
+                url = u;
+                break;
+            }
+        }
+        if (url == null) {
+            LOG.debug("res currently not found. try to find with bundle");
+            Bundle b = FrameworkUtil.getBundle(callingClass);
+            if(b!=null)
+            {
+                url = b.getEntry(resourceName);
+            }
+            else {
+                ClassLoader loader = Thread.currentThread().getContextClassLoader();
+                url = loader.getResource(resourceName);
+            }
+
+        }
+        return url;
+    }
+
+    public static Iterator<URL> getResources(String resourceName, Class<?> callingClass, boolean aggregate)
+            throws IOException {
+        return ClassLoaderUtil.getResources(resourceName, callingClass, aggregate);
+    }
+
+}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java
new file mode 100644
index 000000000..d193edb04
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.odlux.model.bundles;
+
+public interface IndexOdlBundle {
+
+}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
new file mode 100644
index 000000000..4e2332b4e
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.odlux.model.bundles;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+/**
+ * At startup of each karaf bundle, each UI module creates an instance of this class via blueprint.
+ * Initialize method gets called at loading of bundle.
+ */
+
+public class OdluxBundle {
+
+    final static Logger LOG = LoggerFactory.getLogger(OdluxBundle.class);
+    private static final String LR = "\n";
+
+    private String bundleName;
+    private OdluxBundleLoader loader;
+    private int index;
+
+    /**
+     * @return the index
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    /**
+     * @param index the index to set
+     */
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public OdluxBundleLoader getLoader() {
+        return loader;
+    }
+
+    public void setLoader(OdluxBundleLoader loader) {
+        this.loader = loader;
+    }
+
+    public void setBundleName(String bundleName) {
+        this.bundleName = bundleName;
+    }
+
+    public String getBundleName() {
+        return this.bundleName;
+    }
+
+    public OdluxBundle() {}
+
+    protected OdluxBundle(final OdluxBundleLoader loader, final String bundleName) {
+        this.loader = loader;
+        this.bundleName = bundleName;
+    }
+
+    public void initialize() {
+
+        LOG.info("Registering resources");
+        if (this.loader != null) {
+            if (this.bundleName == null)
+                LOG.error("bundle name is missing. Bundle can not be registered with odlux");
+            else {
+                LOG.info("Registering bunlde {}", this.bundleName);
+                this.loader.addBundle(this);
+            }
+        }
+    }
+
+    public void clean() {
+        LOG.info("Unregistering resources");
+
+        if (this.loader != null) {
+            this.loader.removeBundle(this);
+        }
+    }
+
+    public boolean hasResource(String filename) {
+        return this.getResource(filename) != null;
+    }
+
+    public String getResourceFileContent(String filename) {
+        return this.loadFileContent(this.getResource(filename));
+    }
+  
+    protected URL getResource(String filename) {
+        return ClassLoaderUtilExt.getResource(filename, this.getClass());
+    }
+
+    protected String loadFileContent(final URL url ) {
+        if (url == null)
+            return null;
+        LOG.debug("try to load res " + url.toString());
+        StringBuilder sb = new StringBuilder();
+        BufferedReader in = null;
+        try {
+            in = new BufferedReader(new InputStreamReader(url.openStream()));
+
+            String inputLine;
+            while ((inputLine = in.readLine()) != null) {
+                sb.append(inputLine + LR);
+            }
+        } catch (IOException e) {
+            LOG.warn("could not load resfile " + url.toString() + ": " + e.getMessage());
+            return null;
+        }
+        finally {
+        	if(in!=null) {
+        		try {
+					in.close();
+				} catch (IOException e) {
+					
+				}
+        	}
+        }
+
+        return sb.toString();
+    }
+
+}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java
new file mode 100644
index 000000000..ce003c664
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.odlux.model.bundles;
+
+public interface OdluxBundleLoader {
+
+    public void addBundle(OdluxBundle bundle);
+
+    public void removeBundle(OdluxBundle bundle);
+
+    public int getNumberOfBundles();
+
+	public String getResourceContent(String fn, OdluxBundleResourceAccess indexBundle);
+
+}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java
new file mode 100644
index 000000000..d7ac3e9c4
--- /dev/null
+++ b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.odlux.model.bundles;
+
+import java.util.List;
+
+public interface OdluxBundleResourceAccess {
+
+    boolean hasResource(String fn);
+    String getResourceFileContent(String fn, List<String> bundleNames);
+    String getBundleName();
+
+}