Skip to content

Commit 49ef024

Browse files
karismannwing328
karismann
authored and
wing328
committed
[java-server-msf4j] fix and upgrade (#2303)
1 parent e810848 commit 49ef024

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1400
-292
lines changed

‎bin/java-msf4j-petstore-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
ags="generate -t modules/openapi-generator/src/main/resources/MSF4J -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=swagger-msf4j-server $@"
30+
ags="generate -t modules/openapi-generator/src/main/resources/MSF4J -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@"
3131

3232
echo "Removing files and folders under samples/server/petstore/java-msf4j/src/main"
3333
rm -rf samples/server/petstore/java-msf4j/src/main

‎bin/utils/ensure-up-to-date

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ declare -a scripts=(
1616
"./bin/ruby-client-petstore.sh"
1717
"./bin/java-petstore-all.sh"
1818
"./bin/java-jaxrs-petstore-server-all.sh"
19+
"./bin/java-msf4j-petstore-server.sh"
1920
"./bin/openapi3/jaxrs-jersey-petstore.sh"
2021
"./bin/spring-all-pestore.sh"
2122
"./bin/javascript-petstore-all.sh"

‎modules/openapi-generator/src/main/resources/MSF4J/README.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ mvn package
1818

1919
for build jar, then start your server:
2020
```
21-
java -jar target/micro-service-server-1.0.0.jar
21+
java -jar target/{{artifactId}}-{{artifactVersion}}.jar
2222
```
2323

24-
Java Microservice listening on default port 8080.
25-
Run the following command or simply go to http://127.0.0.1:8080/pet/12 from your browser:
24+
Java Microservice listening on default port 9090.
25+
Run the following command or simply go to http://127.0.0.1:9090/pet/12 from your browser:
2626

2727
```
28-
curl http://127.0.0.1:8080/pet/12
28+
curl http://127.0.0.1:9090/pet/12
2929
```

‎modules/openapi-generator/src/main/resources/MSF4J/pom.mustache

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.wso2.msf4j</groupId>
44
<artifactId>msf4j-service</artifactId>
5-
<version>2.0.0</version>
5+
<version>2.6.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>{{groupId}}</groupId>
@@ -19,7 +19,7 @@
1919
<configuration>
2020
<archive>
2121
<manifest>
22-
<mainClass>io.swagger.api.Application</mainClass>
22+
<mainClass>org.openapitools.api.Application</mainClass>
2323
</manifest>
2424
</archive>
2525
</configuration>
@@ -54,13 +54,18 @@
5454
<dependency>
5555
<groupId>org.wso2.msf4j</groupId>
5656
<artifactId>msf4j-all</artifactId>
57-
<version>2.0.0</version>
57+
<version>2.6.4</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.datatype</groupId>
6161
<artifactId>jackson-datatype-joda</artifactId>
62-
<version>2.4.1</version>
63-
</dependency>
62+
<version>${jackson-version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
66+
<artifactId>jackson-jaxrs-json-provider</artifactId>
67+
<version>${jackson-version}</version>
68+
</dependency>
6469
</dependencies>
6570
<repositories>
6671
<repository>
@@ -75,13 +80,8 @@
7580
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
7681
<maven.compiler.source>${java.version}</maven.compiler.source>
7782
<maven.compiler.target>${java.version}</maven.compiler.target>
78-
<swagger-core-version>1.5.18</swagger-core-version>
79-
<jetty-version>9.2.9.v20150224</jetty-version>
80-
<jersey2-version>2.22.2</jersey2-version>
81-
<junit-version>4.12</junit-version>
82-
<logback-version>1.1.7</logback-version>
8383
<servlet-api-version>2.5</servlet-api-version>
84-
<jersey2-version>2.22.2</jersey2-version>
84+
<jackson-version>2.8.9</jackson-version>
8585
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8686
</properties>
8787
</project>

‎samples/server/petstore/java-msf4j/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.0-SNAPSHOT
1+
4.0.0-SNAPSHOT

‎samples/server/petstore/java-msf4j/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Swagger MSF4J generated server
1+
# OpenAPI MSF4J generated server
22

33

4-
WSO2 Microservices Framework for Java (MSF4J) is a lightweight high performance framework for developing & running microservices. WSO2 MSF4J is one of the highest performing lightweight Java microservices frameworks. Now swagger code generator will generate micro service skeleton from swagger definition. So you can use this project to convert your swagger definitions to micro service quickly. With this approach you can develop complete micro service within seconds from your swagger definition.
4+
WSO2 Microservices Framework for Java (MSF4J) is a lightweight high performance framework for developing & running microservices. WSO2 MSF4J is one of the highest performing lightweight Java microservices frameworks. Now openapi-generator will generate micro service skeleton from OpenAPI definition. So you can use this project to convert your OpenAPI definitions to micro service quickly. With this approach you can develop complete micro service within seconds from your OpenAPI definition.
55

66
MSF4J generator uses java-msf4j as the default library.
77
Before you build/run service replace .deploy(new PetApi()) with your actual service class name in Application.java file like .deploy(new ApisAPI()) then it will start that service. If you have multiple service classes add them in , separated manner.
@@ -18,12 +18,12 @@ mvn package
1818

1919
for build jar, then start your server:
2020
```
21-
java -jar target/micro-service-server-1.0.0.jar
21+
java -jar target/java-msf4j-server-1.0.0.jar
2222
```
2323

24-
Java Microservice listening on default port 8080.
25-
Run the following command or simply go to http://127.0.0.1:8080/pet/12 from your browser:
24+
Java Microservice listening on default port 9090.
25+
Run the following command or simply go to http://127.0.0.1:9090/pet/12 from your browser:
2626

2727
```
28-
curl http://127.0.0.1:8080/pet/12
28+
curl http://127.0.0.1:9090/pet/12
2929
```

‎samples/server/petstore/java-msf4j/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<parent>
33
<groupId>org.wso2.msf4j</groupId>
44
<artifactId>msf4j-service</artifactId>
5-
<version>2.0.0</version>
5+
<version>2.6.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>org.openapitools</groupId>
9-
<artifactId>swagger-msf4j-server</artifactId>
9+
<artifactId>java-msf4j-server</artifactId>
1010
<packaging>jar</packaging>
11-
<name>swagger-msf4j-server</name>
11+
<name>java-msf4j-server</name>
1212
<version>1.0.0</version>
1313
<build>
1414
<sourceDirectory>src/main/java</sourceDirectory>
@@ -19,7 +19,7 @@
1919
<configuration>
2020
<archive>
2121
<manifest>
22-
<mainClass>io.swagger.api.Application</mainClass>
22+
<mainClass>org.openapitools.api.Application</mainClass>
2323
</manifest>
2424
</archive>
2525
</configuration>
@@ -54,13 +54,18 @@
5454
<dependency>
5555
<groupId>org.wso2.msf4j</groupId>
5656
<artifactId>msf4j-all</artifactId>
57-
<version>2.0.0</version>
57+
<version>2.6.4</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.datatype</groupId>
6161
<artifactId>jackson-datatype-joda</artifactId>
62-
<version>2.4.1</version>
63-
</dependency>
62+
<version>${jackson-version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
66+
<artifactId>jackson-jaxrs-json-provider</artifactId>
67+
<version>${jackson-version}</version>
68+
</dependency>
6469
</dependencies>
6570
<repositories>
6671
<repository>
@@ -75,13 +80,8 @@
7580
<java.version>1.7</java.version>
7681
<maven.compiler.source>${java.version}</maven.compiler.source>
7782
<maven.compiler.target>${java.version}</maven.compiler.target>
78-
<swagger-core-version>1.5.18</swagger-core-version>
79-
<jetty-version>9.2.9.v20150224</jetty-version>
80-
<jersey2-version>2.22.2</jersey2-version>
81-
<junit-version>4.12</junit-version>
82-
<logback-version>1.1.7</logback-version>
8383
<servlet-api-version>2.5</servlet-api-version>
84-
<jersey2-version>2.22.2</jersey2-version>
84+
<jackson-version>2.8.9</jackson-version>
8585
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8686
</properties>
8787
</project>

‎samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public class AnotherFakeApi {
3737
@io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
3838
@io.swagger.annotations.ApiResponses(value = {
3939
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
40-
public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) Client client
40+
public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) Client body
4141
)
4242
throws NotFoundException {
43-
return delegate.call123testSpecialTags(client);
43+
return delegate.call123testSpecialTags(body);
4444
}
4545
}

‎samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818

1919

2020
public abstract class AnotherFakeApiService {
21-
public abstract Response call123testSpecialTags(Client client
21+
public abstract Response call123testSpecialTags(Client body
2222
) throws NotFoundException;
2323
}

0 commit comments

Comments
 (0)