Skip to content

Commit c6ff095

Browse files
committed
Polishing
1 parent 94cb778 commit c6ff095

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,11 @@ private boolean hasCachePut(CacheOperationContexts contexts) {
406406
}
407407
}
408408
catch (VariableNotAvailableException e) {
409-
// Ignoring failure due to missing result, consider the cache put has
410-
// to proceed
409+
// Ignoring failure due to missing result, consider the cache put has to proceed
411410
}
412411
}
413-
// check if all puts have been excluded by condition
414-
return cachePutContexts.size() != excluded.size();
415-
412+
// Check if all puts have been excluded by condition
413+
return (cachePutContexts.size() != excluded.size());
416414
}
417415

418416
private void processCacheEvicts(Collection<CacheOperationContext> contexts, boolean beforeInvocation, Object result) {

spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ protected Message buildMessage(Session session, Object result) throws JMSExcepti
293293
/**
294294
* Pre-process the given result before it is converted to a {@link Message}.
295295
* @param result the result of the invocation
296-
* @return the payload response to handle, either the {@code result} argument or any other
297-
* object (for instance wrapping the result).
296+
* @return the payload response to handle, either the {@code result} argument
297+
* or any other object (for instance wrapping the result).
298298
* @since 4.3
299299
*/
300300
protected Object preProcessResponse(Object result) {

spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ public Message toMessage(Object object, Session session, Object conversionHint)
212212
*/
213213
public Message toMessage(Object object, Session session, Class<?> jsonView)
214214
throws JMSException, MessageConversionException {
215+
215216
if (jsonView != null) {
216217
return toMessage(object, session, this.objectMapper.writerWithView(jsonView));
217218
}

spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,16 @@ protected javax.jms.Message createMessageForPayload(Object payload, Session sess
128128
}
129129

130130
/**
131-
* Create a JMS message for the specified payload and conversionHint. The conversion
132-
* hint is an extra object passed to the {@link MessageConverter}, e.g. the associated
133-
* {@code MethodParameter} (may be {@code null}}.
131+
* Create a JMS message for the specified payload and conversionHint.
132+
* The conversion hint is an extra object passed to the {@link MessageConverter},
133+
* e.g. the associated {@code MethodParameter} (may be {@code null}}.
134134
* @see MessageConverter#toMessage(Object, Session)
135135
* @since 4.3
136136
*/
137137
@SuppressWarnings("deprecation")
138138
protected javax.jms.Message createMessageForPayload(Object payload, Session session, Object conversionHint)
139139
throws JMSException {
140+
140141
return createMessageForPayload(payload, session);
141142
}
142143

0 commit comments

Comments
 (0)