diff options
Diffstat (limited to 'sli')
16 files changed, 16 insertions, 41 deletions
diff --git a/sli/common/pom.xml b/sli/common/pom.xml index 52bfd53f..f71ca35f 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <artifactId>sli-common</artifactId> <packaging>bundle</packaging> diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java index 699ace2e..5e19a52c 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java @@ -21,10 +21,6 @@ package org.onap.ccsdk.sli.core.sli; -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - public class SvcLogicAtom extends SvcLogicExpression { public enum AtomType { diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java index 9216519a..712c64ab 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java @@ -145,7 +145,7 @@ public class SvcLogicDblibStore implements SvcLogicStore { try { - dbConn = ((DBResourceManager) dbSvc).getConnection(); + dbConn = dbSvc.getConnection(); ArrayList<String> args = new ArrayList<String>(); @@ -276,7 +276,7 @@ public class SvcLogicDblibStore implements SvcLogicStore { Connection dbConn = null; PreparedStatement storeGraphStmt = null; try { - dbConn = ((DBResourceManager) dbSvc).getConnection(); + dbConn = dbSvc.getConnection(); boolean oldAutoCommit = dbConn.getAutoCommit(); dbConn.setAutoCommit(false); storeGraphStmt = dbConn diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java index b8a47c45..26783e70 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java @@ -22,7 +22,6 @@ package org.onap.ccsdk.sli.core.sli; import java.io.Serializable; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java index 45127757..23dff3e6 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java @@ -21,14 +21,10 @@ package org.onap.ccsdk.sli.core.sli; -import java.util.Map; - +/** + * A marker interface, used to indicate that a class exposes methods that can be + * called from an <execute> node. Such methods must have the signature: + * void methodName(Map, SvcLogicContext) + */ public interface SvcLogicJavaPlugin { - - /** - * A marker interface, used to indicate that a class exposes methods that can be - * called from an <execute> node. Such methods must have the signature: - * void methodName(Map, SvcLogicContext) - */ - } diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java index 56ed5305..160107fe 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java @@ -36,8 +36,6 @@ import java.util.TreeMap; import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xml.sax.Locator; - public class SvcLogicNode implements Serializable { diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java index 40295bd7..0e2c4257 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java @@ -21,7 +21,6 @@ package org.onap.ccsdk.sli.core.sli; -import java.sql.SQLException; import java.util.Map; public interface SvcLogicResource { diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java index ec18b876..0e6000fb 100644 --- a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java +++ b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java @@ -28,12 +28,6 @@ import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.util.LinkedList; - -import org.onap.ccsdk.sli.core.sli.SvcLogicParser; -import org.onap.ccsdk.sli.core.sli.SvcLogicParserException; -import org.onap.ccsdk.sli.core.sli.SvcLogicStore; -import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; import junit.framework.TestCase; diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java index 60d70460..3b9fff75 100644 --- a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java +++ b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java @@ -21,17 +21,13 @@ package org.onap.ccsdk.sli.core.sli; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.io.InputStreamReader; import java.util.Enumeration; import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java index 125ac561..80df10ce 100644 --- a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java +++ b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java @@ -25,9 +25,6 @@ import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import org.onap.ccsdk.sli.core.sli.SvcLogicExprListener; -import org.onap.ccsdk.sli.core.sli.SvcLogicExpression; -import org.onap.ccsdk.sli.core.sli.SvcLogicExpressionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sli/features/pom.xml b/sli/features/pom.xml index 975839fc..dc7a95dc 100755 --- a/sli/features/pom.xml +++ b/sli/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <artifactId>sli-features</artifactId> <name>SLI - Features</name> diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 0319f5bc..0eec3324 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>sli</artifactId> <groupId>org.onap.ccsdk.sli.core</groupId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <artifactId>sli-installer</artifactId> <name>SLI - Karaf Installer</name> diff --git a/sli/pom.xml b/sli/pom.xml index b8ce1e3a..7257e9ee 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> @@ -59,7 +59,7 @@ <organization> <name>ONAP</name> </organization> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </project> diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index 5ef47ef1..f665c56a 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli</artifactId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <artifactId>sli-provider</artifactId> <packaging>bundle</packaging> diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml index 932e3cca..97c99188 100755 --- a/sli/recording/pom.xml +++ b/sli/recording/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli</artifactId> - <version>0.1.1-SNAPSHOT</version> + <version>0.1.2-SNAPSHOT</version> </parent> <artifactId>sli-recording</artifactId> <packaging>bundle</packaging> diff --git a/sli/recording/src/main/java/org/onap/ccsdk/sli/core/sli/recording/RecordingActivator.java b/sli/recording/src/main/java/org/onap/ccsdk/sli/core/sli/recording/RecordingActivator.java index 9228d15c..fd857f56 100644 --- a/sli/recording/src/main/java/org/onap/ccsdk/sli/core/sli/recording/RecordingActivator.java +++ b/sli/recording/src/main/java/org/onap/ccsdk/sli/core/sli/recording/RecordingActivator.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; public class RecordingActivator implements BundleActivator { - private LinkedList<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>(); + private LinkedList<ServiceRegistration> registrations = new LinkedList<>(); private static final Logger LOG = LoggerFactory .getLogger(RecordingActivator.class); @@ -43,7 +43,7 @@ public class RecordingActivator implements BundleActivator { if (registrations == null) { - registrations = new LinkedList<ServiceRegistration>(); + registrations = new LinkedList<>(); } |