Skip to content

Commit 816125b

Browse files
GraciesPadreGraciesPadre
authored
Merge pull request #486 from SpectraLogic/4_0_autogen
4 0 autogen
2 parents cd19bde + 945e18b commit 816125b

34 files changed

+665
-115
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
allprojects {
1717
group = 'com.spectralogic.ds3'
18-
version = '3.5.0'
18+
version = '4.0.0'
1919
}
2020

2121
subprojects {

‎contract/3_4_1_contract.xml‎ renamed to ‎contract/4_0_0_contract.xml‎

Lines changed: 170 additions & 15 deletions
Large diffs are not rendered by default.

‎ds3-sdk-integration/src/main/java/com/spectralogic/ds3client/integration/Util.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
import static org.hamcrest.CoreMatchers.is;
3939
import static org.junit.Assume.assumeThat;
40+
import static org.junit.Assume.assumeTrue;
4041

4142

4243
public class Util {
@@ -64,6 +65,12 @@ public static void assumeVersion1_2(final Ds3Client client) throws IOException {
6465
assumeThat(majorVersion, is(1));
6566
}
6667

68+
public static void assumeVersion4orHigher(final Ds3Client client) throws IOException {
69+
final int majorVersion = Integer.parseInt(client.getSystemInformationSpectraS3(
70+
new GetSystemInformationSpectraS3Request()).getSystemInformationResult().getBuildInformation().getVersion().split("\\.")[0]);
71+
assumeTrue(majorVersion >= 4);
72+
}
73+
6774
public static void loadBookTestData(final Ds3Client client, final String bucketName) throws IOException, URISyntaxException {
6875
LOG.info("Loading test data...");
6976
getLoadJob(client, bucketName, RESOURCE_BASE_NAME)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,22 @@ public void failedRequestGetBucket() {
123123

124124
@Test
125125
public void emptyGetObjects() throws IOException {
126-
emptyTest(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, "", 10, RETRIES, true));
126+
emptyTest(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, 10, RETRIES, true));
127127
}
128128

129129
@Test
130130
public void singlePageGetObjectsIterator() throws IOException, URISyntaxException {
131-
paginate(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, "", 10, RETRIES, true));
131+
paginate(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, 10, RETRIES, true));
132132
}
133133

134134
@Test
135135
public void failedGetObjectsWithFullDetails() throws IOException, URISyntaxException {
136-
testFailedRequest(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, "", 10, RETRIES, true));
136+
testFailedRequest(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, 10, RETRIES, true));
137137
}
138138

139139
@Test
140140
public void multiPageGetObjectsWithFullDetails() throws IOException, URISyntaxException {
141-
paginate(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, "", 2, RETRIES, true));
141+
paginate(new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, 2, RETRIES, true));
142142
}
143143

