Skip to content

Commit 0a781c1

Browse files
dependabot[bot]lucko
authored andcommitted
Bump the dependencies group across 1 directory with 8 updates
--- updated-dependencies: - dependency-name: io.jooby:jooby-bom dependency-version: 3.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: software.amazon.awssdk:bom dependency-version: 2.31.78 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.logging.log4j:log4j-iostreams dependency-version: 2.25.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-version: 3.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.xerial:sqlite-jdbc dependency-version: 3.50.2.0 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: io.jooby:jooby-maven-plugin dependency-version: 3.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent ccfd08d commit 0a781c1

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<plugin>
3535
<groupId>io.jooby</groupId>
3636
<artifactId>jooby-maven-plugin</artifactId>
37-
<version>3.9.1</version>
37+
<version>4.0.6</version>
3838
</plugin>
3939
<plugin>
4040
<artifactId>maven-shade-plugin</artifactId>
@@ -71,14 +71,14 @@
7171
<dependency>
7272
<groupId>io.jooby</groupId>
7373
<artifactId>jooby-bom</artifactId>
74-
<version>3.9.1</version>
74+
<version>4.0.6</version>
7575
<type>pom</type>
7676
<scope>import</scope>
7777
</dependency>
7878
<dependency>
7979
<groupId>software.amazon.awssdk</groupId>
8080
<artifactId>bom</artifactId>
81-
<version>2.31.71</version>
81+
<version>2.32.29</version>
8282
<type>pom</type>
8383
<scope>import</scope>
8484
</dependency>
@@ -94,17 +94,17 @@
9494
<dependency>
9595
<groupId>org.apache.logging.log4j</groupId>
9696
<artifactId>log4j-core</artifactId>
97-
<version>2.25.0</version>
97+
<version>2.25.1</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>org.apache.logging.log4j</groupId>
101101
<artifactId>log4j-slf4j2-impl</artifactId>
102-
<version>2.25.0</version>
102+
<version>2.25.1</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>org.apache.logging.log4j</groupId>
106106
<artifactId>log4j-iostreams</artifactId>
107-
<version>2.25.0</version>
107+
<version>2.25.1</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>com.lmax</groupId>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.github.ben-manes.caffeine</groupId>
127127
<artifactId>caffeine</artifactId>
128-
<version>3.2.1</version>
128+
<version>3.2.2</version>
129129
</dependency>
130130

131131
<dependency>
@@ -136,7 +136,7 @@
136136
<dependency>
137137
<groupId>org.xerial</groupId>
138138
<artifactId>sqlite-jdbc</artifactId>
139-
<version>3.50.1.0</version>
139+
<version>3.50.3.0</version>
140140
</dependency>
141141

142142
<dependency>

src/main/java/me/lucko/bytebin/Bytebin.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
import com.google.common.util.concurrent.ThreadFactoryBuilder;
3030
import io.jooby.ExecutionMode;
3131
import io.jooby.Jooby;
32+
import io.jooby.Server;
33+
import io.jooby.ServerOptions;
34+
import io.jooby.jetty.JettyServer;
3235
import io.prometheus.client.hotspot.DefaultExports;
3336
import me.lucko.bytebin.content.Content;
3437
import me.lucko.bytebin.content.ContentIndexDatabase;
@@ -98,7 +101,7 @@ public static void main(String[] args) throws Exception {
98101
private final LogHandler logHandler;
99102

100103
/** The web server instance */
101-
private final BytebinServer server;
104+
private final Server server;
102105

103106
public Bytebin(Configuration config) throws Exception {
104107
// setup simple logger
@@ -160,13 +163,20 @@ public Bytebin(Configuration config) throws Exception {
160163
? new HttpLogHandler(loggingHttpUri, config.getInt(Option.LOGGING_HTTP_FLUSH_PERIOD, 10))
161164
: new LogHandler.Stub();
162165

166+
long maxContentLength = Content.MEGABYTE_LENGTH * config.getInt(Option.MAX_CONTENT_LENGTH, 10);
167+
163168
// setup the web server
164-
this.server = (BytebinServer) Jooby.createApp(ExecutionMode.EVENT_LOOP, () -> new BytebinServer(
169+
ServerOptions serverOpts = new ServerOptions();
170+
serverOpts.setHost(config.getString(Option.HOST, "0.0.0.0"));
171+
serverOpts.setPort(config.getInt(Option.PORT, 8080));
172+
serverOpts.setCompressionLevel(null);
173+
serverOpts.setMaxRequestSize((int) maxContentLength);
174+
175+
this.server = new JettyServer(serverOpts);
176+
this.server.start(Jooby.createApp(this.server, ExecutionMode.EVENT_LOOP, () -> new BytebinServer(
165177
storageHandler,
166178
contentLoader,
167179
this.logHandler,
168-
config.getString(Option.HOST, "0.0.0.0"),
169-
config.getInt(Option.PORT, 8080),
170180
metrics,
171181
new RateLimitHandler(config.getStringList(Option.RATELIMIT_API_KEYS)),
172182
new RateLimiter(
@@ -185,12 +195,11 @@ public Bytebin(Configuration config) throws Exception {
185195
config.getInt(Option.READ_RATE_LIMIT, 30)
186196
),
187197
new TokenGenerator(config.getInt(Option.KEY_LENGTH, 7)),
188-
(Content.MEGABYTE_LENGTH * config.getInt(Option.MAX_CONTENT_LENGTH, 10)),
198+
maxContentLength,
189199
expiryHandler,
190200
config.getStringMap(Option.HTTP_HOST_ALIASES),
191201
ImmutableSet.copyOf(config.getStringList(Option.ADMIN_API_KEYS))
192-
));
193-
this.server.start();
202+
)));
194203

195204
// schedule invalidation task
196205
if (expiryHandler.hasExpiryTimes() || metrics) {

src/main/java/me/lucko/bytebin/http/BytebinServer.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
package me.lucko.bytebin.http;
2727

2828
import io.jooby.Context;
29-
import io.jooby.ExecutionMode;
3029
import io.jooby.Jooby;
3130
import io.jooby.MediaType;
3231
import io.jooby.ReactiveSupport;
33-
import io.jooby.ServerOptions;
32+
import io.jooby.RouterOptions;
3433
import io.jooby.StatusCode;
3534
import io.jooby.exception.StatusCodeException;
3635
import io.jooby.handler.AssetHandler;
@@ -67,16 +66,8 @@ public class BytebinServer extends Jooby {
6766
.labelNames("method", "useragent")
6867
.register();
6968

70-
public BytebinServer(ContentStorageHandler storageHandler, ContentLoader contentLoader, LogHandler logHandler, String host, int port, boolean metrics, RateLimitHandler rateLimitHandler, RateLimiter postRateLimiter, RateLimiter putRateLimiter, RateLimiter readRateLimiter, TokenGenerator contentTokenGenerator, long maxContentLength, ExpiryHandler expiryHandler, Map<String, String> hostAliases, Set<String> adminApiKeys) {
71-
ServerOptions serverOpts = new ServerOptions();
72-
serverOpts.setHost(host);
73-
serverOpts.setPort(port);
74-
serverOpts.setCompressionLevel(null);
75-
serverOpts.setMaxRequestSize((int) maxContentLength);
76-
setServerOptions(serverOpts);
77-
78-
setExecutionMode(ExecutionMode.EVENT_LOOP);
79-
setTrustProxy(true);
69+
public BytebinServer(ContentStorageHandler storageHandler, ContentLoader contentLoader, LogHandler logHandler, boolean metrics, RateLimitHandler rateLimitHandler, RateLimiter postRateLimiter, RateLimiter putRateLimiter, RateLimiter readRateLimiter, TokenGenerator contentTokenGenerator, long maxContentLength, ExpiryHandler expiryHandler, Map<String, String> hostAliases, Set<String> adminApiKeys) {
70+
setRouterOptions(new RouterOptions().setTrustProxy(true));
8071

8172
use(ReactiveSupport.concurrent());
8273

0 commit comments

Comments
 (0)