JAVA-21440: Changes made for upgrade jooby module to 2.16.1 to make j… (#14064)
* JAVA-21440: Chnages made for upgrade jooby module to 2.16.1 to make java-17 compatable * JAVA-21440: commenting redis code as this will only work in the local or infra should have a redis setup
This commit is contained in:
parent
e6b0ef1d86
commit
3b73517b00
|
@ -1,2 +1,4 @@
|
||||||
#application.secret = 2o128940921eo298e21
|
#application.secret = 2o128940921eo298e21
|
||||||
#db = /url/to/the/datastore
|
#db = /url/to/the/datastore
|
||||||
|
|
||||||
|
#redis = "redis://localhost:6379"
|
|
@ -14,26 +14,25 @@
|
||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jooby</groupId>
|
<groupId>io.jooby</groupId>
|
||||||
<artifactId>modules</artifactId>
|
<artifactId>jooby</artifactId>
|
||||||
<version>${jooby.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jooby</groupId>
|
|
||||||
<artifactId>jooby-netty</artifactId>
|
|
||||||
<version>${jooby.version}</version>
|
<version>${jooby.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jooby</groupId>
|
<groupId>io.jooby</groupId>
|
||||||
<artifactId>jooby-jedis</artifactId>
|
<artifactId>jooby-test</artifactId>
|
||||||
|
<version>${jooby.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.jooby</groupId>
|
||||||
|
<artifactId>jooby-jetty</artifactId>
|
||||||
|
<version>${jooby.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.jooby</groupId>
|
||||||
|
<artifactId>jooby-redis</artifactId>
|
||||||
<version>${jooby.version}</version>
|
<version>${jooby.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -42,23 +41,43 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<version>${rest-assured.version}</version>
|
<version>${rest-assured.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.squareup.okhttp3</groupId>
|
||||||
|
<artifactId>okhttp</artifactId>
|
||||||
|
<version>${squareup.okhttp.version}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>${maven-shade-plugin.version}</version>
|
<version>${maven-shade-plugin.version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>io.jooby</groupId>
|
||||||
|
<artifactId>jooby-maven-plugin</artifactId>
|
||||||
|
<version>${jooby.version}</version>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>${maven-compiler.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<compilerArgs>
|
||||||
|
<arg>-parameters</arg>
|
||||||
|
</compilerArgs>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<jooby.version>1.1.3</jooby.version>
|
<jooby.version>2.16.1</jooby.version>
|
||||||
<rest-assured.version>3.1.1</rest-assured.version>
|
<rest-assured.version>3.1.1</rest-assured.version>
|
||||||
<application.class>com.baeldung.jooby.App</application.class>
|
<application.class>com.baeldung.jooby.App</application.class>
|
||||||
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
|
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
|
||||||
|
<maven-compiler.version>3.8.1</maven-compiler.version>
|
||||||
|
<squareup.okhttp.version>4.9.1</squareup.okhttp.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
|
@ -1,17 +1,18 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Insert title here</title>
|
<title>Insert title here</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<form enctype="application/x-www-form-urlencoded" action="/submitForm" method="post">
|
<form enctype="application/x-www-form-urlencoded" action="/submitForm" method="post">
|
||||||
<input name="id" />
|
<label>Employed id:</label><br>
|
||||||
<input name="name" />
|
<input name="id"/><br>
|
||||||
<input name="email" />
|
<label>Name:</label><br>
|
||||||
<input name="phone" />
|
<input name="name"/><br>
|
||||||
<input name="address" />
|
<label>Email:</label><br>
|
||||||
|
<input name="email"/><br><br>
|
||||||
<input type="submit" value="Submit"/>
|
<input type="submit" value="Submit"/>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
|
@ -1,32 +1,37 @@
|
||||||
package com.baeldung.jooby;
|
package com.baeldung.jooby;
|
||||||
|
|
||||||
import org.jooby.Jooby;
|
|
||||||
import org.jooby.Mutant;
|
|
||||||
import org.jooby.Session;
|
|
||||||
import org.jooby.jedis.Redis;
|
|
||||||
import org.jooby.jedis.RedisSessionStore;
|
|
||||||
|
|
||||||
import com.baeldung.jooby.bean.Employee;
|
import com.baeldung.jooby.bean.Employee;
|
||||||
|
|
||||||
|
import io.jooby.Jooby;
|
||||||
|
import io.jooby.ServerOptions;
|
||||||
|
import io.jooby.Session;
|
||||||
|
import io.jooby.SessionStore;
|
||||||
|
import io.jooby.redis.RedisModule;
|
||||||
|
import io.jooby.redis.RedisSessionStore;
|
||||||
|
import io.lettuce.core.RedisClient;
|
||||||
|
|
||||||
public class App extends Jooby {
|
public class App extends Jooby {
|
||||||
|
{
|
||||||
|
setServerOptions(new ServerOptions().setPort(8080)
|
||||||
|
.setSecurePort(8433));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
port(8080);
|
get("/", ctx -> "Hello World!");
|
||||||
securePort(8443);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
get("/", () -> "Hello World!");
|
get("/user/{id}", ctx -> "Hello user : " + ctx.path("id")
|
||||||
|
.value());
|
||||||
|
get("/user/:id", ctx -> "Hello user: " + ctx.path("id")
|
||||||
|
.value());
|
||||||
|
get("/uid:{id}", ctx -> "Hello User with id : uid = " + ctx.path("id")
|
||||||
|
.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
get("/user/{id}", req -> "Hello user : " + req.param("id").value());
|
onStarting(() -> {
|
||||||
get("/user/:id", req -> "Hello user: " + req.param("id").value());
|
|
||||||
get("/uid:{id}", req -> "Hello User with id : uid" + req.param("id").value());
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
onStart(() -> {
|
|
||||||
System.out.println("starting app");
|
System.out.println("starting app");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -40,56 +45,91 @@ public class App extends Jooby {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
get("/login", () -> "Hello from Baeldung");
|
get("/login", ctx -> "Hello from Baeldung");
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
post("/save", req -> {
|
post("/save", ctx -> {
|
||||||
Mutant token = req.param("token");
|
String userId = ctx.query("id")
|
||||||
return token.intValue();
|
.value();
|
||||||
|
return userId;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
assets("/employee", "form.html");
|
assets("/employee", "public/form.html");
|
||||||
}
|
}
|
||||||
|
|
||||||
post("/submitForm", req -> {
|
post("/submitForm", ctx -> {
|
||||||
Employee employee = req.params(Employee.class);
|
Employee employee = ctx.path(Employee.class);
|
||||||
// TODO
|
// TODO
|
||||||
return "empoyee data saved successfullly";
|
return "employee data saved successfully";
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
decorator(next -> ctx -> {
|
||||||
|
System.out.println("first");
|
||||||
|
// Moves execution to next handler: second
|
||||||
|
return next.apply(ctx);
|
||||||
|
});
|
||||||
|
decorator(next -> ctx -> {
|
||||||
|
System.out.println("second");
|
||||||
|
// Moves execution to next handler: third
|
||||||
|
return next.apply(ctx);
|
||||||
|
});
|
||||||
|
|
||||||
|
get("/handler", ctx -> {
|
||||||
|
return "third";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
get("/filter", (req, resp, chain) -> {
|
get("/sessionInMemory", ctx -> {
|
||||||
// TODO
|
Session session = ctx.session();
|
||||||
// resp.send(...);
|
session.put("token", "value");
|
||||||
chain.next(req, resp);
|
return session.get("token")
|
||||||
});
|
.value();
|
||||||
get("/filter", (req, resp) -> {
|
|
||||||
resp.send("filter response");
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
// cookieSession();
|
String secret = "super secret token";
|
||||||
|
|
||||||
// use(new Redis());
|
setSessionStore(SessionStore.signed(secret));
|
||||||
//
|
|
||||||
// session(RedisSessionStore.class);
|
|
||||||
|
|
||||||
get("/session", req -> {
|
get("/signedSession", ctx -> {
|
||||||
Session session = req.session();
|
Session session = ctx.session();
|
||||||
session.set("token", "value");
|
session.put("token", "value");
|
||||||
return session.get("token").value();
|
return session.get("token").value();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(final String[] args) {
|
{
|
||||||
|
get("/sessionInMemoryRedis", ctx -> {
|
||||||
|
Session session = ctx.session();
|
||||||
|
session.put("token", "value");
|
||||||
|
return session.get("token")
|
||||||
|
.value();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
run(App::new, args);
|
/* This will work once redis is installed locally
|
||||||
|
{
|
||||||
|
install(new RedisModule("redis"));
|
||||||
|
setSessionStore(new RedisSessionStore(require(RedisClient.class)));
|
||||||
|
get("/redisSession", ctx -> {
|
||||||
|
Session session = ctx.session();
|
||||||
|
session.put("token", "value");
|
||||||
|
return session.get("token");
|
||||||
|
});
|
||||||
|
}*/
|
||||||
|
|
||||||
|
public static void main(final String[] args) {
|
||||||
|
runApp(args, App::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
package com.baeldung.jooby.mvc;
|
package com.baeldung.jooby.mvc;
|
||||||
|
|
||||||
import org.jooby.Result;
|
import java.util.HashMap;
|
||||||
import org.jooby.Results;
|
|
||||||
import org.jooby.mvc.GET;
|
import io.jooby.ModelAndView;
|
||||||
import org.jooby.mvc.Path;
|
import io.jooby.annotations.GET;
|
||||||
|
import io.jooby.annotations.Path;
|
||||||
|
|
||||||
@Path("/hello")
|
@Path("/hello")
|
||||||
public class GetController {
|
public class GetController {
|
||||||
|
@ -15,8 +16,8 @@ public class GetController {
|
||||||
|
|
||||||
@GET
|
@GET
|
||||||
@Path("/home")
|
@Path("/home")
|
||||||
public Result home() {
|
public ModelAndView home() {
|
||||||
return Results.html("welcome").put("model", new Object());
|
return new ModelAndView("welcome.html", new HashMap<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.baeldung.jooby.mvc;
|
package com.baeldung.jooby.mvc;
|
||||||
|
|
||||||
import org.jooby.mvc.POST;
|
import io.jooby.annotations.POST;
|
||||||
import org.jooby.mvc.Path;
|
import io.jooby.annotations.Path;
|
||||||
|
|
||||||
@Path("/submit")
|
@Path("/submit")
|
||||||
public class PostController {
|
public class PostController {
|
||||||
|
@ -10,5 +10,4 @@ public class PostController {
|
||||||
public String hello() {
|
public String hello() {
|
||||||
return "Submit Baeldung";
|
return "Submit Baeldung";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,32 @@
|
||||||
package com.baeldung.jooby;
|
package com.baeldung.jooby;
|
||||||
|
|
||||||
import static io.restassured.RestAssured.get;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.hamcrest.Matchers.equalTo;
|
|
||||||
|
|
||||||
import org.jooby.test.JoobyRule;
|
import java.io.IOException;
|
||||||
import org.junit.ClassRule;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import io.jooby.JoobyTest;
|
||||||
|
import okhttp3.OkHttpClient;
|
||||||
|
import okhttp3.Request;
|
||||||
|
import okhttp3.Response;
|
||||||
|
|
||||||
|
@JoobyTest(value = App.class, port = 8080)
|
||||||
public class AppLiveTest {
|
public class AppLiveTest {
|
||||||
|
|
||||||
@ClassRule
|
static OkHttpClient client = new OkHttpClient();
|
||||||
public static JoobyRule app = new JoobyRule(new App());
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void given_defaultUrl_expect_fixedString() {
|
public void given_defaultUrl_expect_fixedString() {
|
||||||
get("/").then().assertThat().body(equalTo("Hello World!")).statusCode(200)
|
Request request = new Request.Builder().url("http://localhost:8080")
|
||||||
.contentType("text/html;charset=UTF-8");
|
.build();
|
||||||
|
try (Response response = client.newCall(request)
|
||||||
|
.execute()) {
|
||||||
|
assertEquals("Hello World!", response.body()
|
||||||
|
.string());
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,15 +2,16 @@ package com.baeldung.jooby;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
import org.jooby.test.MockRouter;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import io.jooby.MockRouter;
|
||||||
|
|
||||||
public class AppUnitTest {
|
public class AppUnitTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void given_defaultUrl_with_mockrouter_expect_fixedString() throws Throwable {
|
public void given_defaultUrl_with_mockrouter_expect_fixedString() {
|
||||||
String result = new MockRouter(new App()).get("/");
|
MockRouter router = new MockRouter(new App());
|
||||||
assertEquals("Hello World!", result);
|
assertEquals("Hello World!", router.get("/")
|
||||||
|
.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<module>javax-servlets</module>
|
<module>javax-servlets</module>
|
||||||
<module>javax-servlets-2</module>
|
<module>javax-servlets-2</module>
|
||||||
<module>jee-7</module>
|
<module>jee-7</module>
|
||||||
<!--<module>jooby</module>-->
|
<module>jooby</module>
|
||||||
<module>linkrest</module>
|
<module>linkrest</module>
|
||||||
<!-- <module>ninja</module>-->
|
<!-- <module>ninja</module>-->
|
||||||
<!-- <module>play-modules</module> --> <!-- Not a maven project -->
|
<!-- <module>play-modules</module> --> <!-- Not a maven project -->
|
||||||
|
|
Loading…
Reference in New Issue