Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Widget MS startup fix and Onboarding changes
[portal.git]
/
ecomp-portal-widget-ms
/
widget-ms
/
src
/
main
/
java
/
org
/
onap
/
portalapp
/
widget
/
service
/
impl
/
WidgetCatalogServiceImpl.java
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
b99863e
..
4554ab5
100644
(file)
--- 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
@@
-156,6
+156,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
}
@Override
}
@Override
+ @Transactional
public void deleteWidgetCatalog(long widgetCatalogId) {
logger.debug("WidgetCatalogServiceImpl.deleteWidgetCatalog: deleting the widget with widgetId={}", widgetCatalogId);
WidgetCatalog widget = getWidgetCatalog(widgetCatalogId);
public void deleteWidgetCatalog(long widgetCatalogId) {
logger.debug("WidgetCatalogServiceImpl.deleteWidgetCatalog: deleting the widget with widgetId={}", widgetCatalogId);
WidgetCatalog widget = getWidgetCatalog(widgetCatalogId);
@@
-164,7
+165,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
return;
}
Session session = sessionFactory.getCurrentSession();
return;
}
Session session = sessionFactory.getCurrentSession();
- Transaction tx = session.beginTransaction();
+
//
Transaction tx = session.beginTransaction();
Query query = session.createSQLQuery("delete from ep_pers_user_widget_sel where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
query.executeUpdate();
query = session.createSQLQuery("delete from ep_pers_user_widget_placement where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
Query query = session.createSQLQuery("delete from ep_pers_user_widget_sel where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
query.executeUpdate();
query = session.createSQLQuery("delete from ep_pers_user_widget_placement where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
@@
-174,7
+175,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
query = session.createSQLQuery("delete from ep_widget_catalog_parameter where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
query.executeUpdate();
session.delete(widget);
query = session.createSQLQuery("delete from ep_widget_catalog_parameter where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
query.executeUpdate();
session.delete(widget);
- tx.commit();
+
//
tx.commit();
}
@Override
}
@Override
@@
-191,7
+192,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
Transaction tx = session.beginTransaction();
session.save(newWidgetCatalog);
tx.commit();
Transaction tx = session.beginTransaction();
session.save(newWidgetCatalog);
tx.commit();
- session.flush();
+
//
session.flush();
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}
@@
-217,7
+218,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
Transaction tx = session.beginTransaction();
session.update(newWidgetCatalog);
tx.commit();
Transaction tx = session.beginTransaction();
session.update(newWidgetCatalog);
tx.commit();
- session.flush();
+
//
session.flush();
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}catch(Exception e){
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}catch(Exception e){
@@
-244,16
+245,15
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
logger.debug("WidgetCatalogServiceImpl.getWidgetCatalog: result={}", widgets);
return widgets;
}
logger.debug("WidgetCatalogServiceImpl.getWidgetCatalog: result={}", widgets);
return widgets;
}
-
-
-
-
-
+
private void updateAppId(long widgetId, Set<RoleApp> roles){
Session session = sessionFactory.openSession();
for(RoleApp role: roles){
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 query = session.createSQLQuery(sql);
+ query.setParameter("appId", role.getApp().getAppId());
+ query.setParameter("widgetId", widgetId);
+ query.setParameter("roleId", role.getRoleId());
query.executeUpdate();
}
session.flush();
query.executeUpdate();
}
session.flush();
@@
-269,7
+269,7
@@
public class WidgetCatalogServiceImpl implements WidgetCatalogService {
List<MicroserviceData> widgets = criteria.list();
logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
List<MicroserviceData> widgets = criteria.list();
logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
-
session.flush();
+
//
session.flush();
session.close();
return (widgets.size() > 0) ? true : false;
session.close();
return (widgets.size() > 0) ? true : false;