Skip to content

Conversation

@aurang-zeb313
Copy link
Member

External References

@aurang-zeb313 aurang-zeb313 changed the base branch from develop to features/event-conf August 22, 2025 17:31
# Conflicts:
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/EventConfPersistenceService.java
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/EventConfRestService.java
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/api/EventConfRestApi.java
#	opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java
#	opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java

String hql = "delete from EventConfSource s where s.id in (" + placeholders + ")";

int deletedCount = getHibernateTemplate().bulkUpdate(hql, sourceIds.toArray());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be we can improve this:

int deletedCount = getHibernateTemplate().execute(session ->
session.createQuery("delete from EventConfSource s where s.id in (:ids)")
.setParameterList("ids", sourceIds)
.executeUpdate()
);

@cgorantla
Copy link
Contributor

Also you need to resolve merge conflicts.

# Conflicts:
#	opennms-dao-api/src/main/java/org/opennms/netmgt/dao/api/EventConfSourceDao.java
#	opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/EventConfSourceDaoHibernate.java
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/EventConfPersistenceService.java
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/EventConfRestService.java
#	opennms-webapp-rest/src/main/java/org/opennms/web/rest/v2/api/EventConfRestApi.java
#	opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java
#	opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java
Copy link
Contributor

@cgorantla cgorantla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

# Conflicts:
#	opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java
@aurang-zeb313 aurang-zeb313 merged commit f218da0 into features/event-conf Sep 9, 2025
15 of 17 checks passed
@aurang-zeb313 aurang-zeb313 deleted the akhan/jira/NMS-18234 branch September 9, 2025 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants