Skip to content

Commit 2d1adbf

Browse files
committed
Merge branch 'master' into develop
2 parents 950499d + 025ba5c commit 2d1adbf

File tree

5 files changed

+42
-88
lines changed

5 files changed

+42
-88
lines changed

.github/workflows/bump-version.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/pipeline.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: PIPELINE
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
workflow_dispatch:
8+
9+
jobs:
10+
bump:
11+
uses: UnterrainerInformatik/bump-semver-workflow/.github/workflows/workflow.yml@master
12+
13+
build:
14+
name: Build and publish to Maven Central 🚀
15+
needs: bump
16+
uses: UnterrainerInformatik/maven-central-workflow/.github/workflows/workflow.yml@master
17+
with:
18+
major_version: ${{ needs.bump.outputs.major_version }}
19+
minor_version: ${{ needs.bump.outputs.minor_version }}
20+
build_version: ${{ needs.bump.outputs.build_version }}
21+
maven_profiles: release-to-sonatype
22+
maven_args: -Dmaven.test.skip=true
23+
secrets:
24+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
25+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
26+
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
27+
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
28+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

.travis.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>info.unterrainer.commons</groupId>
55
<artifactId>parent-javalin-pom</artifactId>
6-
<version>0.1.2</version>
6+
<version>1.0.2</version>
77
</parent>
88

99
<properties>
@@ -15,7 +15,7 @@
1515

1616
<modelVersion>4.0.0</modelVersion>
1717
<artifactId>http-server</artifactId>
18-
<version>0.3.22</version>
18+
<version>1.0.0</version>
1919
<name>HttpServer</name>
2020
<packaging>jar</packaging>
2121

@@ -28,17 +28,17 @@
2828
<dependency>
2929
<groupId>info.unterrainer.commons</groupId>
3030
<artifactId>jre-utils</artifactId>
31-
<version>0.3.7</version>
31+
<version>1.0.1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>info.unterrainer.commons</groupId>
3535
<artifactId>rdb-utils</artifactId>
36-
<version>0.2.3</version>
36+
<version>1.0.1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>info.unterrainer.commons</groupId>
4040
<artifactId>serialization</artifactId>
41-
<version>0.2.3</version>
41+
<version>1.0.1</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>jakarta.persistence</groupId>

src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ public <P extends BasicJpa, J extends BasicJson, E> GenericHandlerGroupBuilder<P
104104
return new GenericHandlerGroupBuilder<>(this, jpaType, jsonType, coreDaoProvider.getCoreDao());
105105
}
106106

107+
public Javalin getJavalin() {
108+
return javalin;
109+
}
110+
107111
private void create() {
108112

109113
Server server = new Server();
@@ -253,11 +257,11 @@ private void render(final Context ctx) throws IOException {
253257
Object dto = ctx.attribute(Attribute.RESPONSE_OBJECT);
254258
if (dto != null)
255259
switch ((ResponseType) ctx.attribute(Attribute.RESPONSE_TYPE)) {
256-
case JSON:
257-
ctx.result(jsonMapper.toStringFrom(dto));
258-
break;
259-
default:
260-
ctx.result((String) dto);
260+
case JSON:
261+
ctx.result(jsonMapper.toStringFrom(dto));
262+
break;
263+
default:
264+
ctx.result((String) dto);
261265
}
262266

263267
Integer status = ctx.attribute(Attribute.RESPONSE_STATUS);

0 commit comments

Comments
 (0)