Fix no transaction is in progress bug

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

6 files changed, 1 insertions, 20 deletions

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 2fe25f1c..b65d2270 100644
--- 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 3c1870be..d8e1eaef 100755
--- 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";

 			}

 			logger.info("AlarmsHeaderServiceImpl saveAlarmsHeader: alarmsHeader={}", alarmsHeader);

-			Transaction tx = session.beginTransaction();     

 			session.save(alarmsHeader);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

@@ -82,9 +80,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 				return "0";

 			}

 			logger.info("AlarmsHeaderServiceImpl updateAlarmsHeader: alarmsHeader={}", alarmsHeader);

-			Transaction tx = session.beginTransaction();     

 			session.update(alarmsHeader);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

@@ -205,7 +201,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 		Session session = getSession();

 		try{

 			//try(Session session = sessionFactory.getCurrentSession();){

-			session.beginTransaction();

 

 			//Query q=session.createQuery("update AlarmsHeader set status='"+status+"', updateTime='"+date+"' , startEpochMicrosecCleared='"+startEpochMicrosecCleared+"'  ,lastEpochMicroSecCleared='"+lastEpochMicroSecCleared+"'    where eventName='"+eventName+"' and reportingEntityName='"+reportingEntityName+"' and specificProblem ='"+specificProblem+"'");

             Query q=session.createQuery("update AlarmsHeader set status=:status, startEpochMicrosecCleared=:startEpochMicrosecCleared  ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared    where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");

@@ -220,7 +215,6 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
 

 

             q.executeUpdate();

-			session.getTransaction().commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

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 1d739047..7bd444a9 100755
--- 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) {

 					logger.error("alarmsInformation saveAlarmsInformation alarmsInformation is null!");

 				}

-				Transaction tx = session.beginTransaction();

 				session.save(alarmsInformation);

-				tx.commit();

 				session.flush();

 				return "1";

 			} catch (Exception e) {

@@ -74,9 +72,7 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
 			if (null == alarmsInformation) {

 				logger.error("alarmsInformation updateAlarmsInformation alarmsInformation is null!");

 			}

-			Transaction tx = session.beginTransaction();

 			session.update(alarmsInformation);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

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 bcf34c69..9ff3dec2 100755
--- 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!");

 				return "0";

 			}

-			Transaction tx = session.beginTransaction();

 			session.save(performanceHeder);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

@@ -78,9 +76,7 @@ public class PerformanceHeaderServiceImpl implements PerformanceHeaderService {
 				logger.error("PerformanceHeaderServiceImpl updatePerformanceHeader performanceHeder is null!");

 				return "0";

 			}

-			Transaction tx = session.beginTransaction();

 			session.update(performanceHeder);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

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 34a7dec1..0cc99193 100755
--- 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 {

 			if (null == performanceInformation) {

 			}

-			Transaction tx = session.beginTransaction();

 			session.save(performanceInformation);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

@@ -77,9 +75,7 @@ public class PerformanceInformationServiceImpl implements PerformanceInformation
 			if (null == performanceInformation) {

 			}

 			logger.info("PerformanceInformationServiceImpl updatePerformanceInformation: performanceInformation={}", performanceInformation);

-			Transaction tx = session.beginTransaction();

 			session.update(performanceInformation);

-			tx.commit();

 			session.flush();

 			return "1";

 		} catch (Exception e) {

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 11e75aca..bfd79b5f 100644
--- 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(