diff --git a/api/src/org/apache/cloudstack/api/view/DBViewUtils.java b/api/src/org/apache/cloudstack/api/view/DBViewUtils.java deleted file mode 100644 index 5ea7eb7dab0..00000000000 --- a/api/src/org/apache/cloudstack/api/view/DBViewUtils.java +++ /dev/null @@ -1,225 +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 org.apache.cloudstack.api.view; - -import java.util.EnumSet; -import java.util.List; - -import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.response.DomainRouterResponse; -import org.apache.cloudstack.api.response.EventResponse; -import org.apache.cloudstack.api.response.InstanceGroupResponse; -import org.apache.cloudstack.api.response.ProjectAccountResponse; -import org.apache.cloudstack.api.response.ProjectInvitationResponse; -import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.cloudstack.api.response.ResourceTagResponse; -import org.apache.cloudstack.api.response.SecurityGroupResponse; -import org.apache.cloudstack.api.response.UserResponse; -import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.api.view.dao.DomainRouterJoinDao; -import org.apache.cloudstack.api.view.dao.EventJoinDao; -import org.apache.cloudstack.api.view.dao.InstanceGroupJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectAccountJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectInvitationJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectJoinDao; -import org.apache.cloudstack.api.view.dao.ResourceTagJoinDao; -import org.apache.cloudstack.api.view.dao.SecurityGroupJoinDao; -import org.apache.cloudstack.api.view.dao.UserAccountJoinDao; -import org.apache.cloudstack.api.view.dao.UserVmJoinDao; -import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; -import org.apache.cloudstack.api.view.vo.EventJoinVO; -import org.apache.cloudstack.api.view.vo.InstanceGroupJoinVO; -import org.apache.cloudstack.api.view.vo.ProjectAccountJoinVO; -import org.apache.cloudstack.api.view.vo.ProjectInvitationJoinVO; -import org.apache.cloudstack.api.view.vo.ProjectJoinVO; -import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; -import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; -import org.apache.cloudstack.api.view.vo.UserAccountJoinVO; -import org.apache.cloudstack.api.view.vo.UserVmJoinVO; - - -import com.cloud.configuration.ConfigurationService; -import com.cloud.event.Event; -import com.cloud.network.router.VirtualRouter; -import com.cloud.network.security.SecurityGroup; -import com.cloud.projects.Project; -import com.cloud.projects.ProjectAccount; -import com.cloud.projects.ProjectInvitation; -import com.cloud.projects.ProjectService; -import com.cloud.server.ResourceTag; -import com.cloud.server.TaggedResourceService; -import com.cloud.user.Account; -import com.cloud.user.ResourceLimitService; -import com.cloud.user.User; -import com.cloud.user.UserAccount; - -import com.cloud.uservm.UserVm; -import com.cloud.utils.component.ComponentLocator; -import com.cloud.vm.InstanceGroup; - - -/** - * @author minc - * - */ -public class DBViewUtils { - - private static DomainRouterJoinDao _domainRouterJoinDao; - private static SecurityGroupJoinDao _securityGroupJoinDao; - private static UserVmJoinDao _userVmJoinDao; - private static ResourceTagJoinDao _tagJoinDao; - private static EventJoinDao _eventJoinDao; - private static InstanceGroupJoinDao _vmGroupJoinDao; - private static UserAccountJoinDao _userAccountJoinDao; - private static ProjectJoinDao _projectJoinDao; - private static ProjectAccountJoinDao _projectAccountJoinDao; - private static ProjectInvitationJoinDao _projectInvitationJoinDao; - - static { - ComponentLocator locator = ComponentLocator.getLocator("management-server"); - _domainRouterJoinDao = locator.getDao(DomainRouterJoinDao.class); - _userVmJoinDao = locator.getDao(UserVmJoinDao.class); - _securityGroupJoinDao = locator.getDao(SecurityGroupJoinDao.class); - _tagJoinDao = locator.getDao(ResourceTagJoinDao.class); - _vmGroupJoinDao = locator.getDao(InstanceGroupJoinDao.class); - _eventJoinDao = locator.getDao(EventJoinDao.class); - _userAccountJoinDao = locator.getDao(UserAccountJoinDao.class); - _projectJoinDao = locator.getDao(ProjectJoinDao.class); - _projectAccountJoinDao = locator.getDao(ProjectAccountJoinDao.class); - _projectInvitationJoinDao = locator.getDao(ProjectInvitationJoinDao.class); - } - - - public static DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO vr, Account caller) { - return _domainRouterJoinDao.newDomainRouterResponse(vr, caller); - } - - public static DomainRouterResponse fillRouterDetails(DomainRouterResponse vrData, DomainRouterJoinVO vr){ - return _domainRouterJoinDao.setDomainRouterResponse(vrData, vr); - } - - public static List newDomainRouterView(VirtualRouter vr){ - return _domainRouterJoinDao.newDomainRouterView(vr); - } - - public static UserVmResponse newUserVmResponse(String objectName, UserVmJoinVO userVm, EnumSet details, Account caller) { - return _userVmJoinDao.newUserVmResponse(objectName, userVm, details, caller); - } - - public static UserVmResponse fillVmDetails(UserVmResponse vmData, UserVmJoinVO vm){ - return _userVmJoinDao.setUserVmResponse(vmData, vm); - } - - public static List newUserVmView(UserVm... userVms){ - return _userVmJoinDao.newUserVmView(userVms); - } - - public static SecurityGroupResponse newSecurityGroupResponse(SecurityGroupJoinVO vsg, Account caller) { - return _securityGroupJoinDao.newSecurityGroupResponse(vsg, caller); - } - - public static SecurityGroupResponse fillSecurityGroupDetails(SecurityGroupResponse vsgData, SecurityGroupJoinVO sg){ - return _securityGroupJoinDao.setSecurityGroupResponse(vsgData, sg); - } - - public static List newSecurityGroupView(SecurityGroup sg){ - return _securityGroupJoinDao.newSecurityGroupView(sg); - } - - public static List findSecurityGroupViewById(Long sgId){ - return _securityGroupJoinDao.searchByIds(sgId); - } - - public static ResourceTagResponse newResourceTagResponse(ResourceTagJoinVO vsg, boolean keyValueOnly) { - return _tagJoinDao.newResourceTagResponse(vsg, keyValueOnly); - } - - public static ResourceTagJoinVO newResourceTagView(ResourceTag sg){ - return _tagJoinDao.newResourceTagView(sg); - } - - public static ResourceTagJoinVO findResourceTagViewById(Long tagId){ - List tags = _tagJoinDao.searchByIds(tagId); - if ( tags != null && tags.size() > 0 ){ - return tags.get(0); - } - else{ - return null; - } - } - - public static EventResponse newEventResponse(EventJoinVO ve) { - return _eventJoinDao.newEventResponse(ve); - } - - public static EventJoinVO newEventView(Event e){ - return _eventJoinDao.newEventView(e); - } - - public static InstanceGroupResponse newInstanceGroupResponse(InstanceGroupJoinVO ve) { - return _vmGroupJoinDao.newInstanceGroupResponse(ve); - } - - public static InstanceGroupJoinVO newInstanceGroupView(InstanceGroup e){ - return _vmGroupJoinDao.newInstanceGroupView(e); - } - - public static UserResponse newUserResponse(UserAccountJoinVO usr) { - return _userAccountJoinDao.newUserResponse(usr); - } - - public static UserAccountJoinVO newUserView(User usr){ - return _userAccountJoinDao.newUserView(usr); - } - - public static UserAccountJoinVO newUserView(UserAccount usr){ - return _userAccountJoinDao.newUserView(usr); - } - - public static ProjectResponse newProjectResponse(ProjectJoinVO proj) { - return _projectJoinDao.newProjectResponse(proj); - } - - public static ProjectResponse fillProjectDetails(ProjectResponse rsp, ProjectJoinVO proj){ - return _projectJoinDao.setProjectResponse(rsp,proj); - } - - public static List newProjectView(Project proj){ - return _projectJoinDao.newProjectView(proj); - } - - public static List findUserViewByAccountId(Long accountId){ - return _userAccountJoinDao.searchByAccountId(accountId); - } - - public static ProjectAccountResponse newProjectAccountResponse(ProjectAccountJoinVO proj) { - return _projectAccountJoinDao.newProjectAccountResponse(proj); - } - - public static ProjectAccountJoinVO newProjectAccountView(ProjectAccount proj) { - return _projectAccountJoinDao.newProjectAccountView(proj); - } - - public static ProjectInvitationResponse newProjectInvitationResponse(ProjectInvitationJoinVO proj) { - return _projectInvitationJoinDao.newProjectInvitationResponse(proj); - } - - public static ProjectInvitationJoinVO newProjectInvitationView(ProjectInvitation proj) { - return _projectInvitationJoinDao.newProjectInvitationView(proj); - } - -} diff --git a/api/src/org/apache/cloudstack/api/view/ViewResponseHelper.java b/api/src/org/apache/cloudstack/api/view/ViewResponseHelper.java deleted file mode 100644 index 39c0429047c..00000000000 --- a/api/src/org/apache/cloudstack/api/view/ViewResponseHelper.java +++ /dev/null @@ -1,43 +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 org.apache.cloudstack.api.view; - -import org.apache.cloudstack.api.response.ControlledViewEntityResponse; -import org.apache.cloudstack.api.view.vo.ControlledViewEntity; - -import com.cloud.user.Account; - -/** - * Some helper routine in generating response from db view. - * @author minc - * - */ -public class ViewResponseHelper { - - public static void populateOwner(ControlledViewEntityResponse response, ControlledViewEntity object) { - - if (object.getAccountType() == Account.ACCOUNT_TYPE_PROJECT) { - response.setProjectId(object.getProjectUuid()); - response.setProjectName(object.getProjectName()); - } else { - response.setAccountName(object.getAccountName()); - } - - response.setDomainId(object.getDomainUuid()); - response.setDomainName(object.getDomainName()); - } -} diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index ae4260929a3..d5cce52e5f9 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -33,16 +33,6 @@ import org.apache.cloudstack.api.response.ResourceTagResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; -import org.apache.cloudstack.api.view.dao.DomainRouterJoinDao; -import org.apache.cloudstack.api.view.dao.EventJoinDao; -import org.apache.cloudstack.api.view.dao.InstanceGroupJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectAccountJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectInvitationJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectJoinDao; -import org.apache.cloudstack.api.view.dao.ResourceTagJoinDao; -import org.apache.cloudstack.api.view.dao.SecurityGroupJoinDao; -import org.apache.cloudstack.api.view.dao.UserAccountJoinDao; -import org.apache.cloudstack.api.view.dao.UserVmJoinDao; import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import org.apache.cloudstack.api.view.vo.EventJoinVO; import org.apache.cloudstack.api.view.vo.InstanceGroupJoinVO; @@ -76,6 +66,7 @@ import com.cloud.dc.dao.VlanDao; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.Event; +import com.cloud.event.dao.EventJoinDao; import com.cloud.exception.InvalidParameterValueException; import com.cloud.ha.HighAvailabilityManager; import com.cloud.host.Host; @@ -121,6 +112,7 @@ import com.cloud.network.security.SecurityGroup; import com.cloud.network.security.SecurityGroupManager; import com.cloud.network.security.SecurityGroupVO; import com.cloud.network.security.dao.SecurityGroupDao; +import com.cloud.network.security.dao.SecurityGroupJoinDao; import com.cloud.network.vpc.VpcManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; @@ -130,6 +122,9 @@ import com.cloud.projects.Project; import com.cloud.projects.ProjectAccount; import com.cloud.projects.ProjectInvitation; import com.cloud.projects.ProjectService; +import com.cloud.projects.dao.ProjectAccountJoinDao; +import com.cloud.projects.dao.ProjectInvitationJoinDao; +import com.cloud.projects.dao.ProjectJoinDao; import com.cloud.resource.ResourceManager; import com.cloud.server.Criteria; import com.cloud.server.ManagementServer; @@ -167,6 +162,7 @@ import com.cloud.storage.dao.VMTemplateHostDao; import com.cloud.storage.dao.VMTemplateSwiftDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeHostDao; +import com.cloud.tags.dao.ResourceTagJoinDao; import com.cloud.user.Account; import com.cloud.user.AccountDetailsDao; import com.cloud.user.AccountVO; @@ -178,6 +174,7 @@ import com.cloud.user.UserStatisticsVO; import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.SSHKeyPairDao; +import com.cloud.user.dao.UserAccountJoinDao; import com.cloud.user.dao.UserDao; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.uservm.UserVm; @@ -197,8 +194,11 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VmStats; import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.DomainRouterDao; +import com.cloud.vm.dao.DomainRouterJoinDao; +import com.cloud.vm.dao.InstanceGroupJoinDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; +import com.cloud.vm.dao.UserVmJoinDao; import com.cloud.vm.dao.VMInstanceDao; public class ApiDBUtils { @@ -944,6 +944,127 @@ public class ApiDBUtils { return _counterDao.findById(counterId); } + /////////////////////////////////////////////////////////////////////// + // Newly Added Utility Methods for List API refactoring // + /////////////////////////////////////////////////////////////////////// + + public static DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO vr, Account caller) { + return _domainRouterJoinDao.newDomainRouterResponse(vr, caller); + } + + public static DomainRouterResponse fillRouterDetails(DomainRouterResponse vrData, DomainRouterJoinVO vr){ + return _domainRouterJoinDao.setDomainRouterResponse(vrData, vr); + } + + public static List newDomainRouterView(VirtualRouter vr){ + return _domainRouterJoinDao.newDomainRouterView(vr); + } + + public static UserVmResponse newUserVmResponse(String objectName, UserVmJoinVO userVm, EnumSet details, Account caller) { + return _userVmJoinDao.newUserVmResponse(objectName, userVm, details, caller); + } + + public static UserVmResponse fillVmDetails(UserVmResponse vmData, UserVmJoinVO vm){ + return _userVmJoinDao.setUserVmResponse(vmData, vm); + } + + public static List newUserVmView(UserVm... userVms){ + return _userVmJoinDao.newUserVmView(userVms); + } + + public static SecurityGroupResponse newSecurityGroupResponse(SecurityGroupJoinVO vsg, Account caller) { + return _securityGroupJoinDao.newSecurityGroupResponse(vsg, caller); + } + + public static SecurityGroupResponse fillSecurityGroupDetails(SecurityGroupResponse vsgData, SecurityGroupJoinVO sg){ + return _securityGroupJoinDao.setSecurityGroupResponse(vsgData, sg); + } + + public static List newSecurityGroupView(SecurityGroup sg){ + return _securityGroupJoinDao.newSecurityGroupView(sg); + } + + public static List findSecurityGroupViewById(Long sgId){ + return _securityGroupJoinDao.searchByIds(sgId); + } + + public static ResourceTagResponse newResourceTagResponse(ResourceTagJoinVO vsg, boolean keyValueOnly) { + return _tagJoinDao.newResourceTagResponse(vsg, keyValueOnly); + } + + public static ResourceTagJoinVO newResourceTagView(ResourceTag sg){ + return _tagJoinDao.newResourceTagView(sg); + } + + public static ResourceTagJoinVO findResourceTagViewById(Long tagId){ + List tags = _tagJoinDao.searchByIds(tagId); + if ( tags != null && tags.size() > 0 ){ + return tags.get(0); + } + else{ + return null; + } + } + + public static EventResponse newEventResponse(EventJoinVO ve) { + return _eventJoinDao.newEventResponse(ve); + } + + public static EventJoinVO newEventView(Event e){ + return _eventJoinDao.newEventView(e); + } + + public static InstanceGroupResponse newInstanceGroupResponse(InstanceGroupJoinVO ve) { + return _vmGroupJoinDao.newInstanceGroupResponse(ve); + } + + public static InstanceGroupJoinVO newInstanceGroupView(InstanceGroup e){ + return _vmGroupJoinDao.newInstanceGroupView(e); + } + + public static UserResponse newUserResponse(UserAccountJoinVO usr) { + return _userAccountJoinDao.newUserResponse(usr); + } + + public static UserAccountJoinVO newUserView(User usr){ + return _userAccountJoinDao.newUserView(usr); + } + + public static UserAccountJoinVO newUserView(UserAccount usr){ + return _userAccountJoinDao.newUserView(usr); + } + + public static ProjectResponse newProjectResponse(ProjectJoinVO proj) { + return _projectJoinDao.newProjectResponse(proj); + } + + public static ProjectResponse fillProjectDetails(ProjectResponse rsp, ProjectJoinVO proj){ + return _projectJoinDao.setProjectResponse(rsp,proj); + } + + public static List newProjectView(Project proj){ + return _projectJoinDao.newProjectView(proj); + } + + public static List findUserViewByAccountId(Long accountId){ + return _userAccountJoinDao.searchByAccountId(accountId); + } + + public static ProjectAccountResponse newProjectAccountResponse(ProjectAccountJoinVO proj) { + return _projectAccountJoinDao.newProjectAccountResponse(proj); + } + + public static ProjectAccountJoinVO newProjectAccountView(ProjectAccount proj) { + return _projectAccountJoinDao.newProjectAccountView(proj); + } + + public static ProjectInvitationResponse newProjectInvitationResponse(ProjectInvitationJoinVO proj) { + return _projectInvitationJoinDao.newProjectInvitationResponse(proj); + } + + public static ProjectInvitationJoinVO newProjectInvitationView(ProjectInvitation proj) { + return _projectInvitationJoinDao.newProjectInvitationView(proj); + } } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 72c3bc8d85a..1e2b87d0941 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -112,7 +112,6 @@ import org.apache.cloudstack.api.response.VpcOfferingResponse; import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.VpnUsersResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.api.view.DBViewUtils; import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import org.apache.cloudstack.api.view.vo.ControlledViewEntity; import org.apache.cloudstack.api.view.vo.EventJoinVO; @@ -243,8 +242,8 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public UserResponse createUserResponse(User user) { - UserAccountJoinVO vUser = DBViewUtils.newUserView(user); - return DBViewUtils.newUserResponse(vUser); + UserAccountJoinVO vUser = ApiDBUtils.newUserView(user); + return ApiDBUtils.newUserResponse(vUser); } @@ -252,7 +251,7 @@ public class ApiResponseHelper implements ResponseGenerator { public List createUserResponse(UserAccountJoinVO... users) { List respList = new ArrayList(); for (UserAccountJoinVO vt : users){ - respList.add(DBViewUtils.newUserResponse(vt)); + respList.add(ApiDBUtils.newUserResponse(vt)); } return respList; } @@ -416,8 +415,8 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public UserResponse createUserResponse(UserAccount user) { - UserAccountJoinVO vUser = DBViewUtils.newUserView(user); - return DBViewUtils.newUserResponse(vUser); + UserAccountJoinVO vUser = ApiDBUtils.newUserView(user); + return ApiDBUtils.newUserResponse(vUser); } @Override @@ -1171,8 +1170,8 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public InstanceGroupResponse createInstanceGroupResponse(InstanceGroup group) { - InstanceGroupJoinVO vgroup = DBViewUtils.newInstanceGroupView(group); - return DBViewUtils.newInstanceGroupResponse(vgroup); + InstanceGroupJoinVO vgroup = ApiDBUtils.newInstanceGroupView(group); + return ApiDBUtils.newInstanceGroupResponse(vgroup); } @@ -1182,7 +1181,7 @@ public class ApiResponseHelper implements ResponseGenerator { public List createInstanceGroupResponse(InstanceGroupJoinVO... groups) { List respList = new ArrayList(); for (InstanceGroupJoinVO vt : groups){ - respList.add(DBViewUtils.newInstanceGroupResponse(vt)); + respList.add(ApiDBUtils.newInstanceGroupResponse(vt)); } return respList; } @@ -1369,14 +1368,14 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public List createUserVmResponse(String objectName, EnumSet details, UserVm... userVms) { - List viewVms = DBViewUtils.newUserVmView(userVms); + List viewVms = ApiDBUtils.newUserVmView(userVms); return createUserVmResponse(objectName, details, viewVms.toArray(new UserVmJoinVO[viewVms.size()])); } @Override public List createUserVmResponse(String objectName, UserVm... userVms) { - List viewVms = DBViewUtils.newUserVmView(userVms); + List viewVms = ApiDBUtils.newUserVmView(userVms); return createUserVmResponse(objectName, viewVms.toArray(new UserVmJoinVO[viewVms.size()])); } @@ -1398,10 +1397,10 @@ public class ApiResponseHelper implements ResponseGenerator { UserVmResponse userVmData = vmDataList.get(userVm.getId()); if ( userVmData == null ){ // first time encountering this vm - userVmData = DBViewUtils.newUserVmResponse(objectName, userVm, details, caller); + userVmData = ApiDBUtils.newUserVmResponse(objectName, userVm, details, caller); } else{ // update nics, securitygroups, tags for 1 to many mapping fields - userVmData = DBViewUtils.fillVmDetails(userVmData, userVm); + userVmData = ApiDBUtils.fillVmDetails(userVmData, userVm); } vmDataList.put(userVm.getId(), userVmData); } @@ -1411,7 +1410,7 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public DomainRouterResponse createDomainRouterResponse(VirtualRouter router) { - List viewVrs = DBViewUtils.newDomainRouterView(router); + List viewVrs = ApiDBUtils.newDomainRouterView(router); List listVrs = createDomainRouterResponse(viewVrs.toArray(new DomainRouterJoinVO[viewVrs.size()])); assert listVrs != null && listVrs.size() == 1 : "There should be one virtual router returned"; return listVrs.get(0); @@ -1426,11 +1425,11 @@ public class ApiResponseHelper implements ResponseGenerator { DomainRouterResponse vrData = vrDataList.get(vr.getId()); if ( vrData == null ){ // first time encountering this vm - vrData = DBViewUtils.newDomainRouterResponse(vr, caller); + vrData = ApiDBUtils.newDomainRouterResponse(vr, caller); } else{ // update nics for 1 to many mapping fields - vrData = DBViewUtils.fillRouterDetails(vrData, vr); + vrData = ApiDBUtils.fillRouterDetails(vrData, vr); } vrDataList.put(vr.getId(), vrData); } @@ -2016,11 +2015,11 @@ public class ApiResponseHelper implements ResponseGenerator { SecurityGroupResponse vrData = vrDataList.get(vr.getId()); if ( vrData == null ) { // first time encountering this sg - vrData = DBViewUtils.newSecurityGroupResponse(vr, caller); + vrData = ApiDBUtils.newSecurityGroupResponse(vr, caller); } else { // update rules for 1 to many mapping fields - vrData = DBViewUtils.fillSecurityGroupDetails(vrData, vr); + vrData = ApiDBUtils.fillSecurityGroupDetails(vrData, vr); } vrDataList.put(vr.getId(), vrData); } @@ -2029,7 +2028,7 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public SecurityGroupResponse createSecurityGroupResponse(SecurityGroup group) { - List viewSgs = DBViewUtils.newSecurityGroupView(group); + List viewSgs = ApiDBUtils.newSecurityGroupView(group); List listSgs = createSecurityGroupResponses(viewSgs); assert listSgs != null && listSgs.size() == 1 : "There should be one security group returned"; return listSgs.get(0); @@ -2122,15 +2121,15 @@ public class ApiResponseHelper implements ResponseGenerator { public List createEventResponse(EventJoinVO... events) { List respList = new ArrayList(); for (EventJoinVO vt : events){ - respList.add(DBViewUtils.newEventResponse(vt)); + respList.add(ApiDBUtils.newEventResponse(vt)); } return respList; } @Override public EventResponse createEventResponse(Event event) { - EventJoinVO vEvent = DBViewUtils.newEventView(event); - return DBViewUtils.newEventResponse(vEvent); + EventJoinVO vEvent = ApiDBUtils.newEventView(event); + return ApiDBUtils.newEventResponse(vEvent); } private List sumCapacities(List hostCapacities) { @@ -2384,7 +2383,7 @@ public class ApiResponseHelper implements ResponseGenerator { Map allowedSecuriytGroupAccounts = new HashMap(); if ((securityRules != null) && !securityRules.isEmpty()) { - SecurityGroupJoinVO securityGroup = DBViewUtils.findSecurityGroupViewById(securityRules.get(0).getSecurityGroupId()).get(0); + SecurityGroupJoinVO securityGroup = ApiDBUtils.findSecurityGroupViewById(securityRules.get(0).getSecurityGroupId()).get(0); response.setId(securityGroup.getUuid()); response.setName(securityGroup.getName()); response.setDescription(securityGroup.getDescription()); @@ -2416,7 +2415,7 @@ public class ApiResponseHelper implements ResponseGenerator { Long allowedSecurityGroupId = securityRule.getAllowedNetworkId(); if (allowedSecurityGroupId != null) { - List sgs = DBViewUtils.findSecurityGroupViewById(allowedSecurityGroupId); + List sgs = ApiDBUtils.findSecurityGroupViewById(allowedSecurityGroupId); if (sgs != null && sgs.size() > 0) { SecurityGroupJoinVO sg = sgs.get(0); securityGroupData.setSecurityGroupName(sg.getName()); @@ -2675,7 +2674,7 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public ProjectResponse createProjectResponse(Project project) { - List viewPrjs = DBViewUtils.newProjectView(project); + List viewPrjs = ApiDBUtils.newProjectView(project); List listPrjs = createProjectResponse(viewPrjs.toArray(new ProjectJoinVO[viewPrjs.size()])); assert listPrjs != null && listPrjs.size() == 1 : "There should be one project returned"; return listPrjs.get(0); @@ -2690,11 +2689,11 @@ public class ApiResponseHelper implements ResponseGenerator { ProjectResponse pData = prjDataList.get(p.getId()); if ( pData == null ){ // first time encountering this vm - pData = DBViewUtils.newProjectResponse(p); + pData = ApiDBUtils.newProjectResponse(p); } else{ // update those 1 to many mapping fields - pData = DBViewUtils.fillProjectDetails(pData, p); + pData = ApiDBUtils.fillProjectDetails(pData, p); } prjDataList.put(p.getId(), pData); } @@ -2853,7 +2852,7 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public ProjectAccountResponse createProjectAccountResponse(ProjectAccount projectAccount) { - ProjectAccountJoinVO vProj = DBViewUtils.newProjectAccountView(projectAccount); + ProjectAccountJoinVO vProj = ApiDBUtils.newProjectAccountView(projectAccount); List listProjs = createProjectAccountResponse(vProj); assert listProjs != null && listProjs.size() == 1 : "There should be one project account returned"; return listProjs.get(0); @@ -2864,9 +2863,9 @@ public class ApiResponseHelper implements ResponseGenerator { public List createProjectAccountResponse(ProjectAccountJoinVO... projectAccounts) { List responseList = new ArrayList(); for (ProjectAccountJoinVO proj : projectAccounts){ - ProjectAccountResponse resp = DBViewUtils.newProjectAccountResponse(proj); + ProjectAccountResponse resp = ApiDBUtils.newProjectAccountResponse(proj); // update user list - List users = DBViewUtils.findUserViewByAccountId(proj.getAccountId()); + List users = ApiDBUtils.findUserViewByAccountId(proj.getAccountId()); resp.setUsers(createUserResponse(users.toArray(new UserAccountJoinVO[users.size()]))); responseList.add(resp); } @@ -2875,8 +2874,8 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public ProjectInvitationResponse createProjectInvitationResponse(ProjectInvitation invite) { - ProjectInvitationJoinVO vInvite = DBViewUtils.newProjectInvitationView(invite); - return DBViewUtils.newProjectInvitationResponse(vInvite); + ProjectInvitationJoinVO vInvite = ApiDBUtils.newProjectInvitationView(invite); + return ApiDBUtils.newProjectInvitationResponse(vInvite); } @@ -2885,7 +2884,7 @@ public class ApiResponseHelper implements ResponseGenerator { public List createProjectInvitationResponse(ProjectInvitationJoinVO... invites) { List respList = new ArrayList(); for (ProjectInvitationJoinVO v : invites){ - respList.add(DBViewUtils.newProjectInvitationResponse(v)); + respList.add(ApiDBUtils.newProjectInvitationResponse(v)); } return respList; } @@ -3122,8 +3121,8 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) { - ResourceTagJoinVO rto = DBViewUtils.newResourceTagView(resourceTag); - return DBViewUtils.newResourceTagResponse(rto, keyValueOnly); + ResourceTagJoinVO rto = ApiDBUtils.newResourceTagView(resourceTag); + return ApiDBUtils.newResourceTagResponse(rto, keyValueOnly); } @@ -3131,7 +3130,7 @@ public class ApiResponseHelper implements ResponseGenerator { public List createResourceTagResponse(boolean keyValueOnly, ResourceTagJoinVO... tags) { List respList = new ArrayList(); for (ResourceTagJoinVO vt : tags){ - respList.add(DBViewUtils.newResourceTagResponse(vt, keyValueOnly)); + respList.add(ApiDBUtils.newResourceTagResponse(vt, keyValueOnly)); } return respList; } diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java index e49425eca83..2dd46fd9ad9 100755 --- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java +++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java @@ -21,17 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.cloudstack.api.view.dao.DomainRouterJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.EventJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.InstanceGroupJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.ProjectAccountJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.ProjectInvitationJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.ProjectJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.ResourceTagJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.SecurityGroupJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.UserAccountJoinDaoImpl; -import org.apache.cloudstack.api.view.dao.UserVmJoinDaoImpl; - import com.cloud.agent.manager.ClusteredAgentManagerImpl; import com.cloud.alert.AlertManagerImpl; import com.cloud.alert.dao.AlertDaoImpl; @@ -128,6 +117,7 @@ import com.cloud.network.rules.RulesManagerImpl; import com.cloud.network.rules.dao.PortForwardingRulesDaoImpl; import com.cloud.network.security.SecurityGroupManagerImpl2; import com.cloud.network.security.dao.SecurityGroupDaoImpl; +import com.cloud.network.security.dao.SecurityGroupJoinDaoImpl; import com.cloud.network.security.dao.SecurityGroupRuleDaoImpl; import com.cloud.network.security.dao.SecurityGroupRulesDaoImpl; import com.cloud.network.security.dao.SecurityGroupVMMapDaoImpl; @@ -149,6 +139,8 @@ import com.cloud.projects.ProjectManagerImpl; import com.cloud.projects.dao.ProjectAccountDaoImpl; import com.cloud.projects.dao.ProjectDaoImpl; import com.cloud.projects.dao.ProjectInvitationDaoImpl; +import com.cloud.projects.dao.ProjectInvitationJoinDaoImpl; +import com.cloud.projects.dao.ProjectJoinDaoImpl; import com.cloud.resource.ResourceManagerImpl; import com.cloud.resourcelimit.ResourceLimitManagerImpl; import com.cloud.service.dao.ServiceOfferingDaoImpl; @@ -181,6 +173,7 @@ import com.cloud.storage.snapshot.SnapshotSchedulerImpl; import com.cloud.storage.swift.SwiftManagerImpl; import com.cloud.storage.upload.UploadMonitorImpl; import com.cloud.tags.TaggedResourceManagerImpl; +import com.cloud.tags.dao.ResourceTagJoinDaoImpl; import com.cloud.tags.dao.ResourceTagsDaoImpl; import com.cloud.template.HyervisorTemplateAdapter; import com.cloud.template.TemplateAdapter; @@ -192,6 +185,7 @@ import com.cloud.user.DomainManagerImpl; import com.cloud.user.dao.AccountDaoImpl; import com.cloud.user.dao.SSHKeyPairDaoImpl; import com.cloud.user.dao.UserAccountDaoImpl; +import com.cloud.user.dao.UserAccountJoinDaoImpl; import com.cloud.user.dao.UserDaoImpl; import com.cloud.user.dao.UserStatisticsDaoImpl; import com.cloud.user.dao.UserStatsLogDaoImpl; @@ -209,13 +203,18 @@ import com.cloud.vm.ItWorkDaoImpl; import com.cloud.vm.UserVmManagerImpl; import com.cloud.vm.dao.ConsoleProxyDaoImpl; import com.cloud.vm.dao.DomainRouterDaoImpl; +import com.cloud.vm.dao.DomainRouterJoinDaoImpl; import com.cloud.vm.dao.InstanceGroupDaoImpl; +import com.cloud.vm.dao.InstanceGroupJoinDaoImpl; import com.cloud.vm.dao.InstanceGroupVMMapDaoImpl; import com.cloud.vm.dao.NicDaoImpl; import com.cloud.vm.dao.SecondaryStorageVmDaoImpl; import com.cloud.vm.dao.UserVmDaoImpl; +import com.cloud.vm.dao.UserVmJoinDaoImpl; import com.cloud.vm.dao.UserVmDetailsDaoImpl; import com.cloud.vm.dao.VMInstanceDaoImpl; +import com.cloud.event.dao.EventJoinDaoImpl; +import com.cloud.projects.dao.ProjectAccountJoinDaoImpl; public class DefaultComponentLibrary extends ComponentLibraryBase implements ComponentLibrary { diff --git a/api/src/org/apache/cloudstack/api/view/dao/EventJoinDao.java b/server/src/com/cloud/event/dao/EventJoinDao.java similarity index 97% rename from api/src/org/apache/cloudstack/api/view/dao/EventJoinDao.java rename to server/src/com/cloud/event/dao/EventJoinDao.java index abf2c21240e..d67653d2cd9 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/EventJoinDao.java +++ b/server/src/com/cloud/event/dao/EventJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.event.dao; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/view/dao/EventJoinDaoImpl.java b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/EventJoinDaoImpl.java rename to server/src/com/cloud/event/dao/EventJoinDaoImpl.java index ee99d12738b..be2a6dc917a 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/EventJoinDaoImpl.java +++ b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java @@ -14,17 +14,17 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.event.dao; +import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; - +import com.cloud.api.ApiResponseHelper; import org.apache.cloudstack.api.response.EventResponse; -import org.apache.cloudstack.api.view.ViewResponseHelper; import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.event.Event; import com.cloud.event.Event.State; @@ -94,7 +94,7 @@ public class EventJoinDaoImpl extends GenericDaoBase implemen responseEvent.setState(event.getState()); responseEvent.setUsername(event.getUserName()); - ViewResponseHelper.populateOwner(responseEvent, event); + ApiResponseHelper.populateOwner(responseEvent, event); responseEvent.setObjectName("event"); return responseEvent; } diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index a017f536395..a9d1f0bd7a3 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -46,7 +46,6 @@ import com.cloud.agent.api.SecurityGroupRulesCmd; import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto; import com.cloud.agent.manager.Commands; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd; -import org.apache.cloudstack.api.view.dao.SecurityGroupJoinDao; import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; @@ -66,6 +65,7 @@ import com.cloud.network.NetworkManager; import com.cloud.network.security.SecurityGroupWork.Step; import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.network.security.dao.SecurityGroupDao; +import com.cloud.network.security.dao.SecurityGroupJoinDao; import com.cloud.network.security.dao.SecurityGroupRuleDao; import com.cloud.network.security.dao.SecurityGroupRulesDao; import com.cloud.network.security.dao.SecurityGroupVMMapDao; diff --git a/api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDao.java b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java similarity index 97% rename from api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDao.java rename to server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java index c9eabec66c1..30c089762d5 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDao.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.network.security.dao; import java.util.List; @@ -34,3 +34,4 @@ public interface SecurityGroupJoinDao extends GenericDao searchByIds(Long... ids); } + diff --git a/api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java similarity index 92% rename from api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDaoImpl.java rename to server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java index 95256c5c77b..6ecb258b39a 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/SecurityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java @@ -14,18 +14,19 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.network.security.dao; +import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import com.cloud.api.ApiDBUtils; +import com.cloud.api.ApiResponseHelper; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; -import org.apache.cloudstack.api.view.DBViewUtils; -import org.apache.cloudstack.api.view.ViewResponseHelper; import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.network.security.SecurityGroup; @@ -63,7 +64,7 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase 0) { @@ -102,9 +103,9 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase 0) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - sgResponse.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + sgResponse.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } sgResponse.setObjectName("securitygroup"); @@ -151,9 +152,9 @@ public class SecurityGroupJoinDaoImpl extends GenericDaoBase 0 ) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - vsgData.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + vsgData.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } return vsgData; diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index 51a98ae1481..7c97af2699d 100755 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -38,9 +38,6 @@ import javax.mail.URLName; import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.view.dao.ProjectAccountJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectInvitationJoinDao; -import org.apache.cloudstack.api.view.dao.ProjectJoinDao; import org.apache.cloudstack.api.view.vo.ProjectAccountJoinVO; import org.apache.cloudstack.api.view.vo.ProjectInvitationJoinVO; import org.apache.cloudstack.api.view.vo.ProjectJoinVO; @@ -65,8 +62,11 @@ import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.projects.Project.State; import com.cloud.projects.ProjectAccount.Role; import com.cloud.projects.dao.ProjectAccountDao; +import com.cloud.projects.dao.ProjectAccountJoinDao; import com.cloud.projects.dao.ProjectDao; import com.cloud.projects.dao.ProjectInvitationDao; +import com.cloud.projects.dao.ProjectInvitationJoinDao; +import com.cloud.projects.dao.ProjectJoinDao; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDao.java b/server/src/com/cloud/projects/dao/ProjectAccountJoinDao.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDao.java rename to server/src/com/cloud/projects/dao/ProjectAccountJoinDao.java index 3320d9e720a..bdee7aa0970 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDao.java +++ b/server/src/com/cloud/projects/dao/ProjectAccountJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectAccountJoinDaoImpl.java similarity index 98% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDaoImpl.java rename to server/src/com/cloud/projects/dao/ProjectAccountJoinDaoImpl.java index 59e789b55d2..afea1cb2acc 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectAccountJoinDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectAccountJoinDaoImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDao.java b/server/src/com/cloud/projects/dao/ProjectInvitationJoinDao.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDao.java rename to server/src/com/cloud/projects/dao/ProjectInvitationJoinDao.java index ba22c04caf3..2ee7de095f0 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDao.java +++ b/server/src/com/cloud/projects/dao/ProjectInvitationJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import org.apache.cloudstack.api.response.ProjectInvitationResponse; import org.apache.cloudstack.api.view.vo.ProjectInvitationJoinVO; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectInvitationJoinDaoImpl.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDaoImpl.java rename to server/src/com/cloud/projects/dao/ProjectInvitationJoinDaoImpl.java index 5c8231ce0f6..0ee0ef8fce9 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectInvitationJoinDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectInvitationJoinDaoImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import java.util.List; @@ -25,8 +25,9 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.response.ProjectInvitationResponse; import org.apache.cloudstack.api.view.vo.ProjectInvitationJoinVO; - +import com.cloud.api.ApiDBUtils; import com.cloud.projects.ProjectInvitation; +import com.cloud.user.Account; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDao.java b/server/src/com/cloud/projects/dao/ProjectJoinDao.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDao.java rename to server/src/com/cloud/projects/dao/ProjectJoinDao.java index 173f57e3faf..c5cc4227eee 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDao.java +++ b/server/src/com/cloud/projects/dao/ProjectJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java similarity index 89% rename from api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDaoImpl.java rename to server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java index 8b8d145f11a..81ccb7f5256 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ProjectJoinDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.projects.dao; import java.util.List; @@ -22,9 +22,8 @@ import javax.ejb.Local; import org.apache.log4j.Logger; - +import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.cloudstack.api.view.DBViewUtils; import org.apache.cloudstack.api.view.vo.ProjectJoinVO; import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.projects.Project; @@ -69,9 +68,9 @@ public class ProjectJoinDaoImpl extends GenericDaoBase impl // update tag information Long tag_id = proj.getTagId(); if (tag_id != null && tag_id.longValue() > 0) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - response.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + response.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } @@ -84,9 +83,9 @@ public class ProjectJoinDaoImpl extends GenericDaoBase impl // update tag information Long tag_id = proj.getTagId(); if (tag_id != null && tag_id.longValue() > 0) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - rsp.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + rsp.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } return rsp; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index a608a79020b..a196cd35769 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -98,9 +98,6 @@ import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd; import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd; import org.apache.cloudstack.api.response.ExtractResponse; -import org.apache.cloudstack.api.view.dao.DomainRouterJoinDao; -import org.apache.cloudstack.api.view.dao.EventJoinDao; -import org.apache.cloudstack.api.view.dao.InstanceGroupJoinDao; import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import org.apache.cloudstack.api.view.vo.EventJoinVO; import org.apache.cloudstack.api.view.vo.InstanceGroupJoinVO; @@ -147,6 +144,7 @@ import com.cloud.event.EventTypes; import com.cloud.event.EventUtils; import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; +import com.cloud.event.dao.EventJoinDao; import com.cloud.exception.CloudAuthenticationException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; @@ -264,7 +262,9 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfileImpl; import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.DomainRouterDao; +import com.cloud.vm.dao.DomainRouterJoinDao; import com.cloud.vm.dao.InstanceGroupDao; +import com.cloud.vm.dao.InstanceGroupJoinDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.SecondaryStorageVmDao; import com.cloud.vm.dao.UserVmDao; diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 6e69bd467da..0f82142d6b5 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -27,7 +27,6 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.view.dao.ResourceTagJoinDao; import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.domain.Domain; import com.cloud.event.ActionEvent; @@ -52,6 +51,7 @@ import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.tags.dao.ResourceTagDao; +import com.cloud.tags.dao.ResourceTagJoinDao; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.DomainManager; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDao.java b/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java similarity index 96% rename from api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDao.java rename to server/src/com/cloud/tags/dao/ResourceTagJoinDao.java index 38f3e0d7b92..8dd3d82d02e 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDao.java +++ b/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.tags.dao; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDaoImpl.java b/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java similarity index 95% rename from api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDaoImpl.java rename to server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java index 519ef3d0194..3c2dafa03e4 100644 --- a/api/src/org/apache/cloudstack/api/view/dao/ResourceTagJoinDaoImpl.java +++ b/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java @@ -14,17 +14,17 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.view.dao; +package com.cloud.tags.dao; +import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; - +import com.cloud.api.ApiResponseHelper; import org.apache.cloudstack.api.response.ResourceTagResponse; -import org.apache.cloudstack.api.view.ViewResponseHelper; import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag; import com.cloud.utils.db.GenericDaoBase; @@ -67,7 +67,7 @@ public class ResourceTagJoinDaoImpl extends GenericDaoBase implem userVmResponse.setPublicIp(userVm.getPublicIpAddress()); userVmResponse.setKeyPairName(userVm.getKeypairName()); - /*TODO: we need to invoke cloud-engine API to get Vm statistics or StatsConnector needs - * to put them into DB tables if (details.contains(VMDetails.all) || details.contains(VMDetails.stats)) { DecimalFormat decimalFormat = new DecimalFormat("#.##"); // stats calculation @@ -151,7 +148,6 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem userVmResponse.setNetworkKbsWrite(networkKbWrite.longValue()); } } - */ if (details.contains(VMDetails.all) || details.contains(VMDetails.secgrp)) { Long securityGroupId = userVm.getSecurityGroupId(); @@ -202,9 +198,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem // update tag information long tag_id = userVm.getTagId(); if (tag_id > 0) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - userVmResponse.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + userVmResponse.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } userVmResponse.setObjectName(objectName); @@ -257,9 +253,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem long tag_id = uvo.getTagId(); if (tag_id > 0) { - ResourceTagJoinVO vtag = DBViewUtils.findResourceTagViewById(tag_id); + ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); if ( vtag != null ){ - userVmData.addTag(DBViewUtils.newResourceTagResponse(vtag, false)); + userVmData.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } return userVmData; diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java b/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java index 93bccf481dc..46b7018f4d2 100644 --- a/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java +++ b/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java @@ -23,7 +23,6 @@ import javax.naming.ConfigurationException; import junit.framework.TestCase; -import org.apache.cloudstack.api.view.dao.SecurityGroupJoinDaoImpl; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -35,6 +34,7 @@ import com.cloud.domain.dao.DomainDaoImpl; import com.cloud.event.dao.UsageEventDaoImpl; import com.cloud.network.MockNetworkManagerImpl; import com.cloud.network.security.dao.SecurityGroupDaoImpl; +import com.cloud.network.security.dao.SecurityGroupJoinDaoImpl; import com.cloud.network.security.dao.SecurityGroupRuleDaoImpl; import com.cloud.network.security.dao.SecurityGroupRulesDaoImpl; import com.cloud.network.security.dao.SecurityGroupVMMapDaoImpl;