aboutsummaryrefslogtreecommitdiffstats
path: root/common/src/main/java/org/openecomp
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/main/java/org/openecomp')
-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
2 files changed, 58 insertions, 3 deletions
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) {