Fix no transaction is in progress bug

Issue-ID: USECASEUI-512
Change-Id: Ic5e35874ea138bf7d4dfb40f4a18ad4f840de280
Signed-off-by: hekeguang <hekeguang@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java
index 2fe25f1..b65d227 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/csmf/impl/SlicingServiceImpl.java
@@ -130,6 +130,7 @@ public class SlicingServiceImpl implements SlicingService {
             creationRequest.setService(creationService);
 
             String jsonstr = JSON.toJSONString(creationRequest);
+            logger.info("createSlicingService:creationRequest request is:{}", jsonstr);
             RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonstr.toString());
             Response<CreateResponse> updateResponse = soSliceService
                 .submitOrders(requestBody).execute();

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
index 3c1870b..d8e1eae 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
@@ -62,9 +62,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                                return "0";\r
                        }\r
                        logger.info("AlarmsHeaderServiceImpl saveAlarmsHeader: alarmsHeader={}", alarmsHeader);\r
-                       Transaction tx = session.beginTransaction();     \r
                        session.save(alarmsHeader);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r
@@ -82,9 +80,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                                return "0";\r
                        }\r
                        logger.info("AlarmsHeaderServiceImpl updateAlarmsHeader: alarmsHeader={}", alarmsHeader);\r
-                       Transaction tx = session.beginTransaction();     \r
                        session.update(alarmsHeader);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r
@@ -205,7 +201,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                Session session = getSession();\r
                try{\r
                        //try(Session session = sessionFactory.getCurrentSession();){\r
-                       session.beginTransaction();\r
 \r
                        //Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' , startEpochMicrosecCleared='"+startEpochMicrosecCleared+"'  ,lastEpochMicroSecCleared='"+lastEpochMicroSecCleared+"'    where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"'");\r
             Query q=session.createQuery("update AlarmsHeader set status=:status, startEpochMicrosecCleared=:startEpochMicrosecCleared  ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared    where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");\r
@@ -220,7 +215,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 \r
 \r
             q.executeUpdate();\r
-                       session.getTransaction().commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
index 1d73904..7bd444a 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
@@ -55,9 +55,7 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
                                if (null == alarmsInformation) {\r
                                        logger.error("alarmsInformation saveAlarmsInformation alarmsInformation is null!");\r
                                }\r
-                               Transaction tx = session.beginTransaction();\r
                                session.save(alarmsInformation);\r
-                               tx.commit();\r
                                session.flush();\r
                                return "1";\r
                        } catch (Exception e) {\r
@@ -74,9 +72,7 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
                        if (null == alarmsInformation) {\r
                                logger.error("alarmsInformation updateAlarmsInformation alarmsInformation is null!");\r
                        }\r
-                       Transaction tx = session.beginTransaction();\r
                        session.update(alarmsInformation);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java
index bcf34c6..9ff3dec 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImpl.java
@@ -59,9 +59,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService {
                                logger.error("PerformanceHeaderServiceImpl savePerformanceHeader performanceHeder is null!");\r
                                return "0";\r
                        }\r
-                       Transaction tx = session.beginTransaction();\r
                        session.save(performanceHeder);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r
@@ -78,9 +76,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService {
                                logger.error("PerformanceHeaderServiceImpl updatePerformanceHeader performanceHeder is null!");\r
                                return "0";\r
                        }\r
-                       Transaction tx = session.beginTransaction();\r
                        session.update(performanceHeder);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java
index 34a7dec..0cc9919 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/PerformanceInformationServiceImpl.java
@@ -59,9 +59,7 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation
                try {\r
                        if (null == performanceInformation) {\r
                        }\r
-                       Transaction tx = session.beginTransaction();\r
                        session.save(performanceInformation);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r
@@ -77,9 +75,7 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation
                        if (null == performanceInformation) {\r
                        }\r
                        logger.info("PerformanceInformationServiceImpl updatePerformanceInformation: performanceInformation={}", performanceInformation);\r
-                       Transaction tx = session.beginTransaction();\r
                        session.update(performanceInformation);\r
-                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
index 11e75ac..bfd79b5 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
@@ -174,9 +174,7 @@ public class DefaultServiceLcmService implements ServiceLcmService {
             if (null == serviceBean) {
                 logger.error("DefaultServiceLcmService saveOrUpdateServiceBean serviceBean is null!");
             }
-            Transaction tx = session.beginTransaction();
             session.saveOrUpdate(serviceBean);
-            tx.commit();
             session.flush();
         } catch (Exception e) {
             logger.error(