Skip to content

Commit ba7023f

Browse files
ralscharalscha
committed
format
1 parent b969911 commit ba7023f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+813
-403
lines changed

‎src/main/java/ch/ralscha/extdirectspring/bean/EdFormPostResult.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ public static EdFormPostResult create(BindingResult bindingResult) {
6060
}
6161

6262
public static EdFormPostResult create(BindingResult bindingResult, boolean success) {
63-
return ImmutableEdFormPostResult.builder().addErrors(null, null, bindingResult)
64-
.putResult(SUCCESS_PROPERTY, success).build();
63+
return ImmutableEdFormPostResult.builder()
64+
.addErrors(null, null, bindingResult)
65+
.putResult(SUCCESS_PROPERTY, success)
66+
.build();
6567
}
6668

6769
public static EdFormPostResult create(Locale locale, MessageSource messageSource, BindingResult bindingResult) {

‎src/main/java/ch/ralscha/extdirectspring/bean/ExtDirectResponseBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public void buildAndWrite() {
223223

224224
try {
225225
RouterController routerController = RequestContextUtils.findWebApplicationContext(this.request)
226-
.getBean(RouterController.class);
226+
.getBean(RouterController.class);
227227

228228
routerController.writeJsonResponse(this.request, this.response, this.extDirectResponse, this.jsonView);
229229

‎src/main/java/ch/ralscha/extdirectspring/controller/RouterController.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public void poll(@PathVariable("beanName") String beanName, @PathVariable("metho
120120

121121
try {
122122

123-
Object[] parameters = this.configurationService.getParametersResolver().prepareParameters(request,
124-
response, locale, methodInfo);
123+
Object[] parameters = this.configurationService.getParametersResolver()
124+
.prepareParameters(request, response, locale, methodInfo);
125125

126126
if (this.configurationService.getConfiguration().isSynchronizeOnSession()
127127
|| methodInfo.isSynchronizeOnSession()) {
@@ -230,7 +230,7 @@ else if (methodInfo != null && methodInfo.getHandlerMethod() != null) {
230230
Map<String, Object> model = modelAndView.getModel();
231231
if (model.containsKey("extDirectFormPostResult")) {
232232
ExtDirectFormPostResult formPostResult = (ExtDirectFormPostResult) model
233-
.get("extDirectFormPostResult");
233+
.get("extDirectFormPostResult");
234234
directResponse.setResult(formPostResult.getResult());
235235
directResponse.setJsonView(getJsonView(formPostResult, methodInfo.getJsonView()));
236236
}
@@ -260,8 +260,8 @@ else if (model.containsKey("edFormPostResult")) {
260260
consumes = MediaType.APPLICATION_JSON_VALUE)
261261
public void router(HttpServletRequest request, HttpServletResponse response, Locale locale) throws IOException {
262262

263-
Object requestData = this.configurationService.getJsonHandler().readValue(request.getInputStream(),
264-
Object.class);
263+
Object requestData = this.configurationService.getJsonHandler()
264+
.readValue(request.getInputStream(), Object.class);
265265

266266
List<ExtDirectRequest> directRequests = null;
267267
if (requestData instanceof Map) {
@@ -271,8 +271,8 @@ public void router(HttpServletRequest request, HttpServletResponse response, Loc
271271
else if (requestData instanceof List) {
272272
directRequests = new ArrayList<>();
273273
for (Object oneRequest : (List<?>) requestData) {
274-
directRequests.add(
275-
this.configurationService.getJsonHandler().convertValue(oneRequest, ExtDirectRequest.class));
274+
directRequests
275+
.add(this.configurationService.getJsonHandler().convertValue(oneRequest, ExtDirectRequest.class));
276276
}
277277
}
278278

@@ -281,11 +281,11 @@ else if (requestData instanceof List) {
281281
handleMethodCallOne(directRequests.get(0), request, response, locale);
282282
}
283283
else if (this.configurationService.getConfiguration()
284-
.getBatchedMethodsExecutionPolicy() == BatchedMethodsExecutionPolicy.SEQUENTIAL) {
284+
.getBatchedMethodsExecutionPolicy() == BatchedMethodsExecutionPolicy.SEQUENTIAL) {
285285
handleMethodCallsSequential(directRequests, request, response, locale);
286286
}
287287
else if (this.configurationService.getConfiguration()
288-
.getBatchedMethodsExecutionPolicy() == BatchedMethodsExecutionPolicy.CONCURRENT) {
288+
.getBatchedMethodsExecutionPolicy() == BatchedMethodsExecutionPolicy.CONCURRENT) {
289289
handleMethodCallsConcurrent(directRequests, request, response, locale);
290290
}
291291
}
@@ -298,8 +298,8 @@ private void handleMethodCallsConcurrent(List<ExtDirectRequest> directRequests,
298298
List<Future<ExtDirectResponse>> futures = new ArrayList<>(directRequests.size());
299299
for (ExtDirectRequest directRequest : directRequests) {
300300
Callable<ExtDirectResponse> callable = createMethodCallCallable(directRequest, request, response, locale);
301-
futures.add(
302-
this.configurationService.getConfiguration().getBatchedMethodsExecutorService().submit(callable));
301+
futures
302+
.add(this.configurationService.getConfiguration().getBatchedMethodsExecutorService().submit(callable));
303303
}
304304

305305
ObjectMapper objectMapper = this.configurationService.getJsonHandler().getMapper();
@@ -315,7 +315,7 @@ private void handleMethodCallsConcurrent(List<ExtDirectRequest> directRequests,
315315
}
316316
else {
317317
String jsonResult = objectMapper.writerWithView(jsonView)
318-
.writeValueAsString(directResponse.getResult());
318+
.writeValueAsString(directResponse.getResult());
319319
directResponses.add(new ExtDirectResponseRaw(directResponse, jsonResult));
320320
}
321321
}
@@ -371,7 +371,7 @@ private void handleMethodCallsSequential(List<ExtDirectRequest> directRequests,
371371
}
372372
else {
373373
String jsonResult = objectMapper.writerWithView(jsonView)
374-
.writeValueAsString(directResponse.getResult());
374+
.writeValueAsString(directResponse.getResult());
375375
directResponses.add(new ExtDirectResponseRaw(directResponse, jsonResult));
376376
}
377377
}
@@ -559,8 +559,8 @@ public void writeJsonResponse(HttpServletResponse response, Object responseObjec
559559
jsonGenerator.close();
560560
}
561561
else {
562-
JsonGenerator jsonGenerator = objectMapper.getFactory().createGenerator(outputStream,
563-
JsonEncoding.UTF8);
562+
JsonGenerator jsonGenerator = objectMapper.getFactory()
563+
.createGenerator(outputStream, JsonEncoding.UTF8);
564564
if (jsonView == null) {
565565
objectMapper.writeValue(jsonGenerator, responseObject);
566566
}
@@ -577,8 +577,8 @@ public void writeJsonResponse(HttpServletResponse response, Object responseObjec
577577
private Object processRemotingRequest(HttpServletRequest request, HttpServletResponse response, Locale locale,
578578
ExtDirectRequest directRequest, MethodInfo methodInfo) throws Exception {
579579

580-
Object[] parameters = this.configurationService.getParametersResolver().resolveParameters(request, response,
581-
locale, directRequest, methodInfo);
580+
Object[] parameters = this.configurationService.getParametersResolver()
581+
.resolveParameters(request, response, locale, directRequest, methodInfo);
582582

583583
if (this.configurationService.getConfiguration().isSynchronizeOnSession()
584584
|| methodInfo.isSynchronizeOnSession()) {

‎src/main/java/ch/ralscha/extdirectspring/util/MethodInfo.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,13 @@ private Action extractDocumentationAnnotations(ExtDirectMethodDocumentation docu
220220
: docParameters.descriptions();
221221
if (params.length == descriptions.length) {
222222
for (int i = 0; i < params.length; i++) {
223-
actionDoc.getParameters().put(params[i],
224-
descriptions[i] == null ? "No description" : descriptions[i]);
223+
actionDoc.getParameters()
224+
.put(params[i], descriptions[i] == null ? "No description" : descriptions[i]);
225225
}
226226
}
227227
else {
228-
LogFactory.getLog(MethodInfo.class).info(
229-
"Documentation: skip generation of parameters, params size is different from descriptions size");
228+
LogFactory.getLog(MethodInfo.class)
229+
.info("Documentation: skip generation of parameters, params size is different from descriptions size");
230230
}
231231
}
232232
ExtDirectDocReturn docReturn = documentation.returnMethod();
@@ -236,13 +236,13 @@ private Action extractDocumentationAnnotations(ExtDirectMethodDocumentation docu
236236
: docReturn.descriptions();
237237
if (properties.length == descriptions.length) {
238238
for (int i = 0; i < properties.length; i++) {
239-
actionDoc.getReturnMethod().put(properties[i],
240-
descriptions[i] == null ? "No description" : descriptions[i]);
239+
actionDoc.getReturnMethod()
240+
.put(properties[i], descriptions[i] == null ? "No description" : descriptions[i]);
241241
}
242242
}
243243
else {
244-
LogFactory.getLog(MethodInfo.class).info(
245-
"Documentation: skip generation of return method properties, properties size is different from descriptions size");
244+
LogFactory.getLog(MethodInfo.class)
245+
.info("Documentation: skip generation of return method properties, properties size is different from descriptions size");
246246
}
247247
}
248248
return actionDoc;

‎src/main/java/ch/ralscha/extdirectspring/util/ParameterInfo.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public ParameterInfo(Class<?> clazz, Method method, int paramIndex) {
6565

6666
MethodParameter methodParam = new MethodParameter(method, paramIndex);
6767
methodParam.initParameterNameDiscovery(discoverer);
68-
68+
6969
this.name = methodParam.getParameterName();
7070
this.typeDescriptor = new TypeDescriptor(methodParam);
7171

@@ -129,10 +129,12 @@ else if (CookieValue.class.isInstance(paramAnn)) {
129129
this.hasCookieValueAnnotation = true;
130130
break;
131131
}
132-
else if (paramAnn.annotationType().getName()
133-
.equals("org.springframework.security.web.bind.annotation.AuthenticationPrincipal")
134-
|| paramAnn.annotationType().getName()
135-
.equals("org.springframework.security.core.annotation.AuthenticationPrincipal")) {
132+
else if (paramAnn.annotationType()
133+
.getName()
134+
.equals("org.springframework.security.web.bind.annotation.AuthenticationPrincipal")
135+
|| paramAnn.annotationType()
136+
.getName()
137+
.equals("org.springframework.security.core.annotation.AuthenticationPrincipal")) {
136138
this.hasAuthenticationPrincipalAnnotation = (Boolean) AnnotationUtils.getValue(paramAnn,
137139
"errorOnInvalidType");
138140
}

‎src/main/java/ch/ralscha/extdirectspring/util/ParametersResolver.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ else if (this.conversionService.canConvert(TypeDescriptor.forObject(value),
439439
TypeFactory typeFactory = this.jsonHandler.getMapper().getTypeFactory();
440440
if (methodParameter.getTypeDescriptor().isCollection()) {
441441

442-
JavaType elemType = typeFactory.constructType(
443-
methodParameter.getTypeDescriptor().getElementTypeDescriptor().getType());
442+
JavaType elemType = typeFactory
443+
.constructType(methodParameter.getTypeDescriptor().getElementTypeDescriptor().getType());
444444
TypeVariable<?>[] vars = rawType.getTypeParameters();
445445
TypeBindings bindings;
446446
if (vars == null || vars.length != 1) {
@@ -553,8 +553,8 @@ else if (key.equals("group") && value != null && (value instanceof List || value
553553
if (descriptor != null && descriptor.getWriteMethod() != null) {
554554
try {
555555

556-
descriptor.getWriteMethod().invoke(to,
557-
this.conversionService.convert(value, descriptor.getPropertyType()));
556+
descriptor.getWriteMethod()
557+
.invoke(to, this.conversionService.convert(value, descriptor.getPropertyType()));
558558

559559
foundParameters.add(key);
560560
}

‎src/test/java/ch/ralscha/extdirectspring/annotation/ExtDirectMethodTypeTest.java‎

Lines changed: 57 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,26 @@ public class ExtDirectMethodTypeTest {
3939
@Test
4040
public void testSimpleIsValid() throws SecurityException {
4141
assertThat(ExtDirectMethodType.SIMPLE.isValid("remoteProviderSimple.method1", RemoteProviderSimple.class,
42-
findMethod(RemoteProviderSimple.class, "method1"))).isTrue();
42+
findMethod(RemoteProviderSimple.class, "method1")))
43+
.isTrue();
4344
assertThat(ExtDirectMethodType.SIMPLE.isValid("remoteProviderSimple.method2", RemoteProviderSimple.class,
44-
findMethod(RemoteProviderSimple.class, "method2"))).isTrue();
45+
findMethod(RemoteProviderSimple.class, "method2")))
46+
.isTrue();
4547
assertThat(ExtDirectMethodType.SIMPLE.isValid("remoteProviderSimple.method3", RemoteProviderSimple.class,
46-
findMethod(RemoteProviderSimple.class, "method3"))).isTrue();
48+
findMethod(RemoteProviderSimple.class, "method3")))
49+
.isTrue();
4750
assertThat(ExtDirectMethodType.SIMPLE.isValid("remoteProviderSimple.method3WithError",
48-
RemoteProviderSimple.class, findMethod(RemoteProviderSimple.class, "method3WithError"))).isFalse();
51+
RemoteProviderSimple.class, findMethod(RemoteProviderSimple.class, "method3WithError")))
52+
.isFalse();
4953
}
5054

5155
@Test
5256
public void testSimpleNamedIsValid() throws SecurityException {
5357
for (Method method : RemoteProviderSimpleNamed.class.getMethods()) {
5458
if (method.getName().startsWith("method")) {
5559
assertThat(ExtDirectMethodType.SIMPLE_NAMED.isValid("remoteProviderSimpleNamed." + method.getName(),
56-
RemoteProviderSimpleNamed.class, method)).isTrue();
60+
RemoteProviderSimpleNamed.class, method))
61+
.isTrue();
5762
}
5863
}
5964
}
@@ -63,7 +68,8 @@ public void testFormLoadIsValid() throws SecurityException {
6368
for (Method method : RemoteProviderFormLoad.class.getMethods()) {
6469
if (method.getName().startsWith("method")) {
6570
assertThat(ExtDirectMethodType.FORM_LOAD.isValid("remoteProviderFormLoad." + method.getName(),
66-
RemoteProviderFormLoad.class, method)).isTrue();
71+
RemoteProviderFormLoad.class, method))
72+
.isTrue();
6773
}
6874
}
6975
}
@@ -73,7 +79,8 @@ public void testStoreReadIsValid() throws SecurityException {
7379
for (Method method : RemoteProviderStoreRead.class.getMethods()) {
7480
if (method.getName().startsWith("method")) {
7581
assertThat(ExtDirectMethodType.STORE_READ.isValid("remoteProviderStoreRead." + method.getName(),
76-
RemoteProviderStoreRead.class, method)).isTrue();
82+
RemoteProviderStoreRead.class, method))
83+
.isTrue();
7784
}
7885
}
7986
}
@@ -84,7 +91,8 @@ public void testStoreModifyIsValid() throws SecurityException {
8491
if (method.getName().startsWith("create") || method.getName().startsWith("update")
8592
|| method.getName().startsWith("destroy")) {
8693
assertThat(ExtDirectMethodType.STORE_MODIFY.isValid("remoteProviderStoreModify." + method.getName(),
87-
RemoteProviderStoreModify.class, method)).isTrue();
94+
RemoteProviderStoreModify.class, method))
95+
.isTrue();
8896
}
8997
}
9098

@@ -93,46 +101,62 @@ public void testStoreModifyIsValid() throws SecurityException {
93101
@Test
94102
public void testFormPostIsValid() throws SecurityException {
95103
assertThat(ExtDirectMethodType.FORM_POST.isValid("wrongFormPostController.updateInfo1",
96-
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo1"))).isFalse();
104+
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo1")))
105+
.isFalse();
97106
assertThat(ExtDirectMethodType.FORM_POST.isValid("wrongFormPostController.updateInfo2",
98-
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo2"))).isFalse();
107+
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo2")))
108+
.isFalse();
99109
assertThat(ExtDirectMethodType.FORM_POST.isValid("wrongFormPostController.updateInfo3",
100-
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo3"))).isFalse();
110+
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo3")))
111+
.isFalse();
101112
assertThat(ExtDirectMethodType.FORM_POST.isValid("wrongFormPostController.updateInfo4",
102-
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo4"))).isFalse();
113+
WrongFormPostController.class, findMethod(WrongFormPostController.class, "updateInfo4")))
114+
.isFalse();
103115

104116
assertThat(ExtDirectMethodType.FORM_POST.isValid("uploadService.upload", UploadService.class,
105-
findMethod(UploadService.class, "upload"))).isTrue();
117+
findMethod(UploadService.class, "upload")))
118+
.isTrue();
106119
assertThat(ExtDirectMethodType.FORM_POST.isValid("uploadService.uploadEd", UploadService.class,
107-
findMethod(UploadService.class, "uploadEd"))).isTrue();
120+
findMethod(UploadService.class, "uploadEd")))
121+
.isTrue();
108122

109123
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController2.updateInfo1", FormInfoController2.class,
110-
findMethod(FormInfoController2.class, "updateInfo1"))).isTrue();
124+
findMethod(FormInfoController2.class, "updateInfo1")))
125+
.isTrue();
111126
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController2.updateInfo2", FormInfoController2.class,
112-
findMethod(FormInfoController2.class, "updateInfo2"))).isTrue();
127+
findMethod(FormInfoController2.class, "updateInfo2")))
128+
.isTrue();
113129
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController2.invalidMethod", FormInfoController2.class,
114-
findMethod(FormInfoController2.class, "invalidMethod"))).isFalse();
130+
findMethod(FormInfoController2.class, "invalidMethod")))
131+
.isFalse();
115132

