Skip to content

Commit 4158957

Browse files
committed
main-modules: moved client & server projects into parent module.
1 parent 1963ad2 commit 4158957

25 files changed

+878
-126
lines changed

example-webflux-rsocket-client/pom.xml

+19-32
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,33 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>org.springframework.boot</groupId>
8-
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.7.5</version>
10-
<relativePath/> <!-- lookup parent from repository -->
7+
<groupId>com.pl.df</groupId>
8+
<artifactId>example-webflux-rsocket</artifactId>
9+
<relativePath>../example-webflux-rsocket</relativePath>
10+
<version>0.0.1</version>
1111
</parent>
1212

13-
<groupId>com.pl.df</groupId>
13+
<groupId>com.pl.df.client</groupId>
1414
<artifactId>example-webflux-rsocket-client</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
16-
<name>example-webflux-rsocket</name>
15+
<version>0.0.1-client</version>
16+
<name>example-webflux-rsocket-client</name>
1717
<description>RSocket client example</description>
1818

19-
<properties>
20-
<java.version>17</java.version>
21-
</properties>
19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.pl.df.lib</groupId>
23+
<artifactId>example-webflux-rsocket-lib</artifactId>
24+
<version>0.0.1-lib</version>
25+
</dependency>
26+
</dependencies>
27+
</dependencyManagement>
2228

2329
<dependencies>
2430
<dependency>
25-
<groupId>org.springframework.boot</groupId>
26-
<artifactId>spring-boot-starter-rsocket</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-webflux</artifactId>
31-
</dependency>
32-
33-
<dependency>
34-
<groupId>org.projectlombok</groupId>
35-
<artifactId>lombok</artifactId>
36-
<optional>true</optional>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.springframework.boot</groupId>
40-
<artifactId>spring-boot-starter-test</artifactId>
41-
<scope>test</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>io.projectreactor</groupId>
45-
<artifactId>reactor-test</artifactId>
46-
<scope>test</scope>
31+
<groupId>com.pl.df.lib</groupId>
32+
<artifactId>example-webflux-rsocket-lib</artifactId>
33+
<version>0.0.1-lib</version>
4734
</dependency>
4835
</dependencies>
4936

example-webflux-rsocket-client/src/main/java/com/pl/df/ClientConfiguration.java renamed to example-webflux-rsocket-client/src/main/java/com/pl/df/client/ClientConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pl.df.examplewebfluxrsocket;
1+
package com.pl.df.client;
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;

example-webflux-rsocket-client/src/main/java/com/pl/df/ClientController.java renamed to example-webflux-rsocket-client/src/main/java/com/pl/df/client/ClientController.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
package com.pl.df.examplewebfluxrsocket;
1+
package com.pl.df.client;
22

3+
import com.pl.df.lib.ObjectMessage;
34
import lombok.RequiredArgsConstructor;
45
import lombok.extern.log4j.Log4j2;
56
import org.springframework.messaging.rsocket.RSocketRequester;
67
import org.springframework.web.bind.annotation.GetMapping;
78
import org.springframework.web.bind.annotation.PathVariable;
89
import org.springframework.web.bind.annotation.RequestMapping;
910
import org.springframework.web.bind.annotation.RestController;
11+
import reactor.core.Disposable;
1012
import reactor.core.publisher.Mono;
1113

1214
import java.util.concurrent.atomic.AtomicInteger;

example-webflux-rsocket-client/src/main/java/com/pl/df/ExampleWebfluxRsocketClientApplication.java renamed to example-webflux-rsocket-client/src/main/java/com/pl/df/client/ExampleWebfluxRsocketClientApplication.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.pl.df.examplewebfluxrsocket;
1+
package com.pl.df.client;
22

