Skip to content

Commit 4f28459

Browse files
tomdesairtomdesair
committed
Fix Checkstyle issues
1 parent aeb3161 commit 4f28459

File tree

6 files changed

+127
-99
lines changed

6 files changed

+127
-99
lines changed

‎src/test/java/me/desair/tus/server/checksum/ChecksumPatchRequestHandlerTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.Before;
2020
import org.junit.Test;
2121
import org.junit.runner.RunWith;
22-
import org.mockito.Matchers;
22+
import org.mockito.ArgumentMatchers;
2323
import org.mockito.Mock;
2424
import org.mockito.junit.MockitoJUnitRunner;
2525

@@ -59,7 +59,8 @@ public void supports() throws Exception {
5959
@Test
6060
public void testValidHeaderAndChecksum() throws Exception {
6161
when(servletRequest.getHeader(HttpHeader.UPLOAD_CHECKSUM)).thenReturn("sha1 1234567890");
62-
when(servletRequest.getCalculatedChecksum(Matchers.any(ChecksumAlgorithm.class))).thenReturn("1234567890");
62+
when(servletRequest.getCalculatedChecksum(ArgumentMatchers.any(ChecksumAlgorithm.class)))
63+
.thenReturn("1234567890");
6364
when(servletRequest.hasCalculatedChecksum()).thenReturn(true);
6465

6566
handler.process(HttpMethod.PATCH, servletRequest, null, uploadStorageService, null);
@@ -70,7 +71,8 @@ public void testValidHeaderAndChecksum() throws Exception {
7071
@Test(expected = UploadChecksumMismatchException.class)
7172
public void testValidHeaderAndInvalidChecksum() throws Exception {
7273
when(servletRequest.getHeader(HttpHeader.UPLOAD_CHECKSUM)).thenReturn("sha1 1234567890");
73-
when(servletRequest.getCalculatedChecksum(Matchers.any(ChecksumAlgorithm.class))).thenReturn("0123456789");
74+
when(servletRequest.getCalculatedChecksum(ArgumentMatchers.any(ChecksumAlgorithm.class)))
75+
.thenReturn("0123456789");
7476
when(servletRequest.hasCalculatedChecksum()).thenReturn(true);
7577

7678
handler.process(HttpMethod.PATCH, servletRequest, null, uploadStorageService, null);

‎src/test/java/me/desair/tus/server/concatenation/ConcatenationHeadRequestHandlerTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public void testRegularUpload() throws Exception {
7070
info1.setUploadConcatHeaderValue("Impossible");
7171
info1.setUploadType(UploadType.REGULAR);
7272

73-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
73+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
74+
nullable(String.class))).thenReturn(info1);
7475
servletRequest.setRequestURI(info1.getId().toString());
7576

7677
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -86,7 +87,8 @@ public void testPartialUpload() throws Exception {
8687
info1.setUploadConcatHeaderValue("partial");
8788
info1.setUploadType(UploadType.PARTIAL);
8889

89-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
90+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
91+
nullable(String.class))).thenReturn(info1);
9092
servletRequest.setRequestURI(info1.getId().toString());
9193

9294
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -104,7 +106,8 @@ public void testConcatenatedUploadWithLength() throws Exception {
104106
info1.setOffset(10L);
105107
info1.setUploadType(UploadType.CONCATENATED);
106108

107-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
109+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
110+
nullable(String.class))).thenReturn(info1);
108111
servletRequest.setRequestURI(info1.getId().toString());
109112

110113
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -126,7 +129,8 @@ public void testConcatenatedUploadWithoutLength() throws Exception {
126129
info1.setOffset(8L);
127130
info1.setUploadType(UploadType.CONCATENATED);
128131

129-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
132+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
133+
nullable(String.class))).thenReturn(info1);
130134
servletRequest.setRequestURI(info1.getId().toString());
131135

132136
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),

‎src/test/java/me/desair/tus/server/concatenation/ConcatenationPostRequestHandlerTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public void testRegularUpload() throws Exception {
7171
UploadInfo info1 = new UploadInfo();
7272
info1.setId(UUID.randomUUID());
7373

74-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
74+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
75+
nullable(String.class))).thenReturn(info1);
7576
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
7677

7778
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest), response, uploadStorageService, null);
@@ -90,7 +91,8 @@ public void testPartialUpload() throws Exception {
9091
UploadInfo info1 = new UploadInfo();
9192
info1.setId(UUID.randomUUID());
9293

93-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
94+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
95+
nullable(String.class))).thenReturn(info1);
9496
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
9597
servletRequest.addHeader(HttpHeader.UPLOAD_CONCAT, "partial");
9698

