X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-widget-ms%2Fwidget-ms%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fwidget%2Fservice%2Fimpl%2FWidgetCatalogServiceImpl.java;h=f5558e2ec4d299ed831a48ce26b17e8d582238be;hb=cb4ff59b1ac8b137bd1453ddec400679ba83b225;hp=b99863eb8889aecde306eec8c6a0a947acb3aed0;hpb=c7684e595461b70b09d0d9ff15b5ad23aeabebc9;p=portal.git

diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
index b99863eb..f5558e2e 100644
--- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
@@ -191,7 +191,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 			Transaction tx = session.beginTransaction();		
 			session.save(newWidgetCatalog);
 			tx.commit();
-			session.flush();
+			//session.flush();
 			session.close();
 			updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
 		}
@@ -217,7 +217,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 			Transaction tx = session.beginTransaction();
 			session.update(newWidgetCatalog);
 			tx.commit();
-			session.flush();
+			//session.flush();
 			session.close();
 			updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
 		}catch(Exception e){
@@ -244,16 +244,15 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 		logger.debug("WidgetCatalogServiceImpl.getWidgetCatalog: result={}", widgets);
 		return widgets;
 	}
-	
-	
-	
-	
-	
+
 	private void updateAppId(long widgetId, Set<RoleApp> roles){
 		Session session = sessionFactory.openSession();
 		for(RoleApp role: roles){
-			String sql = "UPDATE ep_widget_catalog_role SET app_id = " + role.getApp().getAppId() + " WHERE widget_id = " + widgetId + " AND ROLE_ID = " + role.getRoleId() ;
+			String sql = "UPDATE ep_widget_catalog_role SET app_id = :appId WHERE widget_id = :widgetId AND ROLE_ID = :roleId" ;
 			Query query = session.createSQLQuery(sql);
+			query.setParameter("appId", role.getApp().getAppId());
+			query.setParameter("widgetId", widgetId);
+			query.setParameter("roleId", role.getRoleId());
 			query.executeUpdate();
 		}
 		session.flush();
@@ -269,7 +268,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 		
 		List<MicroserviceData> widgets = criteria.list();
 		logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
-		session.flush();
+//		session.flush();
 		session.close();
 		
 		return (widgets.size() > 0) ? true : false;