Skip to content

Commit e9170c6

Browse files
rpmoorerpmoore
committed
Correcting some spacing issues.
1 parent 04acdc5 commit e9170c6

File tree

1 file changed

+115
-115
lines changed

1 file changed

+115
-115
lines changed

‎ds3-sdk/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java‎

Lines changed: 115 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public void getService() throws IOException, SignatureException {
8080
);
8181

8282
final GetServiceResponse response = MockNetwork
83-
.expecting(HttpVerb.GET, "/", null, null)
84-
.returning(200, stringResponse)
85-
.asClient()
86-
.getService(new GetServiceRequest());
83+
.expecting(HttpVerb.GET, "/", null, null)
84+
.returning(200, stringResponse)
85+
.asClient()
86+
.getService(new GetServiceRequest());
8787
final ListAllMyBucketsResult result = response.getResult();
8888
assertThat(result.getOwner().getDisplayName(), is("ryan"));
8989
assertThat(result.getOwner().getId(), is("ryanid"));
@@ -100,22 +100,22 @@ public void getService() throws IOException, SignatureException {
100100
@Test(expected = FailedRequestException.class)
101101
public void getBadService() throws IOException, SignatureException {
102102
MockNetwork
103-
.expecting(HttpVerb.GET, "/", null, null)
104-
.returning(400, "")
105-
.asClient()
106-
.getService(new GetServiceRequest());
103+
.expecting(HttpVerb.GET, "/", null, null)
104+
.returning(400, "")
105+
.asClient()
106+
.getService(new GetServiceRequest());
107107
}
108108

109109
@Test
110110
public void getBucket() throws IOException, SignatureException {
111111
final String xmlResponse = "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Name>remoteTest16</Name><Prefix/><Marker/><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>user/hduser/gutenberg/20417.txt.utf-8</Key><LastModified>2014-01-03T13:26:47.000Z</LastModified><ETag>8B19F3F41868106382A677C3435BDCE5</ETag><Size>674570</Size><StorageClass>STANDARD</StorageClass><Owner><ID>ryan</ID><DisplayName>ryan</DisplayName></Owner></Contents><Contents><Key>user/hduser/gutenberg/5000.txt.utf-8</Key><LastModified>2014-01-03T13:26:47.000Z</LastModified><ETag>9DE344878423E44B129730CE22B4B137</ETag><Size>1423803</Size><StorageClass>STANDARD</StorageClass><Owner><ID>ryan</ID><DisplayName>ryan</DisplayName></Owner></Contents><Contents><Key>user/hduser/gutenberg/4300.txt.utf-8</Key><LastModified>2014-01-03T13:26:47.000Z</LastModified><ETag>33EE4519EA7DDAB27CA4E2742326D70B</ETag><Size>1573150</Size><StorageClass>DEEP</StorageClass><Owner><ID>ryan</ID><DisplayName>ryan</DisplayName></Owner></Contents></ListBucketResult>";
112112

113113
final ListBucketResult result = MockNetwork
114-
.expecting(HttpVerb.GET, "/remoteTest16", null, null)
115-
.returning(200, xmlResponse)
116-
.asClient()
117-
.getBucket(new GetBucketRequest("remoteTest16"))
118-
.getResult();
114+
.expecting(HttpVerb.GET, "/remoteTest16", null, null)
115+
.returning(200, xmlResponse)
116+
.asClient()
117+
.getBucket(new GetBucketRequest("remoteTest16"))
118+
.getResult();
119119

120120
assertThat(result.getName(), is("remoteTest16"));
121121
assertThat(result.getPrefix(), is(nullValue()));
@@ -126,28 +126,28 @@ public void getBucket() throws IOException, SignatureException {
126126
assertThat(contentsList, is(notNullValue()));
127127
assertThat(contentsList.size(), is(3));
128128
this.assertContentsEquals(
129-
contentsList.get(0),
130-
"user/hduser/gutenberg/20417.txt.utf-8",
131-
"2014-01-03T13:26:47.000Z",
132-
"8B19F3F41868106382A677C3435BDCE5",
133-
674570,
134-
"STANDARD"
129+
contentsList.get(0),
130+
"user/hduser/gutenberg/20417.txt.utf-8",
131+
"2014-01-03T13:26:47.000Z",
132+
"8B19F3F41868106382A677C3435BDCE5",
133+
674570,
134+
"STANDARD"
135135
);
136136
this.assertContentsEquals(
137-
contentsList.get(1),
138-
"user/hduser/gutenberg/5000.txt.utf-8",
139-
"2014-01-03T13:26:47.000Z",
140-
"9DE344878423E44B129730CE22B4B137",
141-
1423803,
142-
"STANDARD"
137+
contentsList.get(1),
138+
"user/hduser/gutenberg/5000.txt.utf-8",
139+
"2014-01-03T13:26:47.000Z",
140+
"9DE344878423E44B129730CE22B4B137",
141+
1423803,
142+
"STANDARD"
143143
);
144144
this.assertContentsEquals(
145-
contentsList.get(2),
146-
"user/hduser/gutenberg/4300.txt.utf-8",
147-
"2014-01-03T13:26:47.000Z",
148-
"33EE4519EA7DDAB27CA4E2742326D70B",
149-
1573150,
150-
"DEEP"
145+
contentsList.get(2),
146+
"user/hduser/gutenberg/4300.txt.utf-8",
147+
"2014-01-03T13:26:47.000Z",
148+
"33EE4519EA7DDAB27CA4E2742326D70B",
149+
1573150,
150+
"DEEP"
151151
);
152152
}
153153

@@ -168,28 +168,28 @@ private void assertContentsEquals(
168168
@Test
169169
public void putBucket() throws IOException, SignatureException {
170170
MockNetwork
171-
.expecting(HttpVerb.PUT, "/bucketName", null, null)
172-
.returning(200, "")
173-
.asClient()
174-
.putBucket(new PutBucketRequest("bucketName"));
171+
.expecting(HttpVerb.PUT, "/bucketName", null, null)
172+
.returning(200, "")
173+
.asClient()
174+
.putBucket(new PutBucketRequest("bucketName"));
175175
}
176176

177177
@Test
178178
public void deleteBucket() throws IOException, SignatureException {
179179
MockNetwork
180-
.expecting(HttpVerb.DELETE, "/bucketName", null, null)
181-
.returning(204, "")
182-
.asClient()
183-
.deleteBucket(new DeleteBucketRequest("bucketName"));
180+
.expecting(HttpVerb.DELETE, "/bucketName", null, null)
181+
.returning(204, "")
182+
.asClient()
183+
.deleteBucket(new DeleteBucketRequest("bucketName"));
184184
}
185185

186186
@Test
187187
public void deleteObject() throws IOException, SignatureException {
188188
MockNetwork
189-
.expecting(HttpVerb.DELETE, "/bucketName/my/file.txt", null, null)
190-
.returning(204, "")
191-
.asClient()
192-
.deleteObject(new DeleteObjectRequest("bucketName", "my/file.txt"));
189+
.expecting(HttpVerb.DELETE, "/bucketName/my/file.txt", null, null)
190+
.returning(204, "")
191+
.asClient()
192+
.deleteObject(new DeleteObjectRequest("bucketName", "my/file.txt"));
193193
}
194194

195195
@Test
@@ -200,30 +200,30 @@ public void multiObjectDelete() throws IOException, SignatureException {
200200
final String payload = "<Delete><Quiet>false</Quiet><Object><Key>sample1.txt</Key></Object><Object><Key>sample2.txt</Key></Object></Delete>";
201201

202202
final DeleteMultipleObjectsResponse response = MockNetwork
203-
.expecting(HttpVerb.POST, "/bucketName", queryParams, payload)
204-
.returning(200, "<DeleteResult>\n" +
205-
" <Deleted>\n" +
206-
" <Key>sample1.txt</Key>\n" +
207-
" </Deleted>\n" +
208-
" <Error>\n" +
209-
" <Key>sample2.txt</Key>\n" +
210-
" <Code>AccessDenied</Code>\n" +
211-
" <Message>Access Denied</Message>\n" +
212-
" </Error>\n" +
213-
"</DeleteResult>")
214-
.asClient()
215-
.deleteMultipleObjects(new DeleteMultipleObjectsRequest("bucketName", objsToDelete));
203+
.expecting(HttpVerb.POST, "/bucketName", queryParams, payload)
204+
.returning(200, "<DeleteResult>\n" +
205+
" <Deleted>\n" +
206+
" <Key>sample1.txt</Key>\n" +
207+
" </Deleted>\n" +
208+
" <Error>\n" +
209+
" <Key>sample2.txt</Key>\n" +
210+
" <Code>AccessDenied</Code>\n" +
211+
" <Message>Access Denied</Message>\n" +
212+
" </Error>\n" +
213+
"</DeleteResult>")
214+
.asClient()
215+
.deleteMultipleObjects(new DeleteMultipleObjectsRequest("bucketName", objsToDelete));
216216
assertThat(response.getResult().getDeletedList().size(), is(1));
217217
assertThat(response.getResult().getErrorList().size(), is(1));
218218
}
219219

220220
@Test(expected = FailedRequestException.class)
221221
public void getBadBucket() throws IOException, SignatureException {
222222
MockNetwork
223-
.expecting(HttpVerb.GET, "/remoteTest16", null, null)
224-
.returning(400, "")
225-
.asClient()
226-
.getBucket(new GetBucketRequest("remoteTest16"));
223+
.expecting(HttpVerb.GET, "/remoteTest16", null, null)
224+
.returning(400, "")
225+
.asClient()
226+
.getBucket(new GetBucketRequest("remoteTest16"));
227227
}
228228

229229
@Test
@@ -236,10 +236,10 @@ public void getObject() throws IOException, SignatureException {
236236
final ByteArraySeekableByteChannel resultChannel = new ByteArraySeekableByteChannel();
237237
final String stringResponse = "Response";
238238
MockNetwork
239-
.expecting(HttpVerb.GET, "/bucketName/object", queryParams, null)
240-
.returning(200, stringResponse)
241-
.asClient()
242-
.getObject(new GetObjectRequest("bucketName", "object", 0, UUID.fromString(jobIdString), resultChannel));
239+
.expecting(HttpVerb.GET, "/bucketName/object", queryParams, null)
240+
.returning(200, stringResponse)
241+
.asClient()
242+
.getObject(new GetObjectRequest("bucketName", "object", 0, UUID.fromString(jobIdString), resultChannel));
243243
assertThat(resultChannel.toString(), is(stringResponse));
244244
}
245245

@@ -255,10 +255,10 @@ public void putObject() throws IOException, SignatureException, URISyntaxExcepti
255255
final String output = new String(fileBytes, Charset.forName("UTF-8"));
256256
final FileChannel channel = FileChannel.open(resourceFile.toPath(), StandardOpenOption.READ);
257257
MockNetwork
258-
.expecting(HttpVerb.PUT, "/bucketName/objectName", queryParams, output)
259-
.returning(200, "")
260-
.asClient()
261-
.putObject(new PutObjectRequest("bucketName", "objectName", UUID.fromString(jobIdString), fileBytes.length, 0, channel));
258+
.expecting(HttpVerb.PUT, "/bucketName/objectName", queryParams, output)
259+
.returning(200, "")
260+
.asClient()
261+
.putObject(new PutObjectRequest("bucketName", "objectName", UUID.fromString(jobIdString), fileBytes.length, 0, channel));
262262
}
263263

264264
@Test
@@ -285,10 +285,10 @@ public void putObjectWithMetadata() throws IOException, SignatureException, URIS
285285
por.withMetaData("test2", "test2value");
286286
por.withMetaData("test2", "test2value2");
287287
MockNetwork
288-
.expecting(HttpVerb.PUT, "/bucketName/objectName", queryParams, expectedRequestHeaders, output)
289-
.returning(200, "")
290-
.asClient()
291-
.putObject(por);
288+
.expecting(HttpVerb.PUT, "/bucketName/objectName", queryParams, expectedRequestHeaders, output)
289+
.returning(200, "")
290+
.asClient()
291+
.putObject(por);
292292
}
293293

294294
@Test
@@ -340,9 +340,9 @@ public void runBulkTest(final BulkCommand command, final BulkTestDriver driver)
340340
queryParams.put("operation", command.toString());
341341

342342
final Ds3Client client = MockNetwork
343-
.expecting(HttpVerb.PUT, "/_rest_/bucket/bulkTest", queryParams, expectedXmlBody)
344-
.returning(200, xmlResponse)
345-
.asClient();
343+
.expecting(HttpVerb.PUT, "/_rest_/bucket/bulkTest", queryParams, expectedXmlBody)
344+
.returning(200, xmlResponse)
345+
.asClient();
346346

347347
final List<Objects> objectListList = driver.performRestCall(client, "bulkTest", objects).getObjects();
348348
assertThat(objectListList.size(), is(1));
@@ -496,34 +496,34 @@ public void getJobs() throws SignatureException, IOException {
496496
final List<JobInfo> jobs = response.getJobs();
497497
assertThat(jobs.size(), is(2));
498498
checkJob(
499-
jobs.get(0),
500-
"bucket_1",
501-
69880L,
502-
ChunkClientProcessingOrderGuarantee.IN_ORDER,
503-
0L,
504-
UUID.fromString("0807ff11-a9f6-4d55-bb92-b452c1bb00c7"),
505-
69880L,
506-
Priority.NORMAL,
507-
RequestType.PUT,
508-
"2014-09-04T17:23:45.000Z",
509-
UUID.fromString("a7d3eff9-e6d2-4e37-8a0b-84e76211a18a"),
510-
"spectra",
511-
WriteOptimization.PERFORMANCE
499+
jobs.get(0),
500+
"bucket_1",
501+
69880L,
502+
ChunkClientProcessingOrderGuarantee.IN_ORDER,
503+
0L,
504+
UUID.fromString("0807ff11-a9f6-4d55-bb92-b452c1bb00c7"),
505+
69880L,
506+
Priority.NORMAL,
507+
RequestType.PUT,
508+
"2014-09-04T17:23:45.000Z",
509+
UUID.fromString("a7d3eff9-e6d2-4e37-8a0b-84e76211a18a"),
510+
"spectra",
511+
WriteOptimization.PERFORMANCE
512512
);
513513
checkJob(
514-
jobs.get(1),
515-
"bucket_2",
516-
0L,
517-
ChunkClientProcessingOrderGuarantee.IN_ORDER,
518-
0L,
519-
UUID.fromString("c18554ba-e3a8-4905-91fd-3e6eec71bf45"),
520-
69880L,
521-
Priority.HIGH,
522-
RequestType.GET,
523-
"2014-09-04T17:24:04.000Z",
524-
UUID.fromString("a7d3eff9-e6d2-4e37-8a0b-84e76211a18a"),
525-
"spectra",
526-
WriteOptimization.CAPACITY
514+
jobs.get(1),
515+
"bucket_2",
516+
0L,
517+
ChunkClientProcessingOrderGuarantee.IN_ORDER,
518+
0L,
519+
UUID.fromString("c18554ba-e3a8-4905-91fd-3e6eec71bf45"),
520+
69880L,
521+
Priority.HIGH,
522+
RequestType.GET,
523+
"2014-09-04T17:24:04.000Z",
524+
UUID.fromString("a7d3eff9-e6d2-4e37-8a0b-84e76211a18a"),
525+
"spectra",
526+
WriteOptimization.CAPACITY
527527
);
528528
}
529529

@@ -636,32 +636,32 @@ public void cancelJob() throws SignatureException, IOException {
636636
@Test
637637
public void modifyJob() throws SignatureException, IOException {
638638
checkMasterObjectList(
639-
MockNetwork
640-
.expecting(HttpVerb.PUT, "/_rest_/job/1a85e743-ec8f-4789-afec-97e587a26936", null, null)
641-
.returning(200, MASTER_OBJECT_LIST_XML)
642-
.asClient()
643-
.modifyJob(new ModifyJobRequest(MASTER_OBJECT_LIST_JOB_ID))
644-
.getMasterObjectList()
639+
MockNetwork
640+
.expecting(HttpVerb.PUT, "/_rest_/job/1a85e743-ec8f-4789-afec-97e587a26936", null, null)
641+
.returning(200, MASTER_OBJECT_LIST_XML)
642+
.asClient()
643+
.modifyJob(new ModifyJobRequest(MASTER_OBJECT_LIST_JOB_ID))
644+
.getMasterObjectList()
645645
);
646646
}
647647

648648
@Test
649649
public void deleteTapeDrive() throws IOException, SignatureException {
650650
final DeleteTapeDriveResponse response = MockNetwork
651-
.expecting(HttpVerb.DELETE, "/_rest_/tape_drive/30a8dbf8-12e1-49dd-bede-0b4a7e1dd773", null, null)
652-
.returning(204, "")
653-
.asClient()
654-
.deleteTapeDrive(new DeleteTapeDriveRequest("30a8dbf8-12e1-49dd-bede-0b4a7e1dd773"));
651+
.expecting(HttpVerb.DELETE, "/_rest_/tape_drive/30a8dbf8-12e1-49dd-bede-0b4a7e1dd773", null, null)
652+
.returning(204, "")
653+
.asClient()
654+
.deleteTapeDrive(new DeleteTapeDriveRequest("30a8dbf8-12e1-49dd-bede-0b4a7e1dd773"));
655655
assertThat(response, notNullValue());
656656
}
657657

658658
@Test
659659
public void deleteTapePartition() throws IOException, SignatureException {
660660
final DeleteTapePartitionResponse response = MockNetwork
661-
.expecting(HttpVerb.DELETE, "/_rest_/tape_partition/30a8dbf8-12e1-49dd-bede-0b4a7e1dd773", null, null)
662-
.returning(204, "")
663-
.asClient()
664-
.deleteTapePartition(new DeleteTapePartitionRequest("30a8dbf8-12e1-49dd-bede-0b4a7e1dd773"));
661+
.expecting(HttpVerb.DELETE, "/_rest_/tape_partition/30a8dbf8-12e1-49dd-bede-0b4a7e1dd773", null, null)
662+
.returning(204, "")
663+
.asClient()
664+
.deleteTapePartition(new DeleteTapePartitionRequest("30a8dbf8-12e1-49dd-bede-0b4a7e1dd773"));
665665
assertThat(response, notNullValue());
666666
}
667667
@Test

0 commit comments

Comments
 (0)