116133
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.updateInfo", FormInfoController.class,
117-
findMethod(FormInfoController.class, "updateInfo"))).isTrue();
134+
findMethod(FormInfoController.class, "updateInfo")))
135+
.isTrue();
118136
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.upload", FormInfoController.class,
119-
findMethod(FormInfoController.class, "upload"))).isTrue();
137+
findMethod(FormInfoController.class, "upload")))
138+
.isTrue();
120139
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.invalidMethod1", FormInfoController.class,
121-
findMethod(FormInfoController.class, "invalidMethod1"))).isFalse();
140+
findMethod(FormInfoController.class, "invalidMethod1")))
141+
.isFalse();
122142
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.invalidMethod2", FormInfoController.class,
123-
findMethod(FormInfoController.class, "invalidMethod2"))).isFalse();
143+
findMethod(FormInfoController.class, "invalidMethod2")))
144+
.isFalse();
124145
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.updateInfoDirect",
125-
FormInfoController.class, findMethod(FormInfoController.class, "updateInfoDirect"))).isTrue();
146+
FormInfoController.class, findMethod(FormInfoController.class, "updateInfoDirect")))
147+
.isTrue();
126148
assertThat(ExtDirectMethodType.FORM_POST.isValid("formInfoController.updateInfoDirectEd",
127-
FormInfoController.class, findMethod(FormInfoController.class, "updateInfoDirectEd"))).isTrue();
149+
FormInfoController.class, findMethod(FormInfoController.class, "updateInfoDirectEd")))
150+
.isTrue();
128151
}
129152

