Skip to content

Commit 218e7eb

Browse files
Remove @Nullable
Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent a1437de commit 218e7eb

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ public void setComponentName(String componentName) {
142142
* Subclasses may implement this method to provide component type information.
143143
*/
144144
@Override
145-
@Nullable
146145
public String getComponentType() {
147-
return null;
146+
return "integration-object-support";
148147
}
149148

150149
@Override

spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public class BeanFactoryChannelResolver implements DestinationResolver<MessageCh
5353

5454
private final Lock lock = new ReentrantLock();
5555

56-
private @Nullable BeanFactory beanFactory;
56+
@SuppressWarnings("NullAway.Init")
57+
private BeanFactory beanFactory;
5758

5859
private @Nullable HeaderChannelRegistry replyChannelRegistry;
5960

@@ -90,7 +91,6 @@ public void setBeanFactory(BeanFactory beanFactory) {
9091

9192
@Override
9293
public MessageChannel resolveDestination(String name) {
93-
Assert.state(this.beanFactory != null, "BeanFactory is required");
9494
try {
9595
return this.beanFactory.getBean(name, MessageChannel.class);
9696
}

spring-integration-core/src/main/java/org/springframework/integration/support/context/NamedComponent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public interface NamedComponent {
2828

2929
String getComponentName();
3030

31-
@Nullable
3231
String getComponentType();
3332

3433
default String getBeanName() {

0 commit comments

Comments
 (0)