@@ -110,7 +112,8 @@ public void testFinalUpload() throws Exception {
110112
UploadInfo info1 = new UploadInfo();
111113
info1.setId(UUID.randomUUID());
112114

113-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
115+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
116+
nullable(String.class))).thenReturn(info1);
114117
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
115118
servletRequest.addHeader(HttpHeader.UPLOAD_CONCAT, "final; 123 456");
116119

‎src/test/java/me/desair/tus/server/concatenation/validation/PatchFinalUploadValidatorTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@ public void testValid() throws Exception {
6363
info3.setId(UUID.randomUUID());
6464
info3.setUploadType(null);
6565

66-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
67-
when(uploadStorageService.getUploadInfo(eq(info2.getId().toString()), nullable(String.class))).thenReturn(info2);
68-
when(uploadStorageService.getUploadInfo(eq(info3.getId().toString()), nullable(String.class))).thenReturn(info3);
66+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
67+
nullable(String.class))).thenReturn(info1);
68+
when(uploadStorageService.getUploadInfo(eq(info2.getId().toString()),
69+
nullable(String.class))).thenReturn(info2);
70+
when(uploadStorageService.getUploadInfo(eq(info3.getId().toString()),
71+
nullable(String.class))).thenReturn(info3);
6972

7073
//When we validate the requests
7174
try {
@@ -101,7 +104,8 @@ public void testInvalidFinal() throws Exception {
101104
info1.setId(UUID.randomUUID());
102105
info1.setUploadType(UploadType.CONCATENATED);
103106

104-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
107+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()),
108+
nullable(String.class))).thenReturn(info1);
105109

106110
//When we validate the request
107111
servletRequest.setRequestURI(info1.getId().toString());

‎src/test/java/me/desair/tus/server/creation/CreationPostRequestHandlerTest.java‎

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.junit.Before;
2323
import org.junit.Test;
2424
import org.junit.runner.RunWith;
25-
import org.mockito.Matchers;
25+
import org.mockito.ArgumentMatchers;
2626
import org.mockito.Mock;
2727
import org.mockito.invocation.InvocationOnMock;
2828
import org.mockito.junit.MockitoJUnitRunner;
@@ -72,23 +72,25 @@ public void processWithLengthAndMetadata() throws Exception {
7272
servletRequest.addHeader(HttpHeader.UPLOAD_METADATA, "encoded-metadata");
7373

7474
final UUID id = UUID.randomUUID();
75-
when(uploadStorageService.create(Matchers.any(UploadInfo.class), nullable(String.class))).then(new Answer<UploadInfo>() {
76-
@Override
77-
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
78-
UploadInfo upload = invocation.getArgument(0);
79-
assertThat(upload.getLength(), is(10L));
80-
assertThat(upload.getEncodedMetadata(), is("encoded-metadata"));
75+
when(uploadStorageService.create(ArgumentMatchers.any(UploadInfo.class), nullable(String.class))).then(
76+
new Answer<UploadInfo>() {
77+
@Override
78+
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
79+
UploadInfo upload = invocation.getArgument(0);
80+
assertThat(upload.getLength(), is(10L));
81+
assertThat(upload.getEncodedMetadata(), is("encoded-metadata"));
8182

82-
upload.setId(id);
83+
upload.setId(id);
8384

84-
return upload;
85-
}
86-
});
85+
return upload;
86+
}
87+
});
8788

8889
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest),
8990
new TusServletResponse(servletResponse), uploadStorageService, null);
9091

91-
verify(uploadStorageService, times(1)).create(Matchers.any(UploadInfo.class), nullable(String.class));
92+
verify(uploadStorageService, times(1)).create(ArgumentMatchers.any(UploadInfo.class),
93+
nullable(String.class));
9294
assertThat(servletResponse.getHeader(HttpHeader.LOCATION), endsWith("/test/upload/" + id.toString()));
9395
assertThat(servletResponse.getStatus(), is(HttpServletResponse.SC_CREATED));
9496
}
@@ -100,23 +102,25 @@ public void processWithLengthAndNoMetadata() throws Exception {
100102
//servletRequest.addHeader(HttpHeader.UPLOAD_METADATA, null);
101103

102104
final UUID id = UUID.randomUUID();
103-
when(uploadStorageService.create(Matchers.any(UploadInfo.class), nullable(String.class))).then(new Answer<UploadInfo>() {
104-
@Override
105-
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
106-
UploadInfo upload = invocation.getArgument(0);
107-
assertThat(upload.getLength(), is(10L));
108-
assertThat(upload.getEncodedMetadata(), is(nullValue()));
105+
when(uploadStorageService.create(ArgumentMatchers.any(UploadInfo.class), nullable(String.class))).then(
106+
new Answer<UploadInfo>() {
107+
@Override
108+
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
109+
UploadInfo upload = invocation.getArgument(0);
110+
assertThat(upload.getLength(), is(10L));
111+
assertThat(upload.getEncodedMetadata(), is(nullValue()));
109112

110-
upload.setId(id);
113+
upload.setId(id);
111114

112-
return upload;
113-
}
114-
});
115+
return upload;
116+
}
117+
});
115118