130153
@Test
131154
public void testTreeLoadIsValid() throws SecurityException {
132155
for (Method method : RemoteProviderTreeLoad.class.getMethods()) {
133156
if (method.getName().startsWith("method")) {
134157
assertThat(ExtDirectMethodType.TREE_LOAD.isValid("remoteProviderTreeLoad." + method.getName(),
135-
RemoteProviderTreeLoad.class, method)).isTrue();
158+
RemoteProviderTreeLoad.class, method))
159+
.isTrue();
136160
}
137161
}
138162
}
@@ -142,34 +166,37 @@ public void testPollIsValid() throws SecurityException {
142166
for (Method method : PollProvider.class.getMethods()) {
143167
if (method.getName().startsWith("message") || method.getName().startsWith("handleMessage")) {
144168
assertThat(ExtDirectMethodType.POLL.isValid("pollProvider." + method.getName(), PollProvider.class,
145-
method)).isTrue();
169+
method))
170+
.isTrue();
146171
}
147172
}
148173
}
149174

150175
@Test
151176
public void testFormPostJsonIsValid() throws SecurityException {
152177
assertThat(ExtDirectMethodType.FORM_POST_JSON.isValid("formInfoController3.updateInfoJson",
153-
FormInfoController3.class, findMethod(FormInfoController3.class, "updateInfoJson"))).isTrue();
178+
FormInfoController3.class, findMethod(FormInfoController3.class, "updateInfoJson")))
179+
.isTrue();
154180

