Skip to content

Update redkale-block #9295

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

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Update redkale-block #9295

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
8f251d7
Update redkale-block
redkale Sep 27, 2024
45ff3dd
ConvertStandardString
redkale Sep 29, 2024
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
7 changes: 1 addition & 6 deletions frameworks/Java/redkale/BenchmarkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
package org.redkalex.benchmark;

import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Stream;
import org.redkale.annotation.*;
import org.redkale.net.http.*;
import org.redkale.service.AbstractService;
import org.redkale.source.DataSource;
import org.redkale.util.AnyValue;

/**
* 测试redkale-jdbc, 需要覆盖到原BenchmarkService
Expand All @@ -27,10 +26,6 @@ public class BenchmarkService extends AbstractService {
@Resource
private DataSource source;

public void init(AnyValue conf) {
source.finds(CachedWorld.class, 1);
}

@NonBlocking
@RestMapping(auth = false)
public byte[] plaintext() {
Expand Down
1 change: 1 addition & 0 deletions frameworks/Java/redkale/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"versus": "Redkale"
},
"block": {
"plaintext_url": "/plaintext",
"db_url": "/db",
"query_url": "/queries?q=",
"fortune_url": "/fortunes",
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Java/redkale/conf/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<property name="system.property.redkale.http.response.header.connection" value="none"/>
</properties>

<server protocol="HTTP" port="8080" shareio="true">
<server protocol="HTTP" port="8080">
<response>
<content-type plain="text/plain" json="application/json"/>
<date period="1000"/>
Expand Down
1 change: 1 addition & 0 deletions frameworks/Java/redkale/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ webserver = "Redkale"
versus = "Redkale"

[block]
urls.plaintext = "/plaintext"
urls.db = "/db"
urls.fortune = "/fortunes"
urls.query = "/queries?q="
Expand Down
1 change: 1 addition & 0 deletions frameworks/Java/redkale/redkale-block.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ RUN mvn package -q
FROM openjdk:23-jdk-slim
WORKDIR /redkale
COPY conf conf
RUN sed -i 's/sameHeader="true"/ /g' /redkale/conf/application.xml
COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar

EXPOSE 8080
Expand Down
8 changes: 1 addition & 7 deletions frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/BenchmarkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@

import java.util.*;
import java.util.concurrent.*;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import java.util.stream.*;
import org.redkale.annotation.*;
import org.redkale.net.http.*;
import org.redkale.service.AbstractService;
import org.redkale.source.DataSource;
import org.redkale.util.AnyValue;

/**
*
Expand All @@ -28,10 +26,6 @@ public class BenchmarkService extends AbstractService {
@Resource
private DataSource source;

public void init(AnyValue conf) {
source.finds(CachedWorld.class, 1);
}

@RestMapping(auth = false)
public byte[] plaintext() {
return helloBytes;
Expand Down
4 changes: 2 additions & 2 deletions frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.redkalex.benchmark;

import org.redkale.annotation.Serial;
import org.redkale.convert.ConvertSmallString;
import org.redkale.convert.ConvertStandardString;
import org.redkale.convert.json.JsonConvert;

/**
Expand All @@ -16,7 +16,7 @@
@Serial
public final class Message {

@ConvertSmallString
@ConvertStandardString
private String message;

public Message() {}
Expand Down
Loading