GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Errorprone static analysis tool integration and fixes of reported iss… · NetApp/cloudstack@5b49d6a

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

.github/linters
- codespell.txt
agent/src/main/java/com/cloud/agent/mockvm
- MockVmMgr.java
api/src
- main/java/org/apache/cloudstack/api/command/admin/backup
  - UpdateBackupOfferingCmd.java
- test/java/com/cloud/network
  - IsolationMethodTest.java
core/src
- main/java
  - com/cloud
    - agent/resource/virtualnetwork/facade
      - AbstractConfigItemFacade.java
    - network
      - HAProxyConfigurator.java
    - resource
      - RequestWrapper.java
  - org/apache/cloudstack/agent/directdownload
    - DirectDownloadCommand.java
- test/java/com/cloud/resource
  - ServerResourceBaseTest.java
engine
- orchestration/src
  - main/java
    - com/cloud
      - agent/manager
        AgentAttache.java
        DirectAgentAttache.java
      - vm
        VirtualMachineManagerImpl.java
    - org/apache/cloudstack/engine/orchestration
      - NetworkOrchestrator.java
  - test/java/com/cloud/agent/manager
    - ConnectedAgentAttacheTest.java
- schema/src
  - main/java/com/cloud
    - offerings
      - NetworkOfferingVO.java
    - upgrade
      - SystemVmTemplateRegistration.java
      - dao
        DatabaseAccessObject.java
        Upgrade41500to41510.java
  - test/java/com/cloud
    - network/as
      - AutoScaleVmProfileVOTest.java
    - upgrade
      - SystemVmTemplateRegistrationTest.java
- storage
  - snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot
    - ScaleIOVMSnapshotStrategy.java
  - src/main/java/org/apache/cloudstack/storage/endpoint
    - DefaultEndPointSelector.java
framework
- db/src/main/java/com/cloud/utils/db
  - GenericDaoBase.java
- ipc/src/main/java/org/apache/cloudstack/framework/serializer
  - OnwireClassRegistry.java
- spring/module/src/test/java/org/apache/cloudstack/spring/module/factory
  - ModuleBasedContextFactoryTest.java
plugins
- ca/root-ca/src/main/java/org/apache/cloudstack/ca/provider
  - RootCAProvider.java
- hypervisors
  - hyperv/src
    - main/java/com/cloud/ha
      - HypervInvestigator.java
    - test/java/com/cloud/hypervisor/hyperv/test
      - HypervDirectConnectResourceTest.java
  - kvm/src
    - main/java/com/cloud/hypervisor/kvm
      - resource
        LibvirtComputingResource.java
      - storage
        KVMStorageProcessor.java
        MultipathSCSIAdapterBase.java
    - test/java/com/cloud/hypervisor/kvm
      - resource
        LibvirtComputingResourceTest.java
      - storage
        ScaleIOStoragePoolTest.java
  - ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects
    - ConnectionTest.java
    - NtpTest.java
  - vmware/src/test/java/com/cloud/hypervisor/vmware
    - VmwareDatacenterApiUnitTest.java
  - xenserver/src
    - main/java/com/cloud/hypervisor
      - XenServerGuru.java
    - test/java/com/cloud/hypervisor/xenserver/resource
      - CitrixResourceBaseTest.java
- network-elements
  - brocade-vcs/src/test/java/com/cloud/network/guru
    - BrocadeVcsGuestNetworkGuruTest.java
  - cisco-vnmc/src/test/java/com/cloud/network
    - cisco
      - CiscoVnmcConnectionTest.java
    - resource
      - CiscoVnmcResourceTest.java
  - nicira-nvp/src/test/java/com/cloud/network
    - guru
      - NiciraNvpGuestNetworkGuruTest.java
    - nicira
      - NiciraNvpApiIT.java
  - nsx/src/main/java/org/apache/cloudstack/agent/api
    - NsxNetworkCommand.java
  - tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command
- outofbandmanagement-drivers/redfish/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/redfish
  - RedfishWrapper.java
- storage/volume
  - nexenta/src/main/java/org/apache/cloudstack/storage/datastore/util
    - NexentaStorAppliance.java
  - storpool/src/main/java/org/apache/cloudstack/storage
    - datastore/driver
      - StorPoolPrimaryDataStoreDriver.java
    - motion
      - StorPoolDataMotionStrategy.java
