Skip to content

Commit 61d7988

Browse files
anders-swansonanders-swanson
committed
Reformat code
Signed-off-by: Anders Swanson <[email protected]>
1 parent 48d5652 commit 61d7988

32 files changed

+2525
-2556
lines changed

‎database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/JMSMessageChannelBinder.java‎

Lines changed: 139 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*
2-
** TxEventQ Support for Spring Cloud Stream
3-
** Copyright (c) 2023, 2024 Oracle and/or its affiliates.
4-
**
5-
** This file has been modified by Oracle Corporation.
6-
**
7-
*/
2+
** TxEventQ Support for Spring Cloud Stream
3+
** Copyright (c) 2023, 2024 Oracle and/or its affiliates.
4+
**
5+
** This file has been modified by Oracle Corporation.
6+
**
7+
*/
88

99
/*
1010
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,16 +30,13 @@
3030
import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties;
3131
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsConsumerDestination;
3232
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsProducerDestination;
33-
34-
3533
import com.oracle.database.spring.cloud.stream.binder.utils.DestinationNameResolver;
3634
import com.oracle.database.spring.cloud.stream.binder.utils.JmsMessageDrivenChannelAdapterFactory;
3735
import com.oracle.database.spring.cloud.stream.binder.utils.JmsSendingMessageHandlerFactory;
3836
import jakarta.jms.Connection;
3937
import jakarta.jms.ConnectionFactory;
4038
import jakarta.jms.Session;
4139
import jakarta.jms.Topic;
42-
4340
import org.springframework.cloud.stream.binder.AbstractMessageChannelBinder;
4441
import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
4542
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
@@ -58,138 +55,138 @@
5855

5956

6057
public class JMSMessageChannelBinder
61-
extends AbstractMessageChannelBinder<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>, ProvisioningProvider<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>>>
62-
implements
63-
ExtendedPropertiesBinder<MessageChannel, JmsConsumerProperties, JmsProducerProperties> {
64-
65-
private JmsExtendedBindingProperties extendedBindingProperties = new JmsExtendedBindingProperties();
66-
67-
private final JmsSendingMessageHandlerFactory jmsSendingMessageHandlerFactory;
68-
private final JmsMessageDrivenChannelAdapterFactory jmsMessageDrivenChannelAdapterFactory;
69-
private final ConnectionFactory connectionFactory;
70-
71-
private final DestinationResolver destinationResolver;
72-
73-
private DestinationNameResolver destinationNameResolver;
74-
75-
public JMSMessageChannelBinder(
76-
ProvisioningProvider<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>> provisioningProvider,
77-
JmsSendingMessageHandlerFactory jmsSendingMessageHandlerFactory,
78-
JmsMessageDrivenChannelAdapterFactory jmsMessageDrivenChannelAdapterFactory,
79-
JmsTemplate jmsTemplate,
80-
ConnectionFactory connectionFactory
81-
) {
82-
super(null, provisioningProvider);
83-
this.jmsSendingMessageHandlerFactory = jmsSendingMessageHandlerFactory;
84-
this.jmsMessageDrivenChannelAdapterFactory =
85-
jmsMessageDrivenChannelAdapterFactory;
86-
this.connectionFactory = connectionFactory;
87-
this.destinationResolver = jmsTemplate.getDestinationResolver();
88-
}
89-
90-
public void setExtendedBindingProperties(
91-
JmsExtendedBindingProperties extendedBindingProperties
92-
) {
93-
this.extendedBindingProperties = extendedBindingProperties;
94-
}
95-
96-
public void setDestinationNameResolver(DestinationNameResolver destinationNameResolver) {
97-
this.destinationNameResolver = destinationNameResolver;
98-
}
99-
100-
@Override
101-
protected MessageHandler createProducerMessageHandler(
102-
ProducerDestination producerDestination,
103-
ExtendedProducerProperties<JmsProducerProperties> producerProperties,
104-
MessageChannel errorChannel
105-
) throws Exception {
106-
Topic topic = null;
107-
try(Connection conn = connectionFactory.createConnection()) {
108-
Session session = conn.createSession(true, 1);
109-
110-
String destination = producerDestination.getName();
111-
topic = (Topic) destinationResolver.resolveDestinationName(
112-
session,
113-
destination,
114-
true);
115-
}
116-
117-
if(producerProperties.isUseNativeEncoding()) {
118-
return this.jmsSendingMessageHandlerFactory
119-
.build(topic, errorChannel,
120-
producerProperties.getHeaderMode() == null
121-
|| producerProperties.getHeaderMode().equals(HeaderMode.headers),
122-
producerProperties.getExtension().getSerializer(),
123-
((JmsProducerDestination)producerDestination).getDBVersion());
58+
extends AbstractMessageChannelBinder<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>, ProvisioningProvider<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>>>
59+
implements
60+
ExtendedPropertiesBinder<MessageChannel, JmsConsumerProperties, JmsProducerProperties> {
61+
62+
private JmsExtendedBindingProperties extendedBindingProperties = new JmsExtendedBindingProperties();
63+
64+
private final JmsSendingMessageHandlerFactory jmsSendingMessageHandlerFactory;
65+
private final JmsMessageDrivenChannelAdapterFactory jmsMessageDrivenChannelAdapterFactory;
66+
private final ConnectionFactory connectionFactory;
67+
68+
private final DestinationResolver destinationResolver;
69+
70+
private DestinationNameResolver destinationNameResolver;
71+
72+
public JMSMessageChannelBinder(
73+
ProvisioningProvider<ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>> provisioningProvider,
74+
JmsSendingMessageHandlerFactory jmsSendingMessageHandlerFactory,
75+
JmsMessageDrivenChannelAdapterFactory jmsMessageDrivenChannelAdapterFactory,
76+
JmsTemplate jmsTemplate,
77+
ConnectionFactory connectionFactory
78+
) {
79+
super(null, provisioningProvider);
80+
this.jmsSendingMessageHandlerFactory = jmsSendingMessageHandlerFactory;
81+
this.jmsMessageDrivenChannelAdapterFactory =
82+
jmsMessageDrivenChannelAdapterFactory;
83+
this.connectionFactory = connectionFactory;
84+
this.destinationResolver = jmsTemplate.getDestinationResolver();
85+
}
86+
87+
public void setExtendedBindingProperties(
88+
JmsExtendedBindingProperties extendedBindingProperties
89+
) {
90+
this.extendedBindingProperties = extendedBindingProperties;
91+
}
92+
93+
public void setDestinationNameResolver(DestinationNameResolver destinationNameResolver) {
94+
this.destinationNameResolver = destinationNameResolver;
95+
}
96+
97+
@Override
98+
protected MessageHandler createProducerMessageHandler(
99+
ProducerDestination producerDestination,
100+
ExtendedProducerProperties<JmsProducerProperties> producerProperties,
101+
MessageChannel errorChannel
102+
) throws Exception {
103+
Topic topic = null;
104+
try (Connection conn = connectionFactory.createConnection()) {
105+
Session session = conn.createSession(true, 1);
106+
107+
String destination = producerDestination.getName();
108+
topic = (Topic) destinationResolver.resolveDestinationName(
109+
session,
110+
destination,
111+
true);
112+
}
113+
114+
if (producerProperties.isUseNativeEncoding()) {
115+
return this.jmsSendingMessageHandlerFactory
116+
.build(topic, errorChannel,
117+
producerProperties.getHeaderMode() == null
118+
|| producerProperties.getHeaderMode().equals(HeaderMode.headers),
119+
producerProperties.getExtension().getSerializer(),
120+
((JmsProducerDestination) producerDestination).getDBVersion());
121+
}
122+
123+
return this.jmsSendingMessageHandlerFactory
124+
.build(topic, errorChannel,
125+
producerProperties.getHeaderMode() == null ||
126+
producerProperties.getHeaderMode().equals(HeaderMode.headers),
127+
null,
128+
((JmsProducerDestination) producerDestination).getDBVersion());
129+
}
130+
131+
@Override
132+
protected org.springframework.integration.core.MessageProducer createConsumerEndpoint(
133+
ConsumerDestination consumerDestination,
134+
String group,
135+
ExtendedConsumerProperties<JmsConsumerProperties> properties
136+
) throws Exception {
137+
group = this.destinationNameResolver.resolveGroupName(group);
138+
Topic topic = null;
139+
try (Connection conn = connectionFactory.createConnection()) {
140+
Session session = conn.createSession(true, 1);
141+
142+
topic = (Topic) destinationResolver.resolveDestinationName(
143+
session,
144+
consumerDestination.getName(),
145+
true);
146+
}
147+
148+
149+
RetryTemplate retryTemplate = buildRetryTemplate(properties);
150+
ErrorInfrastructure errorInfrastructure = registerErrorInfrastructure(consumerDestination, group, properties);
151+
RecoveryCallback<Object> recoveryCallback = errorInfrastructure
152+
.getRecoverer();
153+
154+
return jmsMessageDrivenChannelAdapterFactory.build(
155+
topic,
156+
group,
157+
retryTemplate,
158+
recoveryCallback,
159+
errorInfrastructure.getErrorChannel(),
160+
properties,
161+
((JmsConsumerDestination) consumerDestination).getDBVersion()
162+
);
163+
}
164+
165+
@Override
166+
public JmsConsumerProperties getExtendedConsumerProperties(
167+
String channelName
168+
) {
169+
return this.extendedBindingProperties.getExtendedConsumerProperties(
170+
channelName
171+
);
172+
}
173+
174+
@Override
175+
public JmsProducerProperties getExtendedProducerProperties(
176+
String channelName
177+
) {
178+
return this.extendedBindingProperties.getExtendedProducerProperties(
179+
channelName
180+
);
181+
}
182+
183+
@Override
184+
public String getDefaultsPrefix() {
185+
return this.extendedBindingProperties.getDefaultsPrefix();
186+
}
187+
188+
@Override
189+
public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
190+
return this.extendedBindingProperties.getExtendedPropertiesEntryClass();
124191
}
125-
126-
return this.jmsSendingMessageHandlerFactory
127-
.build(topic, errorChannel,
128-
producerProperties.getHeaderMode() == null ||
129-
producerProperties.getHeaderMode().equals(HeaderMode.headers),
130-
null,
131-
((JmsProducerDestination)producerDestination).getDBVersion());
132-
}
133-
134-
@Override
135-
protected org.springframework.integration.core.MessageProducer createConsumerEndpoint(
136-
ConsumerDestination consumerDestination,
137-
String group,
138-
ExtendedConsumerProperties<JmsConsumerProperties> properties
139-
) throws Exception {
140-
group = this.destinationNameResolver.resolveGroupName(group);
141-
Topic topic = null;
142-
try(Connection conn = connectionFactory.createConnection()) {
143-
Session session = conn.createSession(true, 1);
144-
145-
topic = (Topic) destinationResolver.resolveDestinationName(
146-
session,
147-
consumerDestination.getName(),
148-
true);
149-
}
150-
151-
152-
RetryTemplate retryTemplate = buildRetryTemplate(properties);
153-
ErrorInfrastructure errorInfrastructure = registerErrorInfrastructure(consumerDestination, group, properties);
154-
RecoveryCallback<Object> recoveryCallback = errorInfrastructure
155-
.getRecoverer();
156-
157-
return jmsMessageDrivenChannelAdapterFactory.build(
158-
topic,
159-
group,
160-
retryTemplate,
161-
recoveryCallback,
162-
errorInfrastructure.getErrorChannel(),
163-
properties,
164-
((JmsConsumerDestination)consumerDestination).getDBVersion()
165-
);
166-
}
167-
168-
@Override
169-
public JmsConsumerProperties getExtendedConsumerProperties(
170-
String channelName
171-
) {
172-
return this.extendedBindingProperties.getExtendedConsumerProperties(
173-
channelName
174-
);
175-
}
176-
177-
@Override
178-
public JmsProducerProperties getExtendedProducerProperties(
179-
String channelName
180-
) {
181-
return this.extendedBindingProperties.getExtendedProducerProperties(
182-
channelName
183-
);
184-
}
185-
186-
@Override
187-
public String getDefaultsPrefix() {
188-
return this.extendedBindingProperties.getDefaultsPrefix();
189-
}
190-
191-
@Override
192-
public Class<? extends BinderSpecificPropertiesProvider> getExtendedPropertiesEntryClass() {
193-
return this.extendedBindingProperties.getExtendedPropertiesEntryClass();
194-
}
195192
}

0 commit comments

Comments
 (0)