Martin Mucha has uploaded a new change for review. Change subject: core: fixed javadoc&generics ......................................................................
core: fixed javadoc&generics Change-Id: Id6f92f61c61ca566d89659db537b45ad7a04d898 Bug-Url: https://bugzilla.redhat.com/1078844 Signed-off-by: Martin Mucha <mmu...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java 16 files changed, 59 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/26802/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index f13c1a4..325a6d7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -57,7 +57,7 @@ protected HashMap<Guid, DiskImage> diskInfoDestinationMap; protected Map<Guid, List<DiskImage>> storageToDisksMap; - protected Map<Guid, StorageDomain> destStorages = new HashMap<Guid, StorageDomain>(); + protected Map<Guid, StorageDomain> destStorages = new HashMap<>(); private boolean _addVmsSucceded = true; /** @@ -93,7 +93,7 @@ initTemplate(); diskInfoDestinationMap = getParameters().getDiskInfoDestinationMap(); if (diskInfoDestinationMap == null) { - diskInfoDestinationMap = new HashMap<Guid, DiskImage>(); + diskInfoDestinationMap = new HashMap<>(); } setVdsGroupId(parameters.getVmPool().getVdsGroupId()); } @@ -195,7 +195,7 @@ CommandContext commandCtx = null; try { - Map<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<>(); values.put(VdcObjectType.VM.name().toLowerCase(), currentVmName); Step addVmStep = ExecutionHandler.addSubStep(getExecutionContext(), getExecutionContext().getJob().getStep(StepEnum.EXECUTING), @@ -261,7 +261,7 @@ } storageToDisksMap = ImagesHandler.buildStorageToDiskMap(getVmTemplate().getDiskTemplateMap().values(), diskInfoDestinationMap); - List<Guid> storageIds = new ArrayList<Guid>(); + List<Guid> storageIds = new ArrayList<>(); for (DiskImage diskImage : diskInfoDestinationMap.values()) { Guid storageId = diskImage.getStorageIds().get(0); if (!storageIds.contains(storageId) && !areTemplateImagesInStorageReady(storageId)) { @@ -319,7 +319,7 @@ if (getParameters().getStorageDomainId() != null && !Guid.Empty.equals(getParameters().getStorageDomainId())) { Guid storageId = getParameters().getStorageDomainId(); - ArrayList<Guid> storageIds = new ArrayList<Guid>(); + ArrayList<Guid> storageIds = new ArrayList<>(); storageIds.add(storageId); for (DiskImage image : getVmTemplate().getDiskTemplateMap().values()) { image.setStorageIds(storageIds); @@ -342,7 +342,7 @@ public boolean checkFreeSpaceAndTypeOnDestDomains() { boolean retValue = true; - List<Guid> validDomains = new ArrayList<Guid>(); + List<Guid> validDomains = new ArrayList<>(); for (DiskImage diskImage : diskInfoDestinationMap.values()) { Guid domainId = diskImage.getStorageIds().get(0); if (validDomains.contains(domainId)) { @@ -390,7 +390,7 @@ @Override public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() { - List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); + List<QuotaConsumptionParameter> list = new ArrayList<>(); for (DiskImage disk : diskInfoDestinationMap.values()) { list.add(new QuotaStorageConsumptionParameter( disk.getQuotaId(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 23c5f55..2414573 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -106,7 +106,7 @@ private static VmStatic vmStaticForDefaultValues = new VmStatic(); private List<DiskImage> imageList; - private final List<String> macsAdded = new ArrayList<String>(); + private final List<String> macsAdded = new ArrayList<>(); private final SnapshotsManager snapshotsManager = new SnapshotsManager(); protected MacPoolManagerStrategy macPool; @@ -122,7 +122,7 @@ macPool = ScopedMacPoolManager.scopeFor().vm(getParameters().getVm()).getPool(); setVdsGroupId(parameters.getVdsGroupId()); if (parameters.getVm() != null && getVm().getDiskMap() != null) { - imageList = new ArrayList<DiskImage>(); + imageList = new ArrayList<>(); for (Disk disk : getVm().getDiskMap().values()) { if (disk.getDiskStorageType() == DiskStorageType.IMAGE) { imageList.add((DiskImage) disk); @@ -179,7 +179,7 @@ @Override protected boolean canDoAction() { - Map<Guid, StorageDomain> domainsMap = new HashMap<Guid, StorageDomain>(); + Map<Guid, StorageDomain> domainsMap = new HashMap<>(); if (getVdsGroup() == null || getVm().getVdsGroupId() == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_CAN_NOT_BE_EMPTY); @@ -232,7 +232,7 @@ return false; } - Set<Guid> destGuids = new HashSet<Guid>(imageToDestinationDomainMap.values()); + Set<Guid> destGuids = new HashSet<>(imageToDestinationDomainMap.values()); for (Guid destGuid : destGuids) { StorageDomain storageDomain = getStorageDomain(destGuid); StorageDomainValidator validator = new StorageDomainValidator(storageDomain); @@ -309,7 +309,7 @@ // work properly. // we fix it to DestDomainId in // MoveOrCopyAllImageGroups(); - image.setStorageIds(new ArrayList<Guid>(Arrays.asList(getParameters().getSourceDomainId()))); + image.setStorageIds(new ArrayList<>(Arrays.asList(getParameters().getSourceDomainId()))); } Map<Guid, List<DiskImage>> images = ImagesHandler.getImagesLeaf(getVm().getImages()); @@ -449,7 +449,7 @@ * @return true if we managed to assign storage domain for every memory volume, false otherwise */ private boolean setDomainsForMemoryImages(Map<StorageDomain, Integer> domain2requiredSize) { - Map<String, String> handledMemoryVolumes = new HashMap<String, String>(); + Map<String, String> handledMemoryVolumes = new HashMap<>(); for (Snapshot snapshot : getVm().getSnapshots()) { String memoryVolume = snapshot.getMemoryVolume(); if (memoryVolume.isEmpty()) { @@ -885,7 +885,7 @@ } private void setDiskStorageDomainInfo(DiskImage disk) { - ArrayList<Guid> storageDomain = new ArrayList<Guid>(); + ArrayList<Guid> storageDomain = new ArrayList<>(); storageDomain.add(imageToDestinationDomainMap.get(disk.getId())); disk.setStorageIds(storageDomain); } @@ -906,7 +906,7 @@ } /** - * Generates and saves a {@link DiskImageDynamic} for the given {@link #disk}. + * Generates and saves a {@link DiskImageDynamic} for the given {@link org.ovirt.engine.core.common.businessentities.DiskImage}. * @param disk The imported disk **/ protected void saveDiskImageDynamic(DiskImage disk) { @@ -1270,7 +1270,7 @@ @Override public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() { - List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); + List<QuotaConsumptionParameter> list = new ArrayList<>(); for (Disk disk : getParameters().getVm().getDiskMap().values()) { //TODO: handle import more than once; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 886f69e..f64fb7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -79,7 +79,7 @@ setVmTemplateId(parameters.getContainerId()); parameters.setEntityInfo(new EntityInfo(VdcObjectType.VmTemplate, getVmTemplateId())); imageToDestinationDomainMap = getParameters().getImageToDestinationDomainMap(); - imageFromSourceDomainMap = new HashMap<Guid, DiskImage>(); + imageFromSourceDomainMap = new HashMap<>(); } protected StorageDomain getSourceDomain() { @@ -312,7 +312,7 @@ } protected Map<StorageDomain, Integer> getSpaceRequirementsForStorageDomains(Collection<DiskImage> images) { - Map<DiskImage, StorageDomain> spaceMap = new HashMap<DiskImage, StorageDomain>(); + Map<DiskImage, StorageDomain> spaceMap = new HashMap<>(); for (DiskImage image : images) { StorageDomain domain = getStorageDomain(imageToDestinationDomainMap.get(image.getId())); spaceMap.put(image, domain); @@ -322,7 +322,7 @@ protected void ensureDomainMap(Collection<DiskImage> images, Guid defaultDomainId) { if (imageToDestinationDomainMap == null) { - imageToDestinationDomainMap = new HashMap<Guid, Guid>(); + imageToDestinationDomainMap = new HashMap<>(); } if (imageToDestinationDomainMap.isEmpty() && images != null && defaultDomainId != null && !Guid.Empty.equals(defaultDomainId)) { @@ -338,8 +338,8 @@ if (imageToDestinationDomainMap == null || imageToDestinationDomainMap.isEmpty()) { permissionCheckSubject = super.getPermissionCheckSubjects(); } else { - permissionCheckSubject = new ArrayList<PermissionSubject>(); - Set<PermissionSubject> permissionSet = new HashSet<PermissionSubject>(); + permissionCheckSubject = new ArrayList<>(); + Set<PermissionSubject> permissionSet = new HashSet<>(); for (Guid storageId : imageToDestinationDomainMap.values()) { permissionSet.add(new PermissionSubject(storageId, VdcObjectType.Storage, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index a1d9689..19f88c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -373,7 +373,7 @@ @Override public List<PermissionSubject> getPermissionCheckSubjects() { - List<PermissionSubject> permissionList = new ArrayList<PermissionSubject>(); + List<PermissionSubject> permissionList = new ArrayList<>(); permissionList.add(new PermissionSubject(getParameters().getVmId(), VdcObjectType.VM, getActionType().getActionGroup())); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index af7a1c4..89e984f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -78,11 +78,15 @@ private static Set<VdcActionType> COMMANDS_ALLOWED_ON_EXTERNAL_VMS = new HashSet<>(); private static Set<VdcActionType> COMMANDS_ALLOWED_ON_HOSTED_ENGINE = new HashSet<>(); + + private VmHandler() { + } + /** * Initialize static list containers, for identity and permission check. The initialization should be executed * before calling ObjectIdentityChecker. * - * @see Backend#InitHandlers + * @see Backend#initHandlers() */ public static void init() { Class<?>[] inspectedClassNames = new Class<?>[] { @@ -389,9 +393,9 @@ if (vm.getAppList() != null) { final String[] parts = vm.getAppList().split("[,]", -1); if (parts.length != 0) { - final List<String> possibleAgentAppNames = Config.<List<String>> getValue(ConfigValues.AgentAppName); + final List<String> possibleAgentAppNames = Config.getValue(ConfigValues.AgentAppName); final Map<String, String> spiceDriversInGuest = - Config.<Map<String, String>> getValue(ConfigValues.SpiceDriverNameInGuest); + Config.getValue(ConfigValues.SpiceDriverNameInGuest); final String spiceDriverInGuest = spiceDriversInGuest.get(osRepository.getOsFamily(vm.getOs()).toLowerCase()); @@ -543,7 +547,7 @@ * @return */ public static boolean isNumOfMonitorsLegal(DisplayType displayType, int numOfMonitors, List<String> reasons) { - boolean legal = true; + boolean legal; if (displayType == DisplayType.vnc) { legal = (numOfMonitors <= 1); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java index a4f4f76..af08d66 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java @@ -47,7 +47,7 @@ * Add a {@link VmNic} to the VM. Allocates a MAC from the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager} if necessary, otherwise, if * {@code ConfigValues.HotPlugEnabled} is true, forces adding the MAC address to the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager}. If * HotPlug is not enabled tries to add the {@link VmNic}'s MAC address to the {@link org.ovirt.engine.core.bll.network.macPoolManager.MacPoolManager}, and throws a - * {@link VdcBllException} if it fails. + * {@link VdcBLLException} if it fails. * * @param iface * The interface to save. @@ -156,7 +156,7 @@ */ public List<String> findActiveVmsUsingNetworks(Guid vdsId, List<String> networks) { List<VM> runningVms = getVmDAO().getAllRunningForVds(vdsId); - List<String> vmNames = new ArrayList<String>(); + List<String> vmNames = new ArrayList<>(); for (VM vm : runningVms) { List<VmNetworkInterface> vmInterfaces = getVmNetworkInterfaceDao().getAllForVm(vm.getId()); for (VmNetworkInterface vmNic : vmInterfaces) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java index ea2de64..f492301 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java @@ -343,7 +343,7 @@ } else { List<VDS> poolHosts = getVdsDAO().getAllForStoragePool(getParameters().getStoragePoolId()); - sharedLocks = new HashMap<String, Pair<String, String>>(); + sharedLocks = new HashMap<>(); for (VDS host : poolHosts) { sharedLocks.put(host.getId().toString(), LockMessagesMatchUtil.makeLockingPair(LockingGroup.VDS, VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED)); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index e8f943a..910b528 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -400,7 +400,7 @@ protected Set<StorageFormatType> getSupportedStorageFormatSet(Version version) { String[] supportedFormats = getSupportedStorageFormats(version).split("[,]"); - Set<StorageFormatType> supportedFormatsSet = new HashSet<StorageFormatType>(); + Set<StorageFormatType> supportedFormatsSet = new HashSet<>(); for (String supportedFormat : supportedFormats) { supportedFormatsSet.add(StorageFormatType.forValue(supportedFormat)); } @@ -420,7 +420,7 @@ } private ArrayList<Object> initAsyncOperationParameters(List<VDS> allRunningVdsInPool) { - ArrayList<Object> parameters = new ArrayList<Object>(); + ArrayList<Object> parameters = new ArrayList<>(); parameters.add(allRunningVdsInPool); parameters.add(getStorageDomain()); parameters.add(getStoragePool()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java index 7ef44bd..cc8da17 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java @@ -209,7 +209,7 @@ protected boolean checkAllClustersLevel() { boolean returnValue = true; List<VDSGroup> clusters = getVdsGroupDAO().getAllForStoragePool(getStoragePool().getId()); - List<String> lowLevelClusters = new ArrayList<String>(); + List<String> lowLevelClusters = new ArrayList<>(); for (VDSGroup cluster : clusters) { if (getStoragePool().getcompatibility_version().compareTo(cluster.getcompatibility_version()) > 0) { lowLevelClusters.add(cluster.getName()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java index 920f7b9..cfc34e4 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java @@ -105,7 +105,7 @@ private ImportVmCommand<ImportVmParameters> setupDiskSpaceTest(final int diskSpaceRequired) { mcr.mockConfigValue(ConfigValues.FreeSpaceCriticalLowInGB, diskSpaceRequired); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(createParameters())); + ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<>(createParameters())); doReturn(true).when(cmd).validateNoDuplicateVm(); doReturn(true).when(cmd).validateVdsCluster(); doReturn(true).when(cmd).validateUsbPolicy(); @@ -115,7 +115,7 @@ doReturn(true).when(cmd).validateNoDuplicateDiskImages(any(Iterable.class)); doReturn(createSourceDomain()).when(cmd).getSourceDomain(); doReturn(createStorageDomain()).when(cmd).getStorageDomain(any(Guid.class)); - doReturn(Collections.<VM> singletonList(createVM())).when(cmd).getVmsFromExportDomain(); + doReturn(Collections.singletonList(createVM())).when(cmd).getVmsFromExportDomain(); doReturn(new VmTemplate()).when(cmd).getVmTemplate(); doReturn(new StoragePool()).when(cmd).getStoragePool(); doReturn(new VDSGroup()).when(cmd).getVdsGroup(); @@ -150,7 +150,7 @@ activeImage.setParentId(baseImage.getImageId()); v.setDiskMap(Collections.<Guid, Disk> singletonMap(activeImage.getId(), activeImage)); - v.setImages(new ArrayList<DiskImage>(Arrays.asList(baseImage, activeImage))); + v.setImages(new ArrayList<>(Arrays.asList(baseImage, activeImage))); v.setVdsGroupId(Guid.Empty); return v; @@ -204,7 +204,7 @@ /** * Checking that other fields in - * {@link org.ovirt.engine.core.common.businessentities.VmStatic.VmStatic} + * {@link org.ovirt.engine.core.common.businessentities.VmStatic#VmStatic} * don't get validated when importing a VM. */ @Test @@ -260,7 +260,7 @@ public void testAliasGenerationByAddVmImagesAndSnapshotsWithCollapse() { ImportVmParameters params = createParameters(); params.setCopyCollapse(true); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<>(params)); DiskImage collapsedDisk = params.getVm().getImages().get(1); @@ -280,7 +280,7 @@ params.setCopyCollapse(Boolean.TRUE); DiskImage diskImage = params.getVm().getImages().get(0); diskImage.setVmSnapshotId(Guid.Empty); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<>(params)); doReturn(true).when(cmd).validateNoDuplicateVm(); doReturn(true).when(cmd).validateVdsCluster(); doReturn(true).when(cmd).validateUsbPolicy(); @@ -290,7 +290,7 @@ doReturn(true).when(cmd).validateNoDuplicateDiskImages(any(Iterable.class)); doReturn(createSourceDomain()).when(cmd).getSourceDomain(); doReturn(createStorageDomain()).when(cmd).getStorageDomain(any(Guid.class)); - doReturn(Collections.<VM> singletonList(params.getVm())).when(cmd).getVmsFromExportDomain(); + doReturn(Collections.singletonList(params.getVm())).when(cmd).getVmsFromExportDomain(); doReturn(new VmTemplate()).when(cmd).getVmTemplate(); doReturn(new StoragePool()).when(cmd).getStoragePool(); doReturn(new VDSGroup()).when(cmd).getVdsGroup(); @@ -305,7 +305,7 @@ public void testAliasGenerationByAddVmImagesAndSnapshotsWithoutCollapse() { ImportVmParameters params = createParameters(); params.setCopyCollapse(false); - ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<ImportVmParameters>(params)); + ImportVmCommand<ImportVmParameters> cmd = spy(new ImportVmCommand<>(params)); for (DiskImage image : params.getVm().getImages()) { doNothing().when(cmd).saveImage(image); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index 8f529ac..a6fe2d5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -206,10 +206,12 @@ this.vmStatic.setDescription(value); } + @Override public String getComment() { return this.vmStatic.getComment(); } + @Override public void setComment(String value) { this.vmStatic.setComment(value); } @@ -1123,7 +1125,7 @@ if (diskSize == 0) { for (Disk disk : getDiskMap().values()) { if (DiskStorageType.IMAGE == disk.getDiskStorageType()) { - diskSize += ((DiskImage) disk).getSize() / Double.valueOf(1024 * 1024 * 1024); + diskSize += disk.getSize() / (1024.0D * 1024 * 1024); } } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java index 74e6544..6cdc48a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java @@ -3,7 +3,8 @@ import org.ovirt.engine.core.common.utils.ObjectUtils; /** - * <code>VmNetworkInterface</code> defines a type of {@link VmNic} for instances of {@link VM}. + * <code>VmNetworkInterface</code> defines a type of {@link VmNic} for instances of + * {@link org.ovirt.engine.core.common.businessentities.VM}. */ public class VmNetworkInterface extends VmNic { @@ -27,8 +28,8 @@ * The network name the vnic is attached to * * @param networkName - * @deprecated since ovirt 3.3 the network name is replaced by {@link VmNic.getVnicProfileId()} which determines the - * vnic profile used for using the network + * @deprecated since ovirt 3.3 the network name is replaced by {@link VmNic#getVnicProfileId()} which determines the + * the vnic profile used for using the network */ @Deprecated public void setNetworkName(String networkName) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java index 93f406a..2b3624b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java @@ -11,7 +11,8 @@ import org.ovirt.engine.core.compat.Guid; /** - * <code>VmNic</code> defines a type of {@link NetworkInterface} for instances of {@link VM}. + * <code>VmNic</code> defines a type of {@link NetworkInterface} for instances of + * {@link org.ovirt.engine.core.common.businessentities.VM}. */ public class VmNic extends NetworkInterface<VmNetworkStatistics> { public static final String UNICAST_MAC_ADDRESS_FORMAT = "\\p{XDigit}[02468aAcCeE](:\\p{XDigit}{2}){5}"; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 1131fdf..11a9a1b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -478,7 +478,7 @@ private void allocateCustomValues() { if (Collections.EMPTY_MAP.equals(customValues)) { - customValues = new HashMap<String, String>(); + customValues = new HashMap<>(); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java index d2e110c..2c4ccf0 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java @@ -39,7 +39,7 @@ /** * Returns the VM with the specified name, with optional filtering. * - * @param id + * @param name * the VM name * @param userID * the ID of the user requesting the information @@ -79,7 +79,7 @@ /** * Retrieves a list of VMs for the specified disk id. * - * @param disk + * @param id * the disk id * @return A {@link List} of the VMs associated with the disk. */ @@ -248,7 +248,7 @@ /** * Retrieves all VMS that belong to the provided vm pool - * @param vm_pool_id + * @param vmPoolId * the pool id * @return */ diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java index 4bc1190..d32fb4b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java @@ -109,6 +109,7 @@ remove(id, true); } + @Override public void remove(Guid id, boolean removePermissions) { getCallsHandler().executeModification("DeleteVmStatic", getIdParamterSource(id) @@ -190,6 +191,7 @@ .addValue("vm_guid", id)); } + @Override public List<Guid> getOrderedVmGuidsForRunMultipleActions(List<Guid> guids) { // Constructing an IN clause of SQL that contains a list of GUIDs // The in clause looks like ('guid1','guid2','guid3') -- To view, visit http://gerrit.ovirt.org/26802 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6f92f61c61ca566d89659db537b45ad7a04d898 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmu...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