116119
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest),
117120
new TusServletResponse(servletResponse), uploadStorageService, null);
118121

119-
verify(uploadStorageService, times(1)).create(Matchers.any(UploadInfo.class), nullable(String.class));
122+
verify(uploadStorageService, times(1)).create(ArgumentMatchers.any(UploadInfo.class),
123+
nullable(String.class));
120124
assertThat(servletResponse.getHeader(HttpHeader.LOCATION), endsWith("/test/upload/" + id.toString()));
121125
assertThat(servletResponse.getStatus(), is(HttpServletResponse.SC_CREATED));
122126
}
@@ -128,23 +132,25 @@ public void processWithNoLengthAndMetadata() throws Exception {
128132
servletRequest.addHeader(HttpHeader.UPLOAD_METADATA, "encoded-metadata");
129133

130134
final UUID id = UUID.randomUUID();
131-
when(uploadStorageService.create(Matchers.any(UploadInfo.class), nullable(String.class))).then(new Answer<UploadInfo>() {
132-
@Override
133-
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
134-
UploadInfo upload = invocation.getArgument(0);
135-
assertThat(upload.getLength(), is(nullValue()));
136-
assertThat(upload.getEncodedMetadata(), is("encoded-metadata"));
135+
when(uploadStorageService.create(ArgumentMatchers.any(UploadInfo.class), nullable(String.class))).then(
136+
new Answer<UploadInfo>() {
137+
@Override
138+
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
139+
UploadInfo upload = invocation.getArgument(0);
140+
assertThat(upload.getLength(), is(nullValue()));
141+
assertThat(upload.getEncodedMetadata(), is("encoded-metadata"));
137142

138-
upload.setId(id);
143+
upload.setId(id);
139144

140-
return upload;
141-
}
142-
});
145+
return upload;
146+
}
147+
});
143148

144149
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest),
145150
new TusServletResponse(servletResponse), uploadStorageService, null);
146151

147-
verify(uploadStorageService, times(1)).create(Matchers.any(UploadInfo.class), nullable(String.class));
152+
verify(uploadStorageService, times(1)).create(ArgumentMatchers.any(UploadInfo.class),
153+
nullable(String.class));
148154
assertThat(servletResponse.getHeader(HttpHeader.LOCATION), endsWith("/test/upload/" + id.toString()));
149155
assertThat(servletResponse.getStatus(), is(HttpServletResponse.SC_CREATED));
150156
}
@@ -156,23 +162,25 @@ public void processWithNoLengthAndNoMetadata() throws Exception {
156162
//servletRequest.addHeader(HttpHeader.UPLOAD_METADATA, null);
157163

158164
final UUID id = UUID.randomUUID();
159-
when(uploadStorageService.create(Matchers.any(UploadInfo.class), nullable(String.class))).then(new Answer<UploadInfo>() {
160-
@Override
161-
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
162-
UploadInfo upload = invocation.getArgument(0);
163-
assertThat(upload.getLength(), is(nullValue()));
164-
assertThat(upload.getEncodedMetadata(), is(nullValue()));
165+
when(uploadStorageService.create(ArgumentMatchers.any(UploadInfo.class), nullable(String.class))).then(
166+
new Answer<UploadInfo>() {
167+
@Override
168+
public UploadInfo answer(InvocationOnMock invocation) throws Throwable {
169+
UploadInfo upload = invocation.getArgument(0);
170+
assertThat(upload.getLength(), is(nullValue()));
171+
assertThat(upload.getEncodedMetadata(), is(nullValue()));
165172

166-
upload.setId(id);
173+
upload.setId(id);
167174

168-
return upload;
169-
}
170-
});
175+
return upload;
176+
}
177+
});
171178

172179
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest),
173180
new TusServletResponse(servletResponse), uploadStorageService, null);
174181

175-
verify(uploadStorageService, times(1)).create(Matchers.any(UploadInfo.class), nullable(String.class));
182+
verify(uploadStorageService, times(1)).create(ArgumentMatchers.any(UploadInfo.class),
183+
nullable(String.class));
176184
assertThat(servletResponse.getHeader(HttpHeader.LOCATION), endsWith("/test/upload/" + id.toString()));
177185
assertThat(servletResponse.getStatus(), is(HttpServletResponse.SC_CREATED));
178186
}

0 commit comments

Comments
 (0)