155181
assertThat(ExtDirectMethodType.FORM_POST_JSON.isValid("formInfoController3.updateInfoJsonDirect",
156-
FormInfoController3.class, findMethod(FormInfoController3.class, "updateInfoJsonDirect"))).isTrue();
182+
FormInfoController3.class, findMethod(FormInfoController3.class, "updateInfoJsonDirect")))
183+
.isTrue();
157184

158185
assertThat(ExtDirectMethodType.FORM_POST_JSON.isValid("formInfoController3.updateInfoJsonDirectError",
159186
FormInfoController3.class, findMethod(FormInfoController3.class, "updateInfoJsonDirectError")))
160-
.isTrue();
187+
.isTrue();
161188

162189
assertThat(ExtDirectMethodType.FORM_POST_JSON.isValid(
163190
"formInfoController3.updateInfoJsonDirectNotRegisteredWithBindingResultAsParameter",
164191
FormInfoController3.class,
165192
findMethod(FormInfoController3.class, "updateInfoJsonDirectNotRegisteredWithBindingResultAsParameter")))
166-
.isFalse();
193+
.isFalse();
167194

168195
assertThat(ExtDirectMethodType.FORM_POST_JSON.isValid(
169196
"formInfoController3.updateInfoJsonDirectNotRegisteredWithMultipartFileAsParameter",
170197
FormInfoController3.class,
171198
findMethod(FormInfoController3.class, "updateInfoJsonDirectNotRegisteredWithMultipartFileAsParameter")))
172-
.isFalse();
199+
.isFalse();
173200

174201
}
175202

0 commit comments

Comments
 (0)