144144
private void emptyTest(final LazyIterable.LazyLoaderFactory<?> lazyLoaderFactory) throws IOException {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ public void getObjects() throws IOException, URISyntaxException {
146146
assertThat(response.getS3ObjectListResult().getS3Objects().size(), is(4));
147147
assertTrue(s3ObjectExists(response.getS3ObjectListResult().getS3Objects(), "beowulf.txt"));
148148

149-
assertThat(response.getPagingTruncated(), is(nullValue()));
150-
assertThat(response.getPagingTotalResultCount(), is(nullValue()));
149+
assertThat(response.getPagingTruncated(), is(0));
150+
assertThat(response.getPagingTotalResultCount(), is(4));
151151
} finally {
152152
deleteAllContents(client,bucketName);
153153
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import java.util.UUID;
4040

4141
import static com.spectralogic.ds3client.integration.Util.deleteAllContents;
42-
import static com.spectralogic.ds3client.integration.Util.insecureFromEnv;
4342
import static junit.framework.TestCase.assertFalse;
4443
import static org.junit.Assert.assertTrue;
4544

@@ -79,7 +78,7 @@ public void basicPagination() throws IOException {
7978
final int numObjects = 55;
8079
CLIENT.putBulkJobSpectraS3(new PutBulkJobSpectraS3Request(TEST_ENV_NAME, createTestList(numObjects)));
8180

82-
final GetObjectsFullDetailsLoaderFactory loaderFactory = new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, "", 10, RETRIES, false);
81+
final GetObjectsFullDetailsLoaderFactory loaderFactory = new GetObjectsFullDetailsLoaderFactory(CLIENT, TEST_ENV_NAME, 10, RETRIES, false);
8382

8483
final Set<String> foundItems = new HashSet<>();
8584

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

Lines changed: 68 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
import java.security.SignatureException;
3434
import java.util.UUID;
3535

36+
import static com.spectralogic.ds3client.integration.Util.assumeVersion4orHigher;
3637
import static com.spectralogic.ds3client.integration.Util.deleteAllContents;
38+
import static com.spectralogic.ds3client.integration.test.helpers.TempStorageUtil.DEFAULT_USER;
3739
import static org.hamcrest.Matchers.is;
3840
import static org.hamcrest.Matchers.notNullValue;
3941
import static org.junit.Assert.assertThat;
@@ -75,7 +77,7 @@ private static void setupBucket(final UUID dataPolicy) {
7577
try {
7678
HELPERS.ensureBucketExists(BUCKET_NAME, dataPolicy);
7779
spectraUUID = client.getUserSpectraS3(
78-
new GetUserSpectraS3Request("spectra")).getSpectraUserResult().getId();
80+
new GetUserSpectraS3Request(DEFAULT_USER)).getSpectraUserResult().getId();
7981
administratorsUUID = client.getGroupSpectraS3(
8082
new GetGroupSpectraS3Request("Administrators")).getGroupResult().getId();
8183
} catch (final Exception e) {
@@ -89,16 +91,16 @@ public void getUserWithUUID() throws IOException, SignatureException {
8991
final GetUserSpectraS3Response getSpectraResponse = client
9092
.getUserSpectraS3(new GetUserSpectraS3Request(spectraUUID));
9193

92-
assertThat(getSpectraResponse.getSpectraUserResult().getName(), is("spectra"));
94+
assertThat(getSpectraResponse.getSpectraUserResult().getName(), is(DEFAULT_USER));
9395
}
9496

9597
@Test
9698
public void getUserWithString() throws IOException, SignatureException {
9799

98100
final GetUserSpectraS3Response getSpectraResponse = client
99-
.getUserSpectraS3(new GetUserSpectraS3Request("spectra"));
101+
.getUserSpectraS3(new GetUserSpectraS3Request(DEFAULT_USER));
100102

101-
assertThat(getSpectraResponse.getSpectraUserResult().getName(), is("spectra"));
103+
assertThat(getSpectraResponse.getSpectraUserResult().getName(), is(DEFAULT_USER));
102104
}
103105

104106
@Test
@@ -114,7 +116,7 @@ public void getUsers() throws IOException, SignatureException {
114116
public void getUsersWithName() throws IOException, SignatureException {
115117

116118
final GetUsersSpectraS3Response getUsersResponse = client.getUsersSpectraS3(
117-
new GetUsersSpectraS3Request().withName("spectra"));
119+
new GetUsersSpectraS3Request().withName(DEFAULT_USER));
118120

119121
assertThat(getUsersResponse.getSpectraUserListResult(), is(notNullValue()));
120122
}
@@ -179,6 +181,9 @@ public void ModifyUserDefaultDataPolicy() throws IOException, SignatureException
179181

180182
final GetUserSpectraS3Response getSpectraResponse = client
181183
.getUserSpectraS3(new GetUserSpectraS3Request(spectraUUID));
184+
185+
assertThat(getSpectraResponse.getSpectraUserResult(), is(notNullValue()));
186+
182187
final ModifyUserSpectraS3Response modifyUserSpectraS3Response = client
183188
.modifyUserSpectraS3(new ModifyUserSpectraS3Request(spectraUUID)
184189
.withDefaultDataPolicyId(dataPolicyId));
@@ -339,7 +344,7 @@ public void getGroupsWithPageStartMarker() throws IOException, SignatureExceptio
339344
.withPageStartMarker(UUID.randomUUID()));
340345
fail("The above should not be found and throw exception.");
341346
} catch (final FailedRequestException e) {
342-
assertThat(e.getStatusCode(), is(410));
347+
assertThat(e.getStatusCode(), is(404));
343348
}
344349
}
345350

