From 3c1b3c71feec6c2219129eb774de907580aa401c Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 10 Jul 2013 16:18:45 +0530 Subject: [PATCH] CLOUDSTACK-3440: action events are not published due to conflict of Eventutils and ActionEventUtils files removing the 'EventUtils' file which got merged back during the Spring changes to master at 4.1. 'EventUtils' file was replaced by 'ActionEventUtils', and the original file was removed for events frameworks. This file conflict was resulting in action events not to be published on to event bus --- client/tomcatconf/applicationContext.xml.in | 1 - .../cloud/event/ActionEventInterceptor.java | 10 +- server/src/com/cloud/event/EventUtils.java | 118 ------------------ .../affinity/AffinityApiUnitTest.java | 12 +- .../cloudstack/test/utils/SpringUtils.java | 2 +- 5 files changed, 15 insertions(+), 128 deletions(-) delete mode 100755 server/src/com/cloud/event/EventUtils.java diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 20d8e619e9c..610fdfdcb5b 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -826,7 +826,6 @@ - diff --git a/server/src/com/cloud/event/ActionEventInterceptor.java b/server/src/com/cloud/event/ActionEventInterceptor.java index 01eefcd72b7..d31a3556e95 100644 --- a/server/src/com/cloud/event/ActionEventInterceptor.java +++ b/server/src/com/cloud/event/ActionEventInterceptor.java @@ -44,7 +44,7 @@ public class ActionEventInterceptor implements ComponentMethodInterceptor { if(ctx.getEventDetails() != null){ eventDescription += ". "+ctx.getEventDetails(); } - EventUtils.saveStartedEvent(userId, accountId, actionEvent.eventType(), eventDescription, startEventId); + ActionEventUtils.onStartedActionEvent(userId, accountId, actionEvent.eventType(), eventDescription, startEventId); } } return event; @@ -64,10 +64,10 @@ public class ActionEventInterceptor implements ComponentMethodInterceptor { } if(actionEvent.create()){ //This start event has to be used for subsequent events of this action - startEventId = EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully created entity for "+eventDescription); + startEventId = ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully created entity for "+eventDescription); ctx.setStartEventId(startEventId); } else { - EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully completed "+eventDescription, startEventId); + ActionEventUtils.onCompletedActionEvent(userId, accountId, EventVO.LEVEL_INFO, actionEvent.eventType(), "Successfully completed "+eventDescription, startEventId); } } } @@ -85,10 +85,10 @@ public class ActionEventInterceptor implements ComponentMethodInterceptor { eventDescription += ". "+ctx.getEventDetails(); } if(actionEvent.create()){ - long eventId = EventUtils.saveCreatedEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while creating entity for "+eventDescription); + long eventId = ActionEventUtils.onCreatedActionEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while creating entity for "+eventDescription); ctx.setStartEventId(eventId); } else { - EventUtils.saveEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while "+eventDescription, startEventId); + ActionEventUtils.onCompletedActionEvent(userId, accountId, EventVO.LEVEL_ERROR, actionEvent.eventType(), "Error while "+eventDescription, startEventId); } } } diff --git a/server/src/com/cloud/event/EventUtils.java b/server/src/com/cloud/event/EventUtils.java deleted file mode 100755 index 53d224e186f..00000000000 --- a/server/src/com/cloud/event/EventUtils.java +++ /dev/null @@ -1,118 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.event; - -import javax.annotation.PostConstruct; -import javax.inject.Inject; - -import org.springframework.stereotype.Component; - -import com.cloud.event.dao.EventDao; -import com.cloud.user.AccountVO; -import com.cloud.user.dao.AccountDao; - -@Component -public class EventUtils { - private static EventDao _eventDao; - private static AccountDao _accountDao; - - @Inject EventDao _placeHoderEventDao; - @Inject AccountDao _placeHoderAccountDao; - - public EventUtils() { - } - - @PostConstruct - void init() { - _eventDao = _placeHoderEventDao; - _accountDao = _placeHoderAccountDao; - } - - public static Long saveEvent(Long userId, Long accountId, Long domainId, String type, String description) { - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountId); - event.setDomainId(domainId); - event.setType(type); - event.setDescription(description); - event = _eventDao.persist(event); - return event.getId(); - } - - /* - * Save event after scheduling an async job - */ - public static Long saveScheduledEvent(Long userId, Long accountId, String type, String description, long startEventId) { - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountId); - event.setDomainId(getDomainId(accountId)); - event.setType(type); - event.setStartId(startEventId); - event.setState(Event.State.Scheduled); - event.setDescription("Scheduled async job for "+description); - event = _eventDao.persist(event); - return event.getId(); - } - - /* - * Save event after starting execution of an async job - */ - public static Long saveStartedEvent(Long userId, Long accountId, String type, String description, long startEventId) { - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountId); - event.setDomainId(getDomainId(accountId)); - event.setType(type); - event.setState(Event.State.Started); - event.setDescription("Starting job for "+description); - event.setStartId(startEventId); - event = _eventDao.persist(event); - return event.getId(); - } - - public static Long saveEvent(Long userId, Long accountId, String level, String type, String description, long startEventId) { - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountId); - event.setDomainId(getDomainId(accountId)); - event.setType(type); - event.setDescription(description); - event.setLevel(level); - event.setStartId(startEventId); - event = _eventDao.persist(event); - return (event != null ? event.getId() : null); - } - - public static Long saveCreatedEvent(Long userId, Long accountId, String level, String type, String description) { - EventVO event = new EventVO(); - event.setUserId(userId); - event.setAccountId(accountId); - event.setDomainId(getDomainId(accountId)); - event.setType(type); - event.setLevel(level); - event.setState(Event.State.Created); - event.setDescription(description); - event = _eventDao.persist(event); - return event.getId(); - } - - private static long getDomainId(long accountId){ - AccountVO account = _accountDao.findByIdIncludingRemoved(accountId); - return account.getDomainId(); - } -} diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java index 5816b2829f2..8c1c1148a37 100644 --- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java @@ -53,7 +53,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; import com.cloud.dc.dao.DedicatedResourceDao; -import com.cloud.event.EventUtils; +import com.cloud.event.ActionEventUtils; import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; import com.cloud.exception.InvalidParameterValueException; @@ -70,6 +70,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; +import com.cloud.user.dao.UserDao; import com.cloud.vm.dao.UserVmDao; @RunWith(SpringJUnit4ClassRunner.class) @@ -98,7 +99,7 @@ public class AffinityApiUnitTest { AffinityGroupDao _affinityGroupDao; @Inject - EventUtils _eventUtils; + ActionEventUtils _eventUtils; @Inject AccountDao _accountDao; @@ -195,7 +196,7 @@ public class AffinityApiUnitTest { } @Configuration - @ComponentScan(basePackageClasses = {AffinityGroupServiceImpl.class, EventUtils.class}, includeFilters = {@Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) + @ComponentScan(basePackageClasses = {AffinityGroupServiceImpl.class, ActionEventUtils.class}, includeFilters = {@Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)}, useDefaultFilters = false) public static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration { @Bean @@ -243,6 +244,11 @@ public class AffinityApiUnitTest { return Mockito.mock(UserVmDao.class); } + @Bean + public UserDao userDao() { + return Mockito.mock(UserDao.class); + } + public static class Library implements TypeFilter { @Override diff --git a/utils/src/org/apache/cloudstack/test/utils/SpringUtils.java b/utils/src/org/apache/cloudstack/test/utils/SpringUtils.java index 220bd80e8d3..fc54dfb3cb7 100644 --- a/utils/src/org/apache/cloudstack/test/utils/SpringUtils.java +++ b/utils/src/org/apache/cloudstack/test/utils/SpringUtils.java @@ -47,7 +47,7 @@ public class SpringUtils { * useDefaultFilters=true. See the following example. * * 
-     *     @ComponentScan(basePackageClasses={AffinityGroupServiceImpl.class, EventUtils.class},
+     *     @ComponentScan(basePackageClasses={AffinityGroupServiceImpl.class, ActionEventUtils.class},
      *     includeFilters={@Filter(value=TestConfiguration.Library.class, type=FilterType.CUSTOM)},
      *     useDefaultFilters=false)
      *