- user-authenticators/ldap/src
  - main/java/org/apache/cloudstack/ldap
    - ADLdapUserManagerImpl.java
    - OpenLdapUserManagerImpl.java
  - test/java/org/apache/cloudstack/ldap
    - LdapDirectoryServerConnectionTest.java
    - LdapUnboundidZapdotConnectionTest.java
server/src
- main/java
  - com/cloud
    - api
      - doc
        ApiXmlDocWriter.java
        Argument.java
      - query/dao
        TemplateJoinDaoImpl.java
    - configuration
      - ConfigurationManagerImpl.java
    - ha
      - HighAvailabilityManagerImpl.java
    - network
      - IpAddressManagerImpl.java
    - server
      - ManagementServerImpl.java
    - storage
      - VolumeApiServiceImpl.java
    - vm
      - UserVmManagerImpl.java
  - org/apache/cloudstack
    - network
      - RoutedIpv4ManagerImpl.java
    - region/gslb
      - GlobalLoadBalancingRulesServiceImpl.java
- test/java
  - com/cloud
    - api/query
      - QueryManagerImplTest.java
    - configuration
      - ConfigurationManagerImplTest.java
    - deploy
      - DeploymentPlanningManagerImplTest.java
    - network/as
      - AutoScaleManagerImplTest.java
    - template
      - HypervisorTemplateAdapterTest.java
      - TemplateManagerImplTest.java
    - user
      - DomainManagerImplTest.java
    - vm
  - org/apache/cloudstack/network/router/deployment
    - RouterDeploymentDefinitionTest.java
services/console-proxy/rdpconsole/src
- main/java
  - rdpclient/ntlmssp
    - ServerNtlmsspChallenge.java
  - streamer
    - ByteBuffer.java
- test/java/streamer
  - ByteBufferTest.java
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo
- HypervisorHostHelper.java

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dismiss banner

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎.github/linters/codespell.txt‎`

Copy file name to clipboardExpand all lines: .github/linters/codespell.txt

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ environmnet`
`188`	`188`	`equivalant`
`189`	`189`	`erro`
`190`	`190`	`erronous`
	`191`	`+errorprone`
`191`	`192`	`everthing`
`192`	`193`	`everytime`
`193`	`194`	`excetion`

Collapse file

`‎agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java‎`

