diff options
Diffstat (limited to 'common/src')
5 files changed, 72 insertions, 9 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/logger/MessageEnum.java b/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java index 89f6df93b7..53a23c004b 100644 --- a/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java +++ b/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java @@ -7,9 +7,9 @@ * 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. @@ -156,6 +156,7 @@ public enum MessageEnum implements EELFResolvableErrorEnum{ RA_DB_REQUEST_NOT_EXIST, RA_CONFIG_NOT_FOUND, RA_CONFIG_LOAD, + RA_RECEIVE_WORKFLOW_MESSAGE, // BPEL engine Messages BPMN_GENERAL_INFO, BPMN_GENERAL_EXCEPTION_ARG, 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/main/resources/ResourceAdapter.properties b/common/src/main/resources/ResourceAdapter.properties index f1c8b26ce1..99952603ed 100644 --- a/common/src/main/resources/ResourceAdapter.properties +++ b/common/src/main/resources/ResourceAdapter.properties @@ -7,9 +7,9 @@ # 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. @@ -326,7 +326,12 @@ RA_CONFIG_LOAD=\ MSO-RA-5296I|\ Configuration loaded from {0}|\ Please check other logs for more detailed info|\ - Configuration loaded + Configuration loaded \ +RA_RECEIVE_WORKFLOW_MESSAGE=\ + MSO-RA-5297I|\ + Received Workflow Message: {0}|\ + No resolution needed|\ + Received Workflow Message RA_GENERAL_EXCEPTION_ARG=\ MSO-RA-9200E|\ Exception: {0}|\ 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) { } } |