3+
import com.pl.df.lib.Util;
34
import lombok.RequiredArgsConstructor;
45
import lombok.SneakyThrows;
56
import org.springframework.boot.SpringApplication;
@@ -16,18 +17,13 @@ public class ExampleWebfluxRsocketClientApplication {
1617
@SneakyThrows
1718
public static void main(String[] args) {
1819
SpringApplication.run(ExampleWebfluxRsocketClientApplication.class, args);
19-
waitTillKeyAction();
20-
}
21-
22-
@SneakyThrows
23-
public static void waitTillKeyAction() {
24-
System.in.read();
20+
Util.waitTillKeyAction();
2521
}
2622

2723
@EventListener(ApplicationReadyEvent.class)
2824
public void onApplicationReadyEvent() {
2925
this.clientController
30-
.rsocketMessage("The Test Message")
26+
.rsocketMessage(("The 1st message"))
3127
.subscribe();
3228
}
3329

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pl.df.examplewebfluxrsocket;
1+
package com.pl.df.client;
22

33
import lombok.Getter;
44
import lombok.ToString;
@@ -7,5 +7,5 @@
77
@ToString
88
public final class ServerRSSocketProperties {
99
private final String address = "localhost";
10-
private final int port = 8181;
10+
private final int port = 8181;
1111
}

example-webflux-rsocket-client/src/test/java/com/pl/df/ExampleWebfluxRsocketClientApplicationTests.java renamed to example-webflux-rsocket-client/src/test/java/com/pl/df/client/ExampleWebfluxRsocketClientApplicationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pl.df.examplewebfluxrsocket;
1+
package com.pl.df.client;
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.test.context.SpringBootTest;
+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
HELP.md
2+
target/
3+
!.mvn/wrapper/maven-wrapper.jar
4+
!**/src/main/**/target/
5+
!**/src/test/**/target/
6+
7+
### STS ###
8+
.apt_generated
9+
.classpath
10+
.factorypath
11+
.project
12+
.settings
13+
.springBeans
14+
.sts4-cache
15+
16+
### IntelliJ IDEA ###
17+
.idea
18+
*.iws
19+
*.iml
20+
*.ipr
21+
22+
### NetBeans ###
23+
/nbproject/private/
24+
/nbbuild/
25+
/dist/
26+
/nbdist/
27+
/.nb-gradle/
28+
build/
29+
!**/src/main/**/build/
30+
!**/src/test/**/build/
31+
32+
### VS Code ###
33+
.vscode/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright 2007-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
import java.net.*;
17+
import java.io.*;
18+
import java.nio.channels.*;
19+
import java.util.Properties;
20+
21+
public class MavenWrapperDownloader {
22+
23+
private static final String WRAPPER_VERSION = "0.5.6";
24+
/**
25+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
26+
*/
27+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
29+
30+
/**
31+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
32+
* use instead of the default one.
33+
*/
34+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
35+
".mvn/wrapper/maven-wrapper.properties";
36+
37+
/**
38+
* Path where the maven-wrapper.jar will be saved to.
39+
*/
40+
private static final String MAVEN_WRAPPER_JAR_PATH =
41+
".mvn/wrapper/maven-wrapper.jar";
42+
43+
/**
44+
* Name of the property which should be used to override the default download url for the wrapper.
45+
*/
46+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
47+
48+
public static void main(String args[]) {
49+
System.out.println("- Downloader started");
50+
File baseDirectory = new File(args[0]);
51+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
52+
53+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
54+
// wrapperUrl parameter.
55+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
56+
String url = DEFAULT_DOWNLOAD_URL;
57+
if(mavenWrapperPropertyFile.exists()) {
58+
FileInputStream mavenWrapperPropertyFileInputStream = null;
59+
try {
60+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
61+
Properties mavenWrapperProperties = new Properties();
62+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
63+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
64+
} catch (IOException e) {
65+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
66+
} finally {
67+
try {
68+
if(mavenWrapperPropertyFileInputStream != null) {
69+
mavenWrapperPropertyFileInputStream.close();
70+
}
71+
} catch (IOException e) {
72+
// Ignore ...
73+
}
74+
}
75+
}
76+
System.out.println("- Downloading from: " + url);
77+
78+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
81+
System.out.println(
82+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
83+
}
84+
}
85+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
86+
try {
87+
downloadFileFromURL(url, outputFile);
88+
System.out.println("Done");
89+
System.exit(0);
90+
} catch (Throwable e) {
91+
System.out.println("- Error downloading");
92+
e.printStackTrace();
93+
System.exit(1);
94+
}
95+
}
96+
97+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
98+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
99+
String username = System.getenv("MVNW_USERNAME");
100+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
101+
Authenticator.setDefault(new Authenticator() {
102+
@Override
103+
protected PasswordAuthentication getPasswordAuthentication() {
104+
return new PasswordAuthentication(username, password);
105+
}
106+
});
107+
}
108+
URL website = new URL(urlString);
109+
ReadableByteChannel rbc;
110+
rbc = Channels.newChannel(website.openStream());
111+
FileOutputStream fos = new FileOutputStream(destination);
112+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
113+
fos.close();
114+
rbc.close();
115+
}
116+
117+
}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

0 commit comments

Comments
 (0)