@@ -467,7 +472,7 @@ public void getUserGroupMembersWithMemberUserIDString() throws IOException, Sign
467472

468473
final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
469474
.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
470-
.withMemberUserId("spectra"));
475+
.withMemberUserId(DEFAULT_USER));
471476

472477
assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
473478
}
@@ -545,22 +550,30 @@ public void getGroupGroupMembersWithLastPage() throws IOException, SignatureExce
545550

546551
@Test
547552
public void getGroupGroupMembersWithPageStartMarkerUUID() throws IOException, SignatureException {
553+
assumeVersion4orHigher(client);
548554

549-
final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
550-
.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
551-
.withPageStartMarker(UUID.randomUUID()));
555+
try {
556+
client.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
557+
.withPageStartMarker(UUID.randomUUID()));
558+
fail("The above should not be found and throw exception.");
552559

553-
assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
560+
} catch (final FailedRequestException e) {
561+
assertThat(e.getStatusCode(), is(404));
562+
}
554563
}
555564

556565
@Test
557566
public void getGroupGroupMembersWithPageStartMarkerString() throws IOException, SignatureException {
567+
assumeVersion4orHigher(client);
558568

559-
final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
560-
.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
561-
.withPageStartMarker(UUID.randomUUID().toString()));
569+
try {
570+
client.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
571+
.withPageStartMarker(UUID.randomUUID().toString()));
572+
fail("The above should not be found and throw exception.");
562573

563-
assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
574+
} catch (final FailedRequestException e) {
575+
assertThat(e.getStatusCode(), is(404));
576+
}
564577
}
565578

566579
@Test
@@ -612,7 +625,7 @@ public void putUserGroupMember() throws IOException, SignatureException {
612625
new PutGroupSpectraS3Request("test_group"));
613626

614627
putUserGroupMemberSpectraS3Response = client
615-
.putUserGroupMemberSpectraS3(new PutUserGroupMemberSpectraS3Request("test_group", "spectra"));
628+
.putUserGroupMemberSpectraS3(new PutUserGroupMemberSpectraS3Request("test_group", DEFAULT_USER));
616629

617630
assertThat(putUserGroupMemberSpectraS3Response.getGroupMemberResult(), is(notNullValue()));
618631

@@ -688,7 +701,7 @@ public void putGlobalBucketAclForUserString() throws IOException, SignatureExcep
688701
try {
689702
putGlobalBucketAclForUserSpectraS3Response = client.putGlobalBucketAclForUserSpectraS3(
690703
new PutGlobalBucketAclForUserSpectraS3Request(BucketAclPermission.DELETE,
691-
"spectra"));
704+
DEFAULT_USER));
692705

693706
assertThat(putGlobalBucketAclForUserSpectraS3Response.getBucketAclResult(), is(notNullValue()));
694707

@@ -789,7 +802,7 @@ public void getBucketAclsWithUserUUID() throws IOException, SignatureException {
789802
@Test
790803
public void getBucketAclsWithUserIDString() throws IOException, SignatureException {
791804
final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
792-
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request().withUserId("spectra"));
805+
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request().withUserId(DEFAULT_USER));
793806

