summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/pom.xml45
-rw-r--r--common/src/main/java/org/openecomp/mso/db/HibernateUtils.java55
-rw-r--r--common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java6
-rw-r--r--common/src/test/java/org/openecomp/mso/utils/CryptoUtilsESTest.java4
4 files changed, 104 insertions, 6 deletions
diff --git a/common/pom.xml b/common/pom.xml
index 4809c954df..3bacaf03dd 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -98,7 +98,48 @@
<version>1.10.19</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.evosuite</groupId>
+ <artifactId>evosuite-standalone-runtime</artifactId>
+ <version>${evosuiteVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.6.Final</version>
+ <exclusions>
+ <!-- Avoid hibernate inclusion as provided in Jboss -->
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -148,7 +189,7 @@
<page>Messages and Codes</page>
<principal>test</principal>
<credentials>test</credentials>
- <url>http://wiki.web.att.com</url>
+
</wiki>
<resources>
<resource>
diff --git a/common/src/main/java/org/openecomp/mso/db/HibernateUtils.java b/common/src/main/java/org/openecomp/mso/db/HibernateUtils.java
new file mode 100644
index 0000000000..ba452fff44
--- /dev/null
+++ b/common/src/main/java/org/openecomp/mso/db/HibernateUtils.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * 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.mso.db;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.SessionFactory;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import java.net.URL;
+
+public abstract class HibernateUtils {
+
+ protected SessionFactory sessionFactory;
+
+ protected synchronized void initializeHibernate(URL hibernateConfigFile) {
+ // Can be null, in that case, we skip the loading
+ if (hibernateConfigFile != null) {
+ // Already initialized, skip
+ if (sessionFactory != null) {
+ return;
+ }
+
+ Configuration conf = new Configuration().configure(hibernateConfigFile);
+ ServiceRegistry sr = new StandardServiceRegistryBuilder().applySettings(conf.getProperties()).build();
+ sessionFactory = conf.buildSessionFactory(sr);
+ }
+ }
+
+ public SessionFactory getSessionFactory() {
+ if (sessionFactory == null) {
+ initializeHibernate(getHibernateConfigFile());
+ }
+ return sessionFactory;
+ }
+
+ protected abstract URL getHibernateConfigFile();
+}
diff --git a/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java b/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
index 323c4dbe99..976b579fcf 100644
--- a/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
+++ b/common/src/main/java/org/openecomp/mso/properties/MsoJsonProperties.java
@@ -112,10 +112,10 @@ public class MsoJsonProperties extends AbstractMsoProperties {
public synchronized MsoJsonProperties clone() {
MsoJsonProperties msoCopy = new MsoJsonProperties();
- ObjectMapper mapper = new ObjectMapper();
+ ObjectMapper newMapper = new ObjectMapper();
try {
- msoCopy.jsonRootNode = mapper.createObjectNode();
- msoCopy.jsonRootNode = mapper.readValue(this.jsonRootNode.toString(), JsonNode.class);
+ msoCopy.jsonRootNode = newMapper.createObjectNode();
+ msoCopy.jsonRootNode = newMapper.readValue(this.jsonRootNode.toString(), JsonNode.class);
} catch (JsonParseException e) {
LOGGER.debug("JsonParseException when cloning the object:" + this.propertiesFileName, e);
} catch (JsonMappingException e) {
diff --git a/common/src/test/java/org/openecomp/mso/utils/CryptoUtilsESTest.java b/common/src/test/java/org/openecomp/mso/utils/CryptoUtilsESTest.java
index 397db374bb..59e8cec92d 100644
--- a/common/src/test/java/org/openecomp/mso/utils/CryptoUtilsESTest.java
+++ b/common/src/test/java/org/openecomp/mso/utils/CryptoUtilsESTest.java
@@ -11,6 +11,8 @@ import static org.evosuite.runtime.EvoAssertions.*;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
+import java.security.InvalidKeyException;
+
import org.evosuite.runtime.EvoRunner;
import org.evosuite.runtime.EvoRunnerParameters;
import org.junit.runner.RunWith;
@@ -65,7 +67,7 @@ public class CryptoUtilsESTest extends CryptoUtilsESTestscaffolding {
CryptoUtils.decrypt("B20000000000000000000000000000000000000000000000", "B20000000000000000000000000000000000000000000000");
fail("Expecting exception: IllegalBlockSizeException");
- } catch(IllegalBlockSizeException e) {
+ } catch(IllegalBlockSizeException | InvalidKeyException e) {
}
}