Copy file name to clipboardExpand all lines: agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public void freeVncPort(int port) {`
`249`	`249`	`public MockVm createVmFromSpec(VirtualMachineTO vmSpec) {`
`250`	`250`	`String vmName = vmSpec.getName();`
`251`	`251`	`long ramSize = vmSpec.getMinRam();`
`252`		`- int utilizationPercent = randSeed.nextInt() % 100;`
	`252`	`+ int utilizationPercent = randSeed.nextInt(100);`
`253`	`253`	`MockVm vm = null;`
`254`	`254`
`255`	`255`	`synchronized (this) {`

Collapse file

`‎api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java‎`

Copy file name to clipboardExpand all lines: api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ public Boolean getAllowUserDrivenBackups() {`
`83`	`83`	`public void execute() {`
`84`	`84`	`try {`
`85`	`85`	`if (StringUtils.isAllEmpty(getName(), getDescription()) && getAllowUserDrivenBackups() == null) {`
`86`		`- throw new InvalidParameterValueException(String.format("Can't update Backup Offering [id: %s] because there are no parameters to be updated, at least one of the",`
`87`		`- "following should be informed: name, description or allowUserDrivenBackups.", id));`
	`86`	`+ throw new InvalidParameterValueException(String.format("Can't update Backup Offering [id: %s] because there are no parameters to be updated," +`
	`87`	`+ " at least one of the following should be passed: name, description or allowUserDrivenBackups.", id));`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`BackupOffering result = backupManager.updateBackupOffering(this);`

Collapse file

`‎api/src/test/java/com/cloud/network/IsolationMethodTest.java‎`

Copy file name to clipboardExpand all lines: api/src/test/java/com/cloud/network/IsolationMethodTest.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`public class IsolationMethodTest {`
`26`	`26`	`@After`
`27`	`27`	`public void cleanTheRegistry() {`
`28`		`- PhysicalNetwork.IsolationMethod.registeredIsolationMethods.removeAll(PhysicalNetwork.IsolationMethod.registeredIsolationMethods);`
	`28`	`+ PhysicalNetwork.IsolationMethod.registeredIsolationMethods.clear();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Test`

Collapse file

`‎core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java‎`

Copy file name to clipboardExpand all lines: core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public abstract class AbstractConfigItemFacade {`
`106`	`106`
`107`	`107`	`public static AbstractConfigItemFacade getInstance(final Class<? extends NetworkElementCommand> key) {`
`108`	`108`	`if (!flyweight.containsKey(key)) {`
`109`		`- throw new CloudRuntimeException("Unable to process the configuration for " + key.getClass().getName());`
	`109`	`+ throw new CloudRuntimeException("Unable to process the configuration for " + key.getName());`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`final AbstractConfigItemFacade instance = flyweight.get(key);`

Collapse file

`‎core/src/main/java/com/cloud/network/HAProxyConfigurator.java‎`

Copy file name to clipboardExpand all lines: core/src/main/java/com/cloud/network/HAProxyConfigurator.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ private List<String> getRulesForPool(final LoadBalancerTO lbTO, final boolean ke`
`514`	`514`	`}`
`515`	`515`	`dstSubRule.add(sb.toString());`
`516`	`516`	`if (stickinessSubRule != null) {`
`517`		`- sb.append(" cookie ").append(dest.getDestIp().replace(".", "_")).append('-').append(dest.getDestPort()).toString();`
	`517`	`+ sb.append(" cookie ").append(dest.getDestIp().replace(".", "_")).append('-').append(dest.getDestPort());`
`518`	`518`	`dstWithCookieSubRule.add(sb.toString());`
`519`	`519`	`}`
`520`	`520`	`destsAvailable = true;`

Collapse file

`‎core/src/main/java/com/cloud/resource/RequestWrapper.java‎`

Copy file name to clipboardExpand all lines: core/src/main/java/com/cloud/resource/RequestWrapper.java

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected CommandWrapper<Command, Answer, ServerResource> retrieveCommands(final`
`86`	`86`
`87`	`87`	`keepCommandClass = commandClass2;`
`88`	`88`	`} catch (final ClassCastException e) {`
`89`		`- throw new CommandNotSupported("No key found for '" + keepCommandClass.getClass() + "' in the Map!");`
	`89`	`+ throw new CommandNotSupported("No key found for '" + keepCommandClass + "' in the Map!");`
`90`	`90`	`} catch (final NullPointerException e) {`
`91`	`91`	`// Will now traverse all the resource hierarchy. Returning null`
`92`	`92`	`// is not a problem.`

Collapse file

`‎core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java‎`

Copy file name to clipboardExpand all lines: core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ protected DirectDownloadCommand (final String url, final Long templateId, final`
`53`	`53`	`final Integer soTimeout, final Integer connectionRequestTimeout, final boolean followRedirects) {`
`54`	`54`	`this.url = url;`
`55`	`55`	`this.templateId = templateId;`
`56`		`- this.destData = destData;`
`57`	`56`	`this.destPool = destPool;`
`58`	`57`	`this.checksum = checksum;`
`59`	`58`	`this.headers = headers;`

Collapse file

`‎core/src/test/java/com/cloud/resource/ServerResourceBaseTest.java‎`

Copy file name to clipboardExpand all lines: core/src/test/java/com/cloud/resource/ServerResourceBaseTest.java

+11-12Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,36 +182,36 @@ public void tryToAutoDiscoverResourcePrivateNetworkInterfaceTestReturnNic() thro`
`182`	`182`	`@Test`
`183`	`183`	`public void defineResourceNetworkInterfacesTestUseXenbr0WhenPrivateNetworkInterfaceNotConfigured() {`
`184`	`184`	`Map<String, Object> params = createParamsMap(null, "cloudbr1", "cloudbr2", "cloudbr3");`
`185`		`- try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {`
`186`		`- Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
	`185`	`+ try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {`
	`186`	`+ mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
`187`	`187`
`188`	`188`	`serverResourceBaseSpy.defineResourceNetworkInterfaces(params);`
`189`	`189`
`190`		`- verifyAndAssertNetworkInterfaces("xenbr0", "cloudbr1", "cloudbr2", "cloudbr3");`
	`190`	`+ verifyAndAssertNetworkInterfaces(mockedNetUtils, "xenbr0", "cloudbr1", "cloudbr2", "cloudbr3");`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`@Test`
`195`	`195`	`public void defineResourceNetworkInterfacesTestUseXenbr1WhenPublicNetworkInterfaceNotConfigured() {`
`196`	`196`	`Map<String, Object> params = createParamsMap("cloudbr0", null, "cloudbr2", "cloudbr3");`
`197`		`- try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {`
`198`		`- Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
	`197`	`+ try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {`
	`198`	`+ mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
`199`	`199`
`200`	`200`	`serverResourceBaseSpy.defineResourceNetworkInterfaces(params);`
`201`	`201`
`202`		`- verifyAndAssertNetworkInterfaces("cloudbr0", "xenbr1", "cloudbr2", "cloudbr3");`
	`202`	`+ verifyAndAssertNetworkInterfaces(mockedNetUtils, "cloudbr0", "xenbr1", "cloudbr2", "cloudbr3");`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`@Test`
`207`	`207`	`public void defineResourceNetworkInterfacesTestUseConfiguredNetworkInterfaces() {`
`208`	`208`	`Map<String, Object> params = createParamsMap("cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");`
`209`		`- try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {`
`210`		`- Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
	`209`	`+ try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {`
	`210`	`+ mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);`
`211`	`211`
`212`	`212`	`serverResourceBaseSpy.defineResourceNetworkInterfaces(params);`
`213`	`213`
`214`		`- verifyAndAssertNetworkInterfaces("cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");`
	`214`	`+ verifyAndAssertNetworkInterfaces(mockedNetUtils, "cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`@@ -224,9 +224,8 @@ private Map<String, Object> createParamsMap(String... params) {`
`224`	`224`	`return result;`
`225`	`225`	`}`
`226`	`226`
`227`		`- private void verifyAndAssertNetworkInterfaces(String... expectedResults) {`
`228`		`- Mockito.verify(NetUtils.class, Mockito.times(4));`
`229`		`- NetUtils.getNetworkInterface(keyCaptor.capture());`
	`227`	`+ private void verifyAndAssertNetworkInterfaces(MockedStatic<NetUtils> mockedNetUtils, String... expectedResults) {`
	`228`	`+ mockedNetUtils.verify(() -> NetUtils.getNetworkInterface(keyCaptor.capture()), Mockito.times(4));`
`230`	`229`	`List<String> keys = keyCaptor.getAllValues();`
`231`	`230`
`232`	`231`	`for (int i = 0; i < expectedResults.length; i++) {`

Collapse file

`‎engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java‎`

Copy file name to clipboardExpand all lines: engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java

+8-1Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import java.util.LinkedList;`
`25`	`25`	`import java.util.List;`
`26`	`26`	`import java.util.Map;`
	`27`	`+import java.util.Objects;`
`27`	`28`	`import java.util.Random;`
`28`	`29`	`import java.util.Set;`
`29`	`30`	`import java.util.concurrent.ConcurrentHashMap;`
`@@ -351,7 +352,8 @@ public boolean equals(final Object obj) {`
`351`	`352`	`return false;`
`352`	`353`	`}`
`353`	`354`	`AgentAttache that = (AgentAttache)obj;`
`354`		`- return _id == that._id;`
	`355`	`+ return Objects.equals(_uuid, that._uuid) &&`
	`356`	`+ Objects.equals(_name, that._name);`
`355`	`357`	`}`
`356`	`358`
`357`	`359`	`public void send(final Request req, final Listener listener) throws AgentUnavailableException {`
`@@ -497,6 +499,11 @@ public void process(final Answer[] answers) {`
`497`	`499`	`*/`
`498`	`500`	`protected abstract boolean isClosed();`
`499`	`501`
	`502`	`+ @Override`
	`503`	`+ public int hashCode() {`
	`504`	`+ return Objects.hash(_uuid, _name);`
	`505`	`+ }`
	`506`	`+`
`500`	`507`	`protected class Alarm extends ManagedContextRunnable {`
`501`	`508`	`long _seq;`
`502`	`509`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.