Skip to content

XD-mail #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

XD-mail #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e903f2
XD-mail
raszkiewicz Feb 16, 2022
57b7a20
8.1.4 - updated: fixed dependencies versions
raszkiewicz May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.nhind</groupId>
<artifactId>xdmail</artifactId>
<version>8.1.0-SNAPSHOT</version>
<version>8.1.4-SNAPSHOT</version>
<name>NHIN Direct XD* Mail Gateway</name>
<description>NHIN Direct XD* Mail Gateway</description>
<url>https://github.com/DirectProjectJavaRI/xdmail</url>
Expand Down Expand Up @@ -94,19 +94,19 @@
<dependency>
<groupId>org.nhind</groupId>
<artifactId>xd-common</artifactId>
<version>8.0.0</version>
<version>8.1.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.nhind</groupId>
<artifactId>agent</artifactId>
<version>8.0.0</version>
<version>8.1.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.nhind</groupId>
<artifactId>gateway</artifactId>
<version>8.0.0</version>
<version>8.1.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -130,7 +130,12 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -305,24 +310,25 @@
</plugins>
</reporting>

<distributionManagement>
<site>
<id>nhind-site</id>
<name>NHIN Direct API publication site</name>
<url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xdmail/${project.version}
</url>
</site>
<snapshotRepository>
<id>sonatype-snapshot</id>
<name>Sonatype OSS Maven SNAPSHOT Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<repository>
<id>sonatype-release</id>
<name>Sonatype OSS Maven Release Repositor</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<uniqueVersion>false</uniqueVersion>
</repository>
</distributionManagement>
<distributionManagement>
<site>
<id>nhind-site</id>
<name>NHIN Direct API publication site</name>
<url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xdmail/${project.version}
</url>
</site>
<snapshotRepository>
<id>sonatype-snapshot</id>
<name>Sonatype OSS Maven SNAPSHOT Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<repository>
<id>sonatype-release</id>
<name>Sonatype OSS Maven Release Repositor</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<uniqueVersion>false</uniqueVersion>
</repository>
</distributionManagement>

</project>
1 change: 1 addition & 0 deletions src/main/java/org/nhind/mail/service/XDDeliveryCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public boolean processAndDeliverXDMessage(SMTPMailMessage smtpMailMessage) throw

for (String directTo : recipAddresses)
{
log.debug("GOING TO SEND TO " + resolver.getXdEndpoints(recipAddresses).toString() + " OVER " + endpointUrl);
String response = documentRepository.forwardRequest(endpointUrl, request, directTo, sender.toString());

if (!isSuccessful(response))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/nhind/xd/springconfig/XDDeliveryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Configuration
public class XDDeliveryConfig
{
@Value("direct.gateway.xd.endpointUrl")
@Value("${direct.gateway.xd.endpointUrl: http://localhost:8080/xd/services/DocumentRepository_Service}")
protected String endpointURL;

@Autowired
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/nhind/xd/streams/processors/XDRemoteDeliveryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public Consumer<Message<?>> directXDDeliveryInput()
try
{
final SMTPMailMessage smtpMessage = SMTPMailMessageConverter.fromStreamMessage(streamMsg);

deliveryCore.processAndDeliverXDMessage(smtpMessage);

log.debug("XDRemoteDeliveryProcessor processing message from " + smtpMessage.getMailFrom().toString());
deliveryCore.processAndDeliverXDMessage(smtpMessage);
}
catch (MessagingException e)
{
Expand Down
12 changes: 10 additions & 2 deletions src/test/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
spring:
spring:
cloud:
stream:
source: direct-smtp-gateway-message
Expand All @@ -9,4 +9,12 @@ spring:

directXDDeliveryInput-in-0:
destination: direct-xd-delivery
group: direct-xd-delivery-group
group: direct-xd-delivery-group

main:
allow-bean-definition-overriding: true

direct:
gateway:
xd:
endpointurl: http://localhost:8080/xd/services/DocumentRepository_Service