Skip to content

Commit 151a7ee

Browse files
committed
CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.
1 parent b96fea2 commit 151a7ee

20 files changed

Lines changed: 207 additions & 1375 deletions

File tree

api/src/com/cloud/storage/S3.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

api/src/com/cloud/storage/Swift.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

api/src/org/apache/cloudstack/api/ResponseGenerator.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package org.apache.cloudstack.api;
1818

19+
1920
import java.text.DecimalFormat;
2021
import java.util.EnumSet;
2122
import java.util.List;
@@ -81,7 +82,6 @@
8182
import org.apache.cloudstack.api.response.ResourceCountResponse;
8283
import org.apache.cloudstack.api.response.ResourceLimitResponse;
8384
import org.apache.cloudstack.api.response.ResourceTagResponse;
84-
import org.apache.cloudstack.api.response.S3Response;
8585
import org.apache.cloudstack.api.response.SecurityGroupResponse;
8686
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
8787
import org.apache.cloudstack.api.response.ServiceResponse;
@@ -94,7 +94,6 @@
9494
import org.apache.cloudstack.api.response.StaticRouteResponse;
9595
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
9696
import org.apache.cloudstack.api.response.StoragePoolResponse;
97-
import org.apache.cloudstack.api.response.SwiftResponse;
9897
import org.apache.cloudstack.api.response.SystemVmInstanceResponse;
9998
import org.apache.cloudstack.api.response.SystemVmResponse;
10099
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
@@ -175,10 +174,8 @@
175174
import com.cloud.server.ResourceTag;
176175
import com.cloud.storage.GuestOS;
177176
import com.cloud.storage.ImageStore;
178-
import com.cloud.storage.S3;
179177
import com.cloud.storage.Snapshot;
180178
import com.cloud.storage.StoragePool;
181-
import com.cloud.storage.Swift;
182179
import com.cloud.storage.Volume;
183180
import com.cloud.storage.snapshot.SnapshotPolicy;
184181
import com.cloud.storage.snapshot.SnapshotSchedule;
@@ -330,7 +327,7 @@ LBHealthCheckResponse createLBHealthCheckPolicyResponse(List<? extends HealthChe
330327

331328
List<TemplateResponse> createIsoResponses(VirtualMachineTemplate iso, Long zoneId, boolean readyOnly);
332329

333-
// List<TemplateResponse> createIsoResponses(long isoId, Long zoneId, boolean readyOnly);
330+
// List<TemplateResponse> createIsoResponses(long isoId, Long zoneId, boolean readyOnly);
334331
//List<TemplateResponse> createIsoResponses(VirtualMachineTemplate iso, long zoneId, boolean readyOnly);
335332

336333
ProjectResponse createProjectResponse(Project project);
@@ -347,10 +344,6 @@ LBHealthCheckResponse createLBHealthCheckPolicyResponse(List<? extends HealthChe
347344

348345
SystemVmInstanceResponse createSystemVmInstanceResponse(VirtualMachine systemVM);
349346

350-
SwiftResponse createSwiftResponse(Swift swift);
351-
352-
S3Response createS3Response(S3 result);
353-
354347
PhysicalNetworkResponse createPhysicalNetworkResponse(PhysicalNetwork result);
355348

356349
ServiceResponse createNetworkServiceResponse(Service service);

api/src/org/apache/cloudstack/api/response/S3Response.java

Lines changed: 0 additions & 218 deletions
This file was deleted.

0 commit comments

Comments
 (0)