794807
assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
795808
}
@@ -850,20 +863,29 @@ public void getBucketAclsWithLastPage() throws IOException, SignatureException {
850863

851864
@Test
852865
public void getBucketAclsWithPageStartMarkerUUID() throws IOException, SignatureException {
853-
final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
854-
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
855-
.withPageStartMarker(UUID.randomUUID()));
866+
assumeVersion4orHigher(client);
856867

857-
assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
868+
try {
869+
client.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
870+
.withPageStartMarker(UUID.randomUUID()));
871+
fail("The above should not be found and throw exception.");
872+
873+
} catch (final FailedRequestException e) {
874+
assertThat(e.getStatusCode(), is(404));
875+
}
858876
}
859877

860878
@Test
861879
public void getBucketAclsWithPageStartMarkerString() throws IOException, SignatureException {
862-
final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
863-
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
864-
.withPageStartMarker(UUID.randomUUID().toString()));
880+
assumeVersion4orHigher(client);
865881

866-
assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
882+
try {
883+
client.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
884+
.withPageStartMarker(UUID.randomUUID().toString()));
885+
fail("The above should not be found and throw exception.");
886+
} catch (final FailedRequestException e) {
887+
assertThat(e.getStatusCode(), is(404));
888+
}
867889
}
868890

