Removed legacy and trivial code from the Abiquo provider: * Removed all trivial predicate classes. * Removed all find* and list* methods in the domain objects that did nothing but delegating to Guava Iterables. * Removed UCS and Pricing Apis, since they are out of the scope of the provider. * Moved monitor events to the existing monitor package.
651 additions and 9242 deletions. Not bad! :) @demobox, after this cleanup is merged, I'll reopen https://github.com/jclouds/jclouds-labs/pull/9 You can merge this Pull Request by running: git pull https://github.com/nacx/jclouds-labs 156-cleanup-abiquo Or you can view, comment on it, or merge it online at: https://github.com/jclouds/jclouds-labs/pull/10 -- Commit Summary -- * JCLOUDS-156: Cleanup Abiquo provider -- File Changes -- M abiquo/src/main/java/org/jclouds/abiquo/AbiquoApi.java (9) M abiquo/src/main/java/org/jclouds/abiquo/AbiquoContext.java (8) D abiquo/src/main/java/org/jclouds/abiquo/binders/infrastructure/ucs/BindLogicServerParameters.java (48) D abiquo/src/main/java/org/jclouds/abiquo/binders/infrastructure/ucs/BindOrganizationParameters.java (49) M abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java (24) M abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/internal/FindCompatibleVirtualDatacentersForImageAndConversions.java (8) M abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/internal/FindCompatibleVirtualDatacentersForImageBaseFormat.java (6) M abiquo/src/main/java/org/jclouds/abiquo/domain/DomainWithTasksWrapper.java (13) M abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualAppliance.java (30) M abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenter.java (164) M abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachine.java (25) M abiquo/src/main/java/org/jclouds/abiquo/domain/cloud/VirtualMachineTemplate.java (38) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/CostCode.java (170) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/CostCodeCurrency.java (47) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/CostCodePrice.java (58) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/Currency.java (144) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/PricingCostCode.java (111) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/PricingTemplate.java (375) D abiquo/src/main/java/org/jclouds/abiquo/domain/config/PricingTier.java (111) M abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Enterprise.java (285) M abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/Role.java (13) M abiquo/src/main/java/org/jclouds/abiquo/domain/enterprise/User.java (19) M abiquo/src/main/java/org/jclouds/abiquo/domain/exception/AbiquoException.java (11) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/AbstractPhysicalMachine.java (266) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Blade.java (167) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/BladeLocatorLed.java (68) M abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Datacenter.java (432) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Fsm.java (70) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/LogicServer.java (85) M abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Machine.java (260) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/ManagedRack.java (708) D abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Organization.java (89) M abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Rack.java (33) M abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/StorageDevice.java (104) M abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Tier.java (38) M abiquo/src/main/java/org/jclouds/abiquo/domain/network/Network.java (18) M abiquo/src/main/java/org/jclouds/abiquo/features/InfrastructureApi.java (353) D abiquo/src/main/java/org/jclouds/abiquo/features/PricingApi.java (404) M abiquo/src/main/java/org/jclouds/abiquo/features/services/AdministrationService.java (89) M abiquo/src/main/java/org/jclouds/abiquo/features/services/CloudService.java (31) M abiquo/src/main/java/org/jclouds/abiquo/features/services/MonitoringService.java (2) D abiquo/src/main/java/org/jclouds/abiquo/features/services/PricingService.java (153) M abiquo/src/main/java/org/jclouds/abiquo/features/services/SearchService.java (25) M abiquo/src/main/java/org/jclouds/abiquo/internal/AbiquoContextImpl.java (12) M abiquo/src/main/java/org/jclouds/abiquo/internal/BaseAdministrationService.java (83) M abiquo/src/main/java/org/jclouds/abiquo/internal/BaseCloudService.java (32) M abiquo/src/main/java/org/jclouds/abiquo/internal/BaseMonitoringService.java (10) D abiquo/src/main/java/org/jclouds/abiquo/internal/BasePricingService.java (178) M abiquo/src/main/java/org/jclouds/abiquo/internal/BaseSearchService.java (20) R abiquo/src/main/java/org/jclouds/abiquo/monitor/events/CompletedEvent.java (2) R abiquo/src/main/java/org/jclouds/abiquo/monitor/events/FailedEvent.java (2) R abiquo/src/main/java/org/jclouds/abiquo/monitor/events/MonitorEvent.java (2) R abiquo/src/main/java/org/jclouds/abiquo/monitor/events/TimeoutEvent.java (2) R abiquo/src/main/java/org/jclouds/abiquo/monitor/handlers/AbstractEventHandler.java (4) R abiquo/src/main/java/org/jclouds/abiquo/monitor/handlers/BlockingEventHandler.java (4) R abiquo/src/main/java/org/jclouds/abiquo/predicates/IpPredicates.java (27) M abiquo/src/main/java/org/jclouds/abiquo/predicates/LinkPredicates.java (9) R abiquo/src/main/java/org/jclouds/abiquo/predicates/NetworkServiceTypePredicates.java (2) R abiquo/src/main/java/org/jclouds/abiquo/predicates/VirtualDatacenterPredicates.java (41) R abiquo/src/main/java/org/jclouds/abiquo/predicates/VirtualMachineTemplatePredicates.java (29) D abiquo/src/main/java/org/jclouds/abiquo/predicates/cloud/ConversionPredicates.java (81) D abiquo/src/main/java/org/jclouds/abiquo/predicates/cloud/VirtualAppliancePredicates.java (55) D abiquo/src/main/java/org/jclouds/abiquo/predicates/cloud/VirtualMachinePredicates.java (67) D abiquo/src/main/java/org/jclouds/abiquo/predicates/cloud/VirtualMachineTemplatePredicates.java (96) D abiquo/src/main/java/org/jclouds/abiquo/predicates/cloud/VolumePredicates.java (86) D abiquo/src/main/java/org/jclouds/abiquo/predicates/config/CategoryPredicates.java (45) D abiquo/src/main/java/org/jclouds/abiquo/predicates/config/LicensePredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/config/PricingPredicates.java (68) D abiquo/src/main/java/org/jclouds/abiquo/predicates/config/PrivilegePredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/config/SystemPropertyPredicates.java (45) D abiquo/src/main/java/org/jclouds/abiquo/predicates/enterprise/EnterprisePredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/enterprise/RolePredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/enterprise/TemplateDefinitionListPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/enterprise/UserPredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/BladePredicates.java (59) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/DatacenterPredicates.java (65) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/DatastorePredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/HypervisorPredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/LogicServerPredicates.java (43) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/MachinePredicates.java (59) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/ManagedRackPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/NetworkInterfacePredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/RackPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/RemoteServicePredicates.java (45) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/StorageDeviceMetadataPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/StorageDevicePredicates.java (66) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/StoragePoolPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/infrastructure/TierPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/network/NetworkPredicates.java (44) D abiquo/src/main/java/org/jclouds/abiquo/predicates/network/NicPredicates.java (54) D abiquo/src/main/java/org/jclouds/abiquo/predicates/task/AsyncTaskPredicates.java (44) M abiquo/src/main/java/org/jclouds/abiquo/reference/rest/ParentLinkName.java (2) M abiquo/src/main/java/org/jclouds/abiquo/strategy/ListEntities.java (4) M abiquo/src/main/java/org/jclouds/abiquo/strategy/ListRootEntities.java (4) M abiquo/src/main/java/org/jclouds/abiquo/strategy/cloud/ListAttachedNics.java (7) M abiquo/src/main/java/org/jclouds/abiquo/strategy/cloud/ListVirtualAppliances.java (5) M abiquo/src/main/java/org/jclouds/abiquo/strategy/cloud/ListVirtualDatacenters.java (5) M abiquo/src/main/java/org/jclouds/abiquo/strategy/cloud/ListVirtualMachines.java (5) M abiquo/src/main/java/org/jclouds/abiquo/strategy/enterprise/ListVirtualMachineTemplates.java (6) M abiquo/src/main/java/org/jclouds/abiquo/strategy/infrastructure/ListMachines.java (5) M abiquo/src/test/java/org/jclouds/abiquo/AbiquoDelegateApiTest.java (1) D abiquo/src/test/java/org/jclouds/abiquo/binders/infrastructure/ucs/BindLogicServerParametersTest.java (65) D abiquo/src/test/java/org/jclouds/abiquo/binders/infrastructure/ucs/BindOrganizationParametersTest.java (65) M abiquo/src/test/java/org/jclouds/abiquo/domain/InfrastructureResources.java (96) D abiquo/src/test/java/org/jclouds/abiquo/domain/PricingResources.java (273) M abiquo/src/test/java/org/jclouds/abiquo/domain/admin/RoleLiveApiTest.java (28) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualApplianceLiveTest.java (13) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualDatacenterLiveApiTest.java (31) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineLiveTest.java (22) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineNetworkingLiveApiTest.java (22) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VirtualMachineStorageLiveApiTest.java (11) M abiquo/src/test/java/org/jclouds/abiquo/domain/cloud/VolumeLiveApiTest.java (30) M abiquo/src/test/java/org/jclouds/abiquo/domain/config/CategoryLiveApiTest.java (26) D abiquo/src/test/java/org/jclouds/abiquo/domain/config/CostCodeLiveApiTest.java (126) D abiquo/src/test/java/org/jclouds/abiquo/domain/config/CurrencyLiveApiTest.java (67) D abiquo/src/test/java/org/jclouds/abiquo/domain/config/PricingTemplateLiveApiTest.java (128) M abiquo/src/test/java/org/jclouds/abiquo/domain/enterprise/TemplateDefinitionListLiveApiTest.java (16) M abiquo/src/test/java/org/jclouds/abiquo/domain/enterprise/UserLiveApiTest.java (25) M abiquo/src/test/java/org/jclouds/abiquo/domain/event/EventLiveApiTest.java (19) D abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/BladeLiveUcsTest.java (81) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/MachineLiveApiTest.java (23) D abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/ManagedRackLiveUcsTest.java (108) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/RackLiveApiTest.java (30) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/RemoteServiceLiveApiTest.java (31) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/StorageDeviceLiveApiTest.java (33) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/StoragePoolLiveApiTest.java (44) M abiquo/src/test/java/org/jclouds/abiquo/domain/infrastructure/TierLiveApiTest.java (28) M abiquo/src/test/java/org/jclouds/abiquo/domain/network/ExternalNetworkLiveApiTest.java (15) M abiquo/src/test/java/org/jclouds/abiquo/domain/network/PrivateNetworkLiveApiTest.java (5) M abiquo/src/test/java/org/jclouds/abiquo/domain/network/PublicNetworkLiveApiTest.java (5) M abiquo/src/test/java/org/jclouds/abiquo/domain/network/UnmanagedNetworkLiveApiTest.java (16) M abiquo/src/test/java/org/jclouds/abiquo/environment/CloudTestEnvironment.java (20) M abiquo/src/test/java/org/jclouds/abiquo/environment/InfrastructureTestEnvironment.java (102) M abiquo/src/test/java/org/jclouds/abiquo/features/InfrastructureApiTest.java (431) D abiquo/src/test/java/org/jclouds/abiquo/features/PricingApiTest.java (434) M abiquo/src/test/java/org/jclouds/abiquo/internal/AsyncMonitorTest.java (2) M abiquo/src/test/java/org/jclouds/abiquo/internal/BaseAbiquoApiLiveApiTest.java (7) R abiquo/src/test/java/org/jclouds/abiquo/monitor/handlers/BlockingEventHandlerTest.java (7) M abiquo/src/test/java/org/jclouds/abiquo/strategy/cloud/ListAttachedNicsLiveApiTest.java (32) M abiquo/src/test/java/org/jclouds/abiquo/strategy/cloud/ListVirtualAppliancesLiveApiTest.java (15) M abiquo/src/test/java/org/jclouds/abiquo/strategy/cloud/ListVirtualDatacentersLiveApiTest.java (18) M abiquo/src/test/java/org/jclouds/abiquo/strategy/cloud/ListVirtualMachinesLiveApiTest.java (15) M abiquo/src/test/java/org/jclouds/abiquo/strategy/enterprise/ListVirtualMachineTemplatesLiveApiTest.java (17) M abiquo/src/test/java/org/jclouds/abiquo/strategy/infrastructure/ListMachinesLiveApiTest.java (14) -- Patch Links -- https://github.com/jclouds/jclouds-labs/pull/10.patch https://github.com/jclouds/jclouds-labs/pull/10.diff