869891
@Test
@@ -912,7 +934,7 @@ public void putGlobalDataPolicyAclForUserString() throws IOException, SignatureE
912934
PutGlobalDataPolicyAclForUserSpectraS3Response putGlobalDataPolicyAclForUserSpectraS3Response = null;
913935
try {
914936
putGlobalDataPolicyAclForUserSpectraS3Response = client.putGlobalDataPolicyAclForUserSpectraS3(
915-
new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
937+
new PutGlobalDataPolicyAclForUserSpectraS3Request(DEFAULT_USER));
916938

917939
assertThat(putGlobalDataPolicyAclForUserSpectraS3Response.getDataPolicyAclResult(), is(notNullValue()));
918940

@@ -971,7 +993,7 @@ public void deleteDataPolicyAcl() throws IOException, SignatureException {
971993
= null;
972994
try {
973995
putGlobalDataPolicyAclForUserSpectraS3Response = client.putGlobalDataPolicyAclForUserSpectraS3(
974-
new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
996+
new PutGlobalDataPolicyAclForUserSpectraS3Request(DEFAULT_USER));
975997

976998
final DeleteDataPolicyAclSpectraS3Response deleteDataPolicyAclSpectraS3Response = client
977999
.deleteDataPolicyAclSpectraS3(new DeleteDataPolicyAclSpectraS3Request(
@@ -998,7 +1020,7 @@ public void getDataPolicyAcl() throws IOException, SignatureException {
9981020
try {
9991021
putGlobalDataPolicyAclForUserSpectraS3Response = client
10001022
.putGlobalDataPolicyAclForUserSpectraS3(
1001-
new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
1023+
new PutGlobalDataPolicyAclForUserSpectraS3Request(DEFAULT_USER));
10021024

10031025
final GetDataPolicyAclSpectraS3Response getDataPolicyAclSpectraS3Response = client
10041026
.getDataPolicyAclSpectraS3(new GetDataPolicyAclSpectraS3Request(
@@ -1114,7 +1136,7 @@ public void getDataPolicyAclsWithUserString() throws IOException, SignatureExcep
11141136

11151137
final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
11161138
.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1117-
.withUserId("spectra"));
1139+
.withUserId(DEFAULT_USER));
11181140

11191141
assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
11201142
}
@@ -1181,22 +1203,28 @@ public void getDataPolicyAclsWithPageLength() throws IOException, SignatureExcep
11811203

11821204
@Test
11831205
public void getDataPolicyAclsWithPageStartMarkerString() throws IOException, SignatureException {
1206+
assumeVersion4orHigher(client);
11841207

1185-
final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
1186-
.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1187-
.withPageStartMarker(UUID.randomUUID().toString()));
1188-
1189-
assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
1208+
try {
1209+
client.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1210+
.withPageStartMarker(UUID.randomUUID().toString()));
1211+
fail("The above should not be found and throw exception.");
1212+
} catch (final FailedRequestException e) {
1213+
assertThat(e.getStatusCode(), is(404));
1214+
}
11901215
}
11911216

11921217
@Test
11931218
public void getDataPolicyAclsWithPageStartMarkerUUID() throws IOException, SignatureException {
1219+
assumeVersion4orHigher(client);
11941220

1195-
final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
1196-
.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1197-
.withPageStartMarker(UUID.randomUUID()));
1198-
1199-
assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
1221+
try {
1222+
client.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1223+
.withPageStartMarker(UUID.randomUUID()));
1224+
fail("The above should not be found and throw exception.");
1225+
} catch (final FailedRequestException e) {
1226+
assertThat(e.getStatusCode(), is(404));
1227+
}
12001228
}
12011229

12021230
@Test

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/test/helpers/TempStorageUtil.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class TempStorageUtil {
3636
private static final String STORAGE_DOMAIN_NAME = "_sd";
3737
private static final String POOL_PARTITION_NAME = "_pp";
3838

39+
public static final String DEFAULT_USER = "Administrator";
40+
3941
/**
4042
* Sets up a temporary data policy with a temporary storage domain and partition
4143
* for use in integration tests where the user may not currently have access to
@@ -102,7 +104,7 @@ public static UUID setupDataPolicy(
102104
new PutDataPolicySpectraS3Request(testSetName + DATA_POLICY_NAME)
103105
.withEndToEndCrcRequired(withEndToEndCrcRequired)
104106
.withChecksumType(checksumType).withAlwaysForcePutJobCreation(true));
105-
client.modifyUserSpectraS3(new ModifyUserSpectraS3Request("spectra")
107+
client.modifyUserSpectraS3(new ModifyUserSpectraS3Request(DEFAULT_USER)
106108
.withDefaultDataPolicyId(dataPolicyResponse.getDataPolicyResult().getId()));
107109
return dataPolicyResponse.getDataPolicyResult().getId();
108110
}

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3Client.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,13 @@ ClearAllCanceledJobsSpectraS3Response clearAllCanceledJobsSpectraS3(final ClearA
766766
ClearAllCompletedJobsSpectraS3Response clearAllCompletedJobsSpectraS3(final ClearAllCompletedJobsSpectraS3Request request)
767767
throws IOException;
768768

769+
@ResponsePayloadModel("MasterObjectList")
770+
@Action("MODIFY")
771+
@Resource("JOB")
772+
773+
CloseAggregatingJobSpectraS3Response closeAggregatingJobSpectraS3(final CloseAggregatingJobSpectraS3Request request)
774+
throws IOException;
775+
769776
@ResponsePayloadModel("MasterObjectList")
770777
@Action("MODIFY")
771778
@Resource("BUCKET")
@@ -2000,6 +2007,13 @@ InspectTapeSpectraS3Response inspectTapeSpectraS3(final InspectTapeSpectraS3Requ
20002007
ModifyAllTapePartitionsSpectraS3Response modifyAllTapePartitionsSpectraS3(final ModifyAllTapePartitionsSpectraS3Request request)
20012008
throws IOException;
20022009

2010+
@ResponsePayloadModel("TapeDrive")
2011+
@Action("MODIFY")
2012+
@Resource("TAPE_DRIVE")
2013+
2014+
ModifyTapeDriveSpectraS3Response modifyTapeDriveSpectraS3(final ModifyTapeDriveSpectraS3Request request)
2015+
throws IOException;
2016+
20032017
@ResponsePayloadModel("TapePartition")
20042018
@Action("MODIFY")
20052019
@Resource("TAPE_PARTITION")

0 commit comments

Comments
 (0)