multipart/form-data content-type.
+ *
+ * @return A list of {@link Upload}.
+ * @throws IOException
+ */
+ @Nonnull
+ List
* Creates a new {@link AssetHandler}. The handler accepts a location pattern, that serve for
@@ -315,7 +322,9 @@ private interface Loader {
* @param loader The one who load the static resources.
*/
public AssetHandler(final String pattern, final ClassLoader loader) {
- init(Route.normalize(pattern), Paths.get("public"), loader);
+ this.location = Route.normalize(pattern);
+ this.basedir = Paths.get("public");
+ this.classLoader = loader;
}
/**
@@ -345,7 +354,9 @@ public AssetHandler(final String pattern, final ClassLoader loader) {
* @param basedir Base directory.
*/
public AssetHandler(final Path basedir) {
- init("/{0}", basedir, getClass().getClassLoader());
+ this.location = "/{0}";
+ this.basedir = basedir;
+ this.classLoader = getClass().getClassLoader();
}
/**
@@ -375,7 +386,9 @@ public AssetHandler(final Path basedir) {
* @param pattern Pattern to locate static resources.
*/
public AssetHandler(final String pattern) {
- init(Route.normalize(pattern), Paths.get("public"), getClass().getClassLoader());
+ this.location = Route.normalize(pattern);
+ this.basedir = Paths.get("public");
+ this.classLoader = getClass().getClassLoader();
}
/**
@@ -422,6 +435,45 @@ public AssetHandler maxAge(final long maxAge) {
return this;
}
+ /**
+ * Set the route definition and initialize the handler.
+ *
+ * @param route Route definition.
+ * @return This handler.
+ */
+ public AssetHandler setRoute(final Route.AssetDefinition route) {
+ String prefix;
+ boolean rootLocation = location.equals("/") || location.equals("/{0}");
+ if (rootLocation) {
+ String pattern = route.pattern();
+ int i = pattern.indexOf("/*");
+ if (i > 0) {
+ prefix = pattern.substring(0, i + 1);
+ } else {
+ prefix = pattern;
+ }
+ } else {
+ int i = location.indexOf("{");
+ if (i > 0) {
+ prefix = location.substring(0, i);
+ } else {
+ /// TODO: review what we have here
+ prefix = location;
+ }
+ }
+ if (prefix.startsWith("/")) {
+ prefix = prefix.substring(1);
+ }
+ if (prefix.isEmpty() && rootLocation) {
+ throw new IllegalArgumentException(
+ "For security reasons root classpath access is not allowed. Map your static resources "
+ + "using a prefix like: assets(static/**); or use a location classpath prefix like: "
+ + "assets(/, /static/{0})");
+ }
+ init(prefix, location, basedir, classLoader);
+ return this;
+ }
+
/**
* Parse value as {@link Duration}. If the value is already a number then it uses as seconds.
* Otherwise, it parse expressions like: 8m, 1h, 365d, etc...
@@ -485,7 +537,6 @@ public void handle(final Request req, final Response rsp) throws Throwable {
}
private void doHandle(final Request req, final Response rsp, final Asset asset) throws Throwable {
-
// handle etag
if (this.etag) {
String etag = asset.etag();
@@ -551,12 +602,13 @@ protected URL resolve(final String path) throws Exception {
return loader.getResource(path);
}
- private void init(final String pattern, final Path basedir, final ClassLoader loader) {
+ private void init(final String classPathPrefix, final String location, final Path basedir,
+ final ClassLoader loader) {
requireNonNull(loader, "Resource loader is required.");
- this.fn = pattern.equals("/")
+ this.fn = location.equals("/")
? (req, p) -> prefix.apply(p)
- : (req, p) -> MessageFormat.format(prefix.apply(pattern), vars(req));
- this.loader = loader(basedir, loader);
+ : (req, p) -> MessageFormat.format(prefix.apply(location), vars(req));
+ this.loader = loader(basedir, classpathLoader(classPathPrefix, classLoader));
}
private static Object[] vars(final Request req) {
@@ -564,8 +616,8 @@ private static Object[] vars(final Request req) {
return vars.values().toArray(new Object[vars.size()]);
}
- private static Loader loader(final Path basedir, final ClassLoader classloader) {
- if (Files.exists(basedir)) {
+ private static Loader loader(final Path basedir, Loader classpath) {
+ if (basedir != null && Files.exists(basedir)) {
return name -> {
Path path = basedir.resolve(name).normalize();
if (Files.exists(path) && path.startsWith(basedir)) {
@@ -575,10 +627,45 @@ private static Loader loader(final Path basedir, final ClassLoader classloader)
// shh
}
}
- return classloader.getResource(name);
+ return classpath.getResource(name);
};
}
- return classloader::getResource;
+ return classpath;
+ }
+
+ private static Loader classpathLoader(String prefix, ClassLoader classloader) {
+ return name -> {
+ String safePath = safePath(name);
+ if (safePath.startsWith(prefix)) {
+ URL resource = classloader.getResource(safePath);
+ return resource;
+ }
+ return null;
+ };
+ }
+
+ private static String safePath(String name) {
+ if (name.indexOf("./") > 0) {
+ Path path = toPath(name.split("/")).normalize();
+ return toStringPath(path);
+ }
+ return name;
+ }
+
+ private static String toStringPath(Path path) {
+ StringBuilder buffer = new StringBuilder();
+ for (Path segment : path) {
+ buffer.append("/").append(segment);
+ }
+ return buffer.substring(1);
+ }
+
+ private static Path toPath(String[] segments) {
+ Path path = Paths.get(segments[0]);
+ for (int i = 1; i < segments.length; i++) {
+ path = path.resolve(segments[i]);
+ }
+ return path;
}
private static Throwing.Function
- * The module exposes a {@link RestClient} instance + * The module exposes a {@link RestHighLevelClient} and a low-level {@link RestClient} instance *
* *{@code
*
* put("/:id", req -> {
* // index a document
- * RestClient client = req.require(RestClient.class);
- * StringEntity data = new StringEntity("{\"foo\":\"bar\"}");
- * return client.performRequest("PUT", "/twitter/tweet/" + req.param("id").value(), Collections.emptyMap(), data)
- * .getEntity().getContent();
+ * IndexRequest indexRequest = new IndexRequest("posts")
+ * .id("1")
+ * .source("user", "kimchy",
+ * "postDate", new Date(),
+ * "message", "trying out Elasticsearch");
+ * RestHighLevelClient client = req.require(RestHighLevelClient .class);
+ * return client.index(request, RequestOptions.DEFAULT).toString();
* });
*
* }
@@ -264,10 +268,13 @@ public Elasticsearch(final String ... hosts) {
@Override
public void configure(final Env env, final Config config, final Binder binder) {
HttpHost[] httpHosts = Arrays.stream(hosts).map(HttpHost::create).toArray(HttpHost[]::new);
- RestClient restClient = RestClient.builder(httpHosts).build();
+ RestHighLevelClient restHighLevelClient = new RestHighLevelClient(RestClient.builder(httpHosts));
+ RestClient restClient = restHighLevelClient.getLowLevelClient();
+
binder.bind(RestClient.class).toInstance(restClient);
+ binder.bind(RestHighLevelClient.class).toInstance(restHighLevelClient);
- env.onStop(restClient::close);
+ env.onStop(restHighLevelClient::close);
}
@Override
diff --git a/modules/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java b/modules/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java
index 603d967240..2cfc3fd643 100644
--- a/modules/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java
+++ b/modules/jooby-elasticsearch/src/test/java/org/jooby/elasticsearch/ElasticsearchTest.java
@@ -7,6 +7,7 @@
import com.typesafe.config.ConfigFactory;
import static org.easymock.EasyMock.expect;
import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
import org.jooby.Env;
import org.jooby.test.MockUnit;
import org.jooby.funzy.Throwing;
@@ -32,16 +33,21 @@ public class ElasticsearchTest {
private MockUnit.Block nb = unit -> {
RestClient client = unit.mock(RestClient.class);
unit.registerMock(RestClient.class, client);
+ RestHighLevelClient restHighLevelClient = unit.mock(RestHighLevelClient.class);
+ unit.registerMock(RestHighLevelClient.class, restHighLevelClient);
};
@SuppressWarnings("unchecked")
private MockUnit.Block bindings = unit -> {
AnnotatedBindingBuilder+ * Exposed is a prototype for a lightweight SQL + * library written over JDBC driver for Kotlin language + *
+ * + *+ * This module depends on {@link org.jooby.jdbc.Jdbc} module, make sure you read the doc of the + * {@link org.jooby.jdbc.Jdbc} module. + *
+ * + *{@code
+ * {
+ * use(new Jdbc());
+ *
+ * use(new Exposed());
+ *
+ * get("/db") {
+ * val db = require(Database::class)
+ * transaction (db) {
+ * // Work with db...
+ * }
+ * }
+ * }
+ * }
+ *
+ * {@code
+ * {
+ * use(new Jdbc("db1"));
+ *
+ * use(new Jdbc("db2"));
+ *
+ * use(new Exposed("db1"));
+ *
+ * use(new Exposed("db2"));
+ *
+ * get("/db") {
+ * val db1 = require("db1", Database::class)
+ * // Work with db1...
+ *
+ * val db2 = require("db2", Database::class)
+ * // Work with db2...
+ * }
+ * }
+ * }
+ *
+ * @author edgar
+ */
+class Exposed(val name: String = "db") : Jooby.Module {
+ override fun configure(env: Env, conf: Config, binder: Binder) {
+ val dskey = Key.get(DataSource::class.java, Names.named(name))
+ val ds = env.get(dskey)
+ .orElseThrow { NoSuchElementException("DataSource missing: $dskey") }
+ val db = Database.connect(ds)
+ env.serviceKey().generate(Database::class.java, name) { key -> binder.bind(key).toInstance(db) }
+ }
+}
diff --git a/modules/jooby-exposed/src/test/java/org/jooby/exposed/ExposedTest.kt b/modules/jooby-exposed/src/test/java/org/jooby/exposed/ExposedTest.kt
new file mode 100644
index 0000000000..e4bd66a2e2
--- /dev/null
+++ b/modules/jooby-exposed/src/test/java/org/jooby/exposed/ExposedTest.kt
@@ -0,0 +1,78 @@
+package org.jooby.exposed
+
+import com.google.inject.Binder
+import com.google.inject.Key
+import com.google.inject.binder.LinkedBindingBuilder
+import com.google.inject.name.Names
+import com.typesafe.config.Config
+import org.easymock.EasyMock
+import org.jetbrains.exposed.sql.Database
+import org.jooby.Env
+import org.jooby.test.MockUnit
+import org.junit.Test
+import java.util.*
+import java.util.function.Consumer
+import javax.sql.DataSource
+
+class ExposedTest {
+
+ @Test
+ fun defaults() {
+ val dbkey = Key.get(Database::class.java, Names.named("db"))
+ val blocks = arrayOf(MockUnit.Block { unit ->
+ Exposed().configure(unit.get(Env::class.java), unit.get(Config::class.java), unit.get(Binder::class.java))
+ }, MockUnit.Block { unit ->
+ val binder = unit.captured(Consumer::class.java)[0] as Consumer{@code
+ * {
+ * get("/raw", () -> {
+ * return "{\"raw\": \"json\"}";
+ * });
+ * }
+ * }
+ *
+ * @return This module.
+ */
+ public Gzon raw() {
+ raw = true;
+ return this;
}
}
diff --git a/modules/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java b/modules/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java
index e5be910a09..92d66cfe91 100644
--- a/modules/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java
+++ b/modules/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java
@@ -39,6 +39,43 @@ public void render() throws Exception {
});
}
+ @Test
+ public void rawWithCharSequence() throws Exception {
+ String value = "{\"foo\":\"bar\"}";
+ new MockUnit(Gson.class, Renderer.Context.class)
+ .expect(unit -> {
+ Context ctx = unit.get(Renderer.Context.class);
+ expect(ctx.type(MediaType.json)).andReturn(ctx);
+ ctx.send(value);
+ })
+ .run(unit -> {
+ new GsonRawRenderer(MediaType.json, unit.get(Gson.class))
+ .render(value, unit.get(Renderer.Context.class));
+ }, unit -> {
+ });
+ }
+
+ @Test
+ public void rawWithObject() throws Exception {
+ Object value = new GsonRendererTest();
+ new MockUnit(Gson.class, Renderer.Context.class)
+ .expect(unit -> {
+ Context ctx = unit.get(Renderer.Context.class);
+ expect(ctx.accepts(MediaType.json)).andReturn(true);
+ expect(ctx.type(MediaType.json)).andReturn(ctx);
+ ctx.send("{}");
+ })
+ .expect(unit -> {
+ Gson gson = unit.get(Gson.class);
+ expect(gson.toJson(value)).andReturn("{}");
+ })
+ .run(unit -> {
+ new GsonRawRenderer(MediaType.json, unit.get(Gson.class))
+ .render(value, unit.get(Renderer.Context.class));
+ }, unit -> {
+ });
+ }
+
@Test
public void renderSkip() throws Exception {
Object value = new GsonRendererTest();
diff --git a/modules/jooby-gson/src/test/java/org/jooby/json/GzonTest.java b/modules/jooby-gson/src/test/java/org/jooby/json/GzonTest.java
index 675fc78284..ef6713998e 100644
--- a/modules/jooby-gson/src/test/java/org/jooby/json/GzonTest.java
+++ b/modules/jooby-gson/src/test/java/org/jooby/json/GzonTest.java
@@ -70,6 +70,17 @@ public void defaults() throws Exception {
});
}
+ @Test
+ public void raw() throws Exception {
+ new MockUnit(Env.class, Config.class, Binder.class, Gson.class)
+ .expect(body)
+ .run(unit -> {
+ new Gzon()
+ .raw()
+ .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+ });
+ }
+
@SuppressWarnings("unchecked")
@Test
public void withCallback() throws Exception {
diff --git a/modules/jooby-guava-cache/README.md b/modules/jooby-guava-cache/README.md
index c289126e79..31b6c74066 100644
--- a/modules/jooby-guava-cache/README.md
+++ b/modules/jooby-guava-cache/README.md
@@ -1,5 +1,5 @@
-[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-guava-cache)
-[](https://javadoc.io/doc/org.jooby/jooby-guava-cache/1.5.0)
+[](http://mvnrepository.com/artifact/org.jooby/jooby-guava-cache/1.6.6)
+[](https://javadoc.io/doc/org.jooby/jooby-guava-cache/1.6.6)
[](http://jooby.org/doc/guava-cache)
# guava-cache
@@ -15,7 +15,7 @@ Provides cache solution and session storage via: Hibernate ORM
+ * Creates a new {@link RedisSentinel} instance and connect to the provided database. Please note, the
+ * name is a property in your application.conf file with Redis URI.
+ * RedisSentinel is pool of Jedis and for get Jedis just call pool.getResource()
+ *
](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-hbs) -[](https://javadoc.io/doc/org.jooby/jooby-hbs/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-hbs/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-hbs/1.6.6) [](http://jooby.org/doc/hbs) # handlebars @@ -16,7 +16,7 @@ Logic-less and semantic templates via [Handlebars.java](https://github.com/jknac org.jooby jooby-hbs - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-hbs/pom.xml b/modules/jooby-hbs/pom.xml index 354950404f..5df0fe50c5 100644 --- a/modules/jooby-hbs/pom.xml +++ b/modules/jooby-hbs/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-hbv/README.md b/modules/jooby-hbv/README.md index e079bb1d89..5dfe82fe18 100644 --- a/modules/jooby-hbv/README.md +++ b/modules/jooby-hbv/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-hbv) -[](https://javadoc.io/doc/org.jooby/jooby-hbv/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-hbv/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-hbv/1.6.6) [](http://jooby.org/doc/hbv) # hibernate validator @@ -17,7 +17,7 @@ Bean validation via [Hibernate Validator](hibernate.org/validator). org.jooby jooby-hbv - 1.5.0 + 1.6.6 ``` @@ -38,6 +38,19 @@ Bean validation via [Hibernate Validator](hibernate.org/validator). }); } ``` +### in combination with JSON parser +Jooby does not have a validation API or a validation API for HTTP bodies. Instead, this validator _wraps_ existing body parsers as they simply return the first deserialized object. Consequently, this module must be imported _before_ you import any parser! +If you were to use the [Jackson JSON parser module](../jackson/jackson.md) it would look like this: + +```java +{ + // must be imported before any body parser + use(new Hbv()); + use(new Jackson()); + + // routes go here +} +``` ## automatic validations of HTTP params and body diff --git a/modules/jooby-hbv/pom.xml b/modules/jooby-hbv/pom.xml index 768c940598..24a5d90db0 100644 --- a/modules/jooby-hbv/pom.xml +++ b/modules/jooby-hbv/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 @@ -49,7 +49,7 @@ - org.glassfish.web + org.glassfish javax.el diff --git a/modules/jooby-jackson/README.md b/modules/jooby-jackson/README.md index d47f09a66a..c153491db4 100644 --- a/modules/jooby-jackson/README.md +++ b/modules/jooby-jackson/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jackson) -[](https://javadoc.io/doc/org.jooby/jooby-jackson/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jackson/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jackson/1.6.6) [](http://jooby.org/doc/jackson) # jackson @@ -17,7 +17,7 @@ JSON support from the excellent [Jackson](https://github.com/FasterXML/jackson) org.jooby jooby-jackson - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 1b92f51530..2f6c37ebf8 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jackson/src/main/java/org/jooby/json/JacksonRawRenderer.java b/modules/jooby-jackson/src/main/java/org/jooby/json/JacksonRawRenderer.java index fce620ce18..225600c70b 100644 --- a/modules/jooby-jackson/src/main/java/org/jooby/json/JacksonRawRenderer.java +++ b/modules/jooby-jackson/src/main/java/org/jooby/json/JacksonRawRenderer.java @@ -216,7 +216,7 @@ public JacksonRawRenderer(final ObjectMapper mapper, final MediaType type) { @Override protected void renderValue(final Object value, final Renderer.Context ctx) throws Exception { if (value instanceof CharSequence) { - ctx.send(value.toString()); + ctx.type(type).send(value.toString()); } else { super.renderValue(value, ctx); } diff --git a/modules/jooby-jade/README.md b/modules/jooby-jade/README.md index 13a85d89a2..f209cf397d 100644 --- a/modules/jooby-jade/README.md +++ b/modules/jooby-jade/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jade) -[](https://javadoc.io/doc/org.jooby/jooby-jade/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jade/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jade/1.6.6) [](http://jooby.org/doc/jade) # jade @@ -16,7 +16,7 @@ org.jooby jooby-jade - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jade/pom.xml b/modules/jooby-jade/pom.xml index 65760cec89..2b5c9ce420 100644 --- a/modules/jooby-jade/pom.xml +++ b/modules/jooby-jade/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jdbc/README.md b/modules/jooby-jdbc/README.md index 9c918215e3..f06b2e3543 100644 --- a/modules/jooby-jdbc/README.md +++ b/modules/jooby-jdbc/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jdbc) -[](https://javadoc.io/doc/org.jooby/jooby-jdbc/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jdbc/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jdbc/1.6.6) [](http://jooby.org/doc/jdbc) # jdbc @@ -15,7 +15,7 @@ Production-ready jdbc data source, powered by the [HikariCP](https://github.com/ org.jooby jooby-jdbc - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jdbc/pom.xml b/modules/jooby-jdbc/pom.xml index 8251bbded0..dbaed2863b 100644 --- a/modules/jooby-jdbc/pom.xml +++ b/modules/jooby-jdbc/pom.xml @@ -6,7 +6,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jdbi/README.md b/modules/jooby-jdbi/README.md index bc30ca5eec..027f3084c7 100644 --- a/modules/jooby-jdbi/README.md +++ b/modules/jooby-jdbi/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jdbi) -[](https://javadoc.io/doc/org.jooby/jooby-jdbi/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jdbi/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jdbi/1.6.6) [](http://jooby.org/doc/jdbi) # jdbi @@ -21,7 +21,7 @@ org.jooby jooby-jdbi - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 0dda5dffc8..3f76dd5adf 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jdbi3/README.md b/modules/jooby-jdbi3/README.md index c92dfb0803..e45619dfa4 100644 --- a/modules/jooby-jdbi3/README.md +++ b/modules/jooby-jdbi3/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jdbi3) -[](https://javadoc.io/doc/org.jooby/jooby-jdbi3/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jdbi3/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jdbi3/1.6.6) [](http://jooby.org/doc/jdbi3) # jdbi @@ -17,7 +17,7 @@ org.jooby jooby-jdbi3 - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jdbi3/pom.xml b/modules/jooby-jdbi3/pom.xml index 7b0aadc82d..5be42e0d84 100644 --- a/modules/jooby-jdbi3/pom.xml +++ b/modules/jooby-jdbi3/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jedis/README.md b/modules/jooby-jedis/README.md index c635f99ac7..0e5a828fc7 100644 --- a/modules/jooby-jedis/README.md +++ b/modules/jooby-jedis/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jedis) -[](https://javadoc.io/doc/org.jooby/jooby-jedis/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jedis/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jedis/1.6.6) [](http://jooby.org/doc/jedis) # jedis @@ -11,7 +11,7 @@ org.jooby jooby-jedis - 1.5.0 + 1.6.6 ``` @@ -99,7 +99,7 @@ For more information about [Jedis](https://github.com/xetorthio/jedis) checkout org.jooby jooby-jedis - 1.5.0 + 1.6.6 ``` @@ -202,4 +202,10 @@ jedis.pool.jmxNamePrefix = redis-pool jedis.session.prefix = sessions jedis.session.timeout = ${session.timeout} + +jedis.sentinel.hosts = [] + +jedis.sentinel.master = "master" + +jedis.password = "" ``` diff --git a/modules/jooby-jedis/pom.xml b/modules/jooby-jedis/pom.xml index 49d9fbf7a2..a414963d57 100644 --- a/modules/jooby-jedis/pom.xml +++ b/modules/jooby-jedis/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jedis/src/main/java/org/jooby/jedis/Redis.java b/modules/jooby-jedis/src/main/java/org/jooby/jedis/Redis.java index 34c4b62308..b8c9e7f69b 100644 --- a/modules/jooby-jedis/src/main/java/org/jooby/jedis/Redis.java +++ b/modules/jooby-jedis/src/main/java/org/jooby/jedis/Redis.java @@ -203,25 +203,22 @@ */ package org.jooby.jedis; -import static java.util.Objects.requireNonNull; - -import java.net.URI; -import java.util.concurrent.TimeUnit; - -import javax.inject.Provider; - +import com.google.inject.Binder; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.jooby.Env; import org.jooby.Env.ServiceKey; import org.jooby.Jooby; - -import com.google.inject.Binder; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigFactory; - import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; +import javax.inject.Provider; +import java.net.URI; +import java.util.concurrent.TimeUnit; + +import static java.util.Objects.requireNonNull; + /** * Redis cache and key/value data store for Jooby. Exposes a {@link Jedis} service. * @@ -378,7 +375,7 @@ public void configure(final Env env, final Config config, final Binder binder) { k -> binder.bind(k).toProvider(jedis)); } - private GenericObjectPoolConfig poolConfig(final Config config, final String name) { + GenericObjectPoolConfig poolConfig(final Config config, final String name) { Config poolConfig = config.getConfig("jedis.pool"); String override = "jedis." + name; if (config.hasPath(override)) { @@ -387,7 +384,7 @@ private GenericObjectPoolConfig poolConfig(final Config config, final String nam return poolConfig(poolConfig); } - private GenericObjectPoolConfig poolConfig(final Config config) { + GenericObjectPoolConfig poolConfig(final Config config) { GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig(); poolConfig.setBlockWhenExhausted(config.getBoolean("blockWhenExhausted")); poolConfig.setEvictionPolicyClassName(config.getString("evictionPolicyClassName")); diff --git a/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisProvider.java b/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisProvider.java index d7e355dc41..1495ca2261 100644 --- a/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisProvider.java +++ b/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisProvider.java @@ -203,26 +203,25 @@ */ package org.jooby.jedis; -import java.net.URI; - import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import redis.clients.util.Pool; -import redis.clients.jedis.JedisPool; +import java.net.URI; class RedisProvider { /** The logging system. */ private final Logger log = LoggerFactory.getLogger(Redis.class); - private JedisPool pool; + private Pool pool; private URI uri; private GenericObjectPoolConfig config; - public RedisProvider(final JedisPool pool, final URI uri, final GenericObjectPoolConfig config) { + public RedisProvider(final Pool pool, final URI uri, final GenericObjectPoolConfig config) { this.pool = pool; this.uri = uri; this.config = config; diff --git a/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisSentinel.java b/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisSentinel.java new file mode 100644 index 0000000000..6228daeab7 --- /dev/null +++ b/modules/jooby-jedis/src/main/java/org/jooby/jedis/RedisSentinel.java @@ -0,0 +1,287 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.jedis; + +import com.google.inject.Binder; +import com.typesafe.config.Config; +import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.jooby.Env; +import redis.clients.jedis.JedisSentinelPool; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * Created by + * + * @author: lis, Luganski Igor + * @since 1.5.0 + */ +public class RedisSentinel extends Redis { + + /** + * + * Creates a new {@link RedisSentinel} instance and connect to the provided database. Please note, the + * name is a property in your application.conf file with Redis URI. + * RedisSentinel is pool of Jedis and for get Jedis just call pool.getResource() + * + * + * + * { + * use(new RedisSentinel("db1")); + * } + * + * + * application.conf + * + * + * jedis.sentinel.hosts = ["localhost:26379", "host2:26379"] + * jedis.sentinel.master = "master" + * jedis.password = "mySuperSecretPasswordPutHere" + * + * + * Example: + * + * try (Jedis redis = request.require(JedisSentinelPool.class).getResource()) { + * System.out.println( redis.set("test", "this is work") ); + * System.out.println( redis.get("test"); + * } catch (Exception e) { + * e.printStackTrace(); + * } + * + */ + + @Override + public void configure(Env env, Config config, Binder binder) { + /** + * Pool + */ + GenericObjectPoolConfig poolConfig = poolConfig(config.getConfig("jedis.pool")); + int timeout = (int) config.getDuration("jedis.timeout", TimeUnit.MILLISECONDS); + + List hosts = config.getStringList("jedis.sentinel.hosts"); + if (hosts.size() < 1) throw new IllegalArgumentException("List of hosts (jedis.sentinel.hosts) can not be empty"); + final Set sentinels = new HashSet<>(hosts); + + final String MASTER_NAME = config.getString("jedis.sentinel.master"); + final String REDIS_PASSWORD = config.getString("jedis.password"); + + JedisSentinelPool pool; + if (REDIS_PASSWORD.length() > 0) { + pool = new JedisSentinelPool(MASTER_NAME, sentinels, poolConfig, timeout, REDIS_PASSWORD); + } else { + pool = new JedisSentinelPool(MASTER_NAME, sentinels, poolConfig, timeout); + } + + RedisProvider provider = new RedisProvider(pool, null, poolConfig); + env.onStart(provider::start); + env.onStop(provider::stop); + + Env.ServiceKey serviceKey = env.serviceKey(); + serviceKey.generate(JedisSentinelPool.class, "db", k -> binder.bind(k).toInstance(pool)); + } + +} diff --git a/modules/jooby-jedis/src/main/resources/org/jooby/jedis/jedis.conf b/modules/jooby-jedis/src/main/resources/org/jooby/jedis/jedis.conf index 08f9265f15..1fd32239da 100644 --- a/modules/jooby-jedis/src/main/resources/org/jooby/jedis/jedis.conf +++ b/modules/jooby-jedis/src/main/resources/org/jooby/jedis/jedis.conf @@ -24,3 +24,7 @@ jedis.pool.jmxNamePrefix = redis-pool # session store, key prefix and timeout in seconds jedis.session.prefix = sessions jedis.session.timeout = ${session.timeout} + +jedis.sentinel.hosts = [] +jedis.sentinel.master = "master" +jedis.password = "" \ No newline at end of file diff --git a/modules/jooby-jedis/src/test/java/org/jooby/jedis/RedisSentinelTest.java b/modules/jooby-jedis/src/test/java/org/jooby/jedis/RedisSentinelTest.java new file mode 100644 index 0000000000..51b638fa06 --- /dev/null +++ b/modules/jooby-jedis/src/test/java/org/jooby/jedis/RedisSentinelTest.java @@ -0,0 +1,96 @@ +package org.jooby.jedis; + +import com.google.inject.Binder; +import com.google.inject.Key; +import com.google.inject.binder.AnnotatedBindingBuilder; +import com.google.inject.name.Names; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import com.typesafe.config.ConfigValueFactory; +import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.jooby.Env; +import org.jooby.funzy.Throwing; +import org.jooby.test.MockUnit; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import redis.clients.jedis.JedisSentinelPool; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; +import static org.junit.Assert.assertNotNull; + + +@RunWith(PowerMockRunner.class) +@PrepareForTest({RedisSentinel.class, JedisSentinelPool.class, GenericObjectPoolConfig.class}) +public class RedisSentinelTest { + + private MockUnit.Block onManaged = unit -> { + Env env = unit.get(Env.class); + expect(env.onStart(isA(Throwing.Runnable.class))).andReturn(env); + expect(env.onStop(isA(Throwing.Runnable.class))).andReturn(env); + }; + + @SuppressWarnings("unchecked") + @Test + public void shouldGetJedisSentinelInstance() throws Exception { + Config config = jedisConfig().withValue("db", ConfigValueFactory.fromAnyRef("redis://localhost:26379")) + .withValue("jedis.sentinel.hosts", ConfigValueFactory.fromAnyRef(Collections.singletonList("localhost:26379"))); + new MockUnit(Env.class, Binder.class, JedisSentinelPool.class) + .expect(unit -> { + Env env = unit.get(Env.class); + expect(env.serviceKey()).andReturn(new Env.ServiceKey()); + }) + .expect(unit -> { + GenericObjectPoolConfig poolConf = unit.mockConstructor(GenericObjectPoolConfig.class); + poolConf.setBlockWhenExhausted(true); + poolConf.setEvictionPolicyClassName("org.apache.commons.pool2.impl.DefaultEvictionPolicy"); + poolConf.setJmxEnabled(false); + poolConf.setJmxNamePrefix("redis-pool"); + poolConf.setLifo(true); + poolConf.setMaxIdle(10); + poolConf.setMaxTotal(128); + poolConf.setMaxWaitMillis(-1); + poolConf.setMinEvictableIdleTimeMillis(1800000L); + poolConf.setMinIdle(10); + poolConf.setNumTestsPerEvictionRun(3); + poolConf.setSoftMinEvictableIdleTimeMillis(1800000L); + poolConf.setTestOnBorrow(false); + poolConf.setTestOnReturn(false); + poolConf.setTestWhileIdle(false); + poolConf.setTimeBetweenEvictionRunsMillis(-1); + + HashSet hosts = new HashSet<>(); + hosts.add("localhost:26379"); + + JedisSentinelPool pool = unit.mockConstructor( + JedisSentinelPool.class, + new Class[]{String.class, Set.class, GenericObjectPoolConfig.class, int.class}, + "master", hosts, poolConf, 2000); + + AnnotatedBindingBuilder jpABB = unit.mock(AnnotatedBindingBuilder.class); + jpABB.toInstance(pool); + jpABB.toInstance(pool); + + Binder binder = unit.get(Binder.class); + expect(binder.bind(Key.get(JedisSentinelPool.class))).andReturn(jpABB); + expect(binder.bind(Key.get(JedisSentinelPool.class, Names.named("db")))).andReturn(jpABB); + }) + .expect(onManaged) + .run(unit -> { + new RedisSentinel().configure(unit.get(Env.class), config, unit.get(Binder.class)); + }, unit -> { + assertNotNull(unit.get(JedisSentinelPool.class)); + }); + } + + private Config jedisConfig() { + return ConfigFactory.parseResources(getClass(), "jedis.conf"); + } + +} diff --git a/modules/jooby-jetty/README.md b/modules/jooby-jetty/README.md index 6bb722e559..d522fb745c 100644 --- a/modules/jooby-jetty/README.md +++ b/modules/jooby-jetty/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jetty) -[](https://javadoc.io/doc/org.jooby/jooby-jetty/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jetty/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jetty/1.6.6) [](http://jooby.org/doc/jetty) # jetty @@ -15,7 +15,7 @@ org.jooby jooby-jetty - 1.5.0 + 1.6.6 ``` @@ -84,10 +84,6 @@ jetty { AcceptQueueSize = 0 - # Use -1 to disable - - SoLingerTime = -1 - StopTimeout = 30000 # Sets the maximum Idle time for a connection, which roughly translates to the Socket#setSoTimeout(int) diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 6291413a77..8440189181 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyHandler.java b/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyHandler.java index 738ad06039..b7a3478d5b 100644 --- a/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyHandler.java +++ b/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyHandler.java @@ -258,7 +258,7 @@ public void handle(final String target, final Request baseRequest, String type = baseRequest.getContentType(); boolean multipart = false; if (type != null && type.toLowerCase().startsWith(MediaType.multipart.name())) { - baseRequest.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multiPartConfig); + baseRequest.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multiPartConfig); multipart = true; } diff --git a/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java b/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java index dd59064952..03f6ae12d6 100644 --- a/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java +++ b/modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java @@ -341,6 +341,7 @@ private ServerConnector https(final Server server, final Config conf, final Stri sslContextFactory.setSslContext(sslContext); sslContextFactory.setIncludeProtocols("TLSv1.2"); sslContextFactory.setIncludeCipherSuites("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); + sslContextFactory.setEndpointIdentificationAlgorithm("HTTPS"); HttpConfiguration httpsConf = new HttpConfiguration(httpConf); httpsConf.addCustomizer(new SecureRequestCustomizer()); diff --git a/modules/jooby-jetty/src/main/resources/org/jooby/spi/server.conf b/modules/jooby-jetty/src/main/resources/org/jooby/spi/server.conf index f45a7962f9..d3d6968eab 100644 --- a/modules/jooby-jetty/src/main/resources/org/jooby/spi/server.conf +++ b/modules/jooby-jetty/src/main/resources/org/jooby/spi/server.conf @@ -36,9 +36,6 @@ jetty { # The accept queue size (also known as accept backlog) AcceptQueueSize = 0 - # Use -1 to disable - SoLingerTime = -1 - StopTimeout = 30000 # Sets the maximum Idle time for a connection, which roughly translates to the Socket#setSoTimeout(int) diff --git a/modules/jooby-jetty/src/test/java/org/jooby/internal/jetty/JettyHandlerTest.java b/modules/jooby-jetty/src/test/java/org/jooby/internal/jetty/JettyHandlerTest.java index 7310c19486..ed94d516db 100644 --- a/modules/jooby-jetty/src/test/java/org/jooby/internal/jetty/JettyHandlerTest.java +++ b/modules/jooby-jetty/src/test/java/org/jooby/internal/jetty/JettyHandlerTest.java @@ -39,7 +39,7 @@ public void handleShouldSetMultipartConfig() throws Exception { expect(request.getContentType()).andReturn("Multipart/Form-Data"); - request.setAttribute(eq(Request.__MULTIPART_CONFIG_ELEMENT), + request.setAttribute(eq(Request.MULTIPART_CONFIG_ELEMENT), isA(MultipartConfigElement.class)); }) .expect(unit -> { diff --git a/modules/jooby-jongo/README.md b/modules/jooby-jongo/README.md index 8ff992f93e..2c45a0891b 100644 --- a/modules/jooby-jongo/README.md +++ b/modules/jooby-jongo/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jongo) -[](https://javadoc.io/doc/org.jooby/jooby-jongo/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jongo/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jongo/1.6.6) [](http://jooby.org/doc/jongo) # jongo @@ -17,7 +17,7 @@ org.jooby jooby-jongo - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jongo/pom.xml b/modules/jooby-jongo/pom.xml index 2ae0ebbf25..26eeb8a4f8 100644 --- a/modules/jooby-jongo/pom.xml +++ b/modules/jooby-jongo/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-jooq/README.md b/modules/jooby-jooq/README.md index 362cb01670..a9219410cf 100644 --- a/modules/jooby-jooq/README.md +++ b/modules/jooby-jooq/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-jooq) -[](https://javadoc.io/doc/org.jooby/jooby-jooq/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-jooq/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-jooq/1.6.6) [](http://jooby.org/doc/jooq) # jOOQ @@ -17,7 +17,7 @@ org.jooby jooby-jooq - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-jooq/pom.xml b/modules/jooby-jooq/pom.xml index f61045f3f5..b4b14b37f6 100644 --- a/modules/jooby-jooq/pom.xml +++ b/modules/jooby-jooq/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-lang-kotlin/README.md b/modules/jooby-lang-kotlin/README.md index 12062f18fc..c1cbc68ae8 100644 --- a/modules/jooby-lang-kotlin/README.md +++ b/modules/jooby-lang-kotlin/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-lang-kotlin) -[](https://javadoc.io/doc/org.jooby/jooby-lang-kotlin/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-lang-kotlin/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-lang-kotlin/1.6.6) [](http://jooby.org/doc/lang-kotlin) # kotlin @@ -11,7 +11,7 @@ A tiny module that makes a Jooby application more Kotlin idiomatic. org.jooby jooby-lang-kotlin - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-lang-kotlin/pom.xml b/modules/jooby-lang-kotlin/pom.xml index 79960f54f2..5d8c6561e2 100644 --- a/modules/jooby-lang-kotlin/pom.xml +++ b/modules/jooby-lang-kotlin/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-livereload/README.md b/modules/jooby-livereload/README.md index 4827ab6688..30de9a580b 100644 --- a/modules/jooby-livereload/README.md +++ b/modules/jooby-livereload/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-livereload) -[](https://javadoc.io/doc/org.jooby/jooby-livereload/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-livereload/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-livereload/1.6.6) [](http://jooby.org/doc/livereload) # liveReload @@ -18,7 +18,7 @@ Even cooler, when you change a CSS file or an image, the browser is updated inst org.jooby jooby-livereload - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-livereload/pom.xml b/modules/jooby-livereload/pom.xml index 3b9019aa54..9b0b302010 100644 --- a/modules/jooby-livereload/pom.xml +++ b/modules/jooby-livereload/pom.xml @@ -6,7 +6,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 jooby-livereload jooby-livereload diff --git a/modules/jooby-maven-plugin/README.md b/modules/jooby-maven-plugin/README.md index 29eca49944..85c19f609a 100644 --- a/modules/jooby-maven-plugin/README.md +++ b/modules/jooby-maven-plugin/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-maven-plugin) -[](https://javadoc.io/doc/org.jooby/jooby-maven-plugin/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-maven-plugin/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-maven-plugin/1.6.6) [](http://jooby.org/doc/maven-plugin) # maven @@ -43,7 +43,7 @@ It's worth to mention that dynamic reload of classes is done via [JBoss Modules] org.jooby jooby-maven-plugin - 1.5.0 + 1.6.6 ${application.class} @@ -117,7 +117,7 @@ List of commands to execute before starting the ```application```. Useful for [n org.jooby jooby-maven-plugin - 1.5.0 + 1.6.6 ${application.class} @@ -138,7 +138,7 @@ Set one or more ```JVM args```: org.jooby jooby-maven-plugin - 1.5.0 + 1.6.6 ${application.class} true diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 7e4dcf8336..1760e2b4b6 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-metrics/README.md b/modules/jooby-metrics/README.md index c9aede6d79..292f9cce80 100644 --- a/modules/jooby-metrics/README.md +++ b/modules/jooby-metrics/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-metrics) -[](https://javadoc.io/doc/org.jooby/jooby-metrics/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-metrics/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-metrics/1.6.6) [](http://jooby.org/doc/metrics) # metrics @@ -11,7 +11,7 @@ org.jooby jooby-metrics - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 7c7dc0e712..b748fba8f8 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-micrometer/README.md b/modules/jooby-micrometer/README.md index a397804867..e92ad2d180 100644 --- a/modules/jooby-micrometer/README.md +++ b/modules/jooby-micrometer/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-micrometer) -[](https://javadoc.io/doc/org.jooby/jooby-micrometer/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-micrometer/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-micrometer/1.6.6) [](http://jooby.org/doc/micrometer) # micrometer @@ -11,7 +11,7 @@ org.jooby jooby-micrometer - 1.5.0 + 1.6.6 ``` @@ -81,6 +81,15 @@ import org.jooby.micrometer.PrometheusHandler; } ``` +> NOTE: for each additional registry, you must add the corresponding `micrometer` depedency. For Prometheus: + +```xml + + io.micrometer + micrometer-registry-prometheus + +``` + ## timed annotation Jooby supports the ```io.micrometer.core.annotation.Timed``` annotation for MVC routes: diff --git a/modules/jooby-micrometer/pom.xml b/modules/jooby-micrometer/pom.xml index 240aa47590..cbf0151a87 100644 --- a/modules/jooby-micrometer/pom.xml +++ b/modules/jooby-micrometer/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-mongodb-rx/README.md b/modules/jooby-mongodb-rx/README.md index 47aa948b45..8bc159c481 100644 --- a/modules/jooby-mongodb-rx/README.md +++ b/modules/jooby-mongodb-rx/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-mongodb-rx) -[](https://javadoc.io/doc/org.jooby/jooby-mongodb-rx/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-mongodb-rx/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-mongodb-rx/1.6.6) [](http://jooby.org/doc/mongodb-rx) # mongodb-rx @@ -16,7 +16,7 @@ A MongoDB based driver providing support for React org.jooby jooby-mongodb-rx - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-mongodb-rx/pom.xml b/modules/jooby-mongodb-rx/pom.xml index 0e0096b4cb..35dfb8c62e 100644 --- a/modules/jooby-mongodb-rx/pom.xml +++ b/modules/jooby-mongodb-rx/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-mongodb/README.md b/modules/jooby-mongodb/README.md index 6da253ef4f..8f728ca4f8 100644 --- a/modules/jooby-mongodb/README.md +++ b/modules/jooby-mongodb/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-mongodb) -[](https://javadoc.io/doc/org.jooby/jooby-mongodb/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-mongodb/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-mongodb/1.6.6) [](http://jooby.org/doc/mongodb) # mongodb driver @@ -17,7 +17,7 @@ org.jooby jooby-mongodb - 1.5.0 + 1.6.6 ``` @@ -117,7 +117,7 @@ Use [named](/apidocs/org/jooby/mongodb/Mongodb.html#-named) when you need two or org.jooby jooby-mongodb - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-mongodb/pom.xml b/modules/jooby-mongodb/pom.xml index 94a9b50e6a..bebe22ff7d 100644 --- a/modules/jooby-mongodb/pom.xml +++ b/modules/jooby-mongodb/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-morphia/README.md b/modules/jooby-morphia/README.md index 08854e6180..9849397a14 100644 --- a/modules/jooby-morphia/README.md +++ b/modules/jooby-morphia/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-morphia) -[](https://javadoc.io/doc/org.jooby/jooby-morphia/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-morphia/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-morphia/1.6.6) [](http://jooby.org/doc/morphia) # morphia @@ -16,7 +16,7 @@ Extends the [mongodb](https://github.com/jooby-project/jooby/tree/master/jooby-m org.jooby jooby-morphia - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-morphia/pom.xml b/modules/jooby-morphia/pom.xml index 1e0a1543ae..4524829786 100644 --- a/modules/jooby-morphia/pom.xml +++ b/modules/jooby-morphia/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-neo4j/README.md b/modules/jooby-neo4j/README.md index 6886784ae5..c4d01ee49d 100644 --- a/modules/jooby-neo4j/README.md +++ b/modules/jooby-neo4j/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-neo4j) -[](https://javadoc.io/doc/org.jooby/jooby-neo4j/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-neo4j/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-neo4j/1.6.6) [](http://jooby.org/doc/neo4j) # neo4j @@ -13,7 +13,7 @@ This module give you access to neo4j and org.jooby jooby-neo4j - 1.5.0 + 1.6.6 ``` @@ -176,7 +176,7 @@ A [Session.Store](/apidocs/org/jooby/neo4j/Neo4jSessionStore) powered by org.jooby jooby-neo4j - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-neo4j/pom.xml b/modules/jooby-neo4j/pom.xml index 0fabdd2046..5344a7b496 100644 --- a/modules/jooby-neo4j/pom.xml +++ b/modules/jooby-neo4j/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-netty/README.md b/modules/jooby-netty/README.md index 780c999fbe..6ae7eec12b 100644 --- a/modules/jooby-netty/README.md +++ b/modules/jooby-netty/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-netty) -[](https://javadoc.io/doc/org.jooby/jooby-netty/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-netty/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-netty/1.6.6) [](http://jooby.org/doc/netty) # netty @@ -15,7 +15,7 @@ org.jooby jooby-netty - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 49e7596814..50c3d0d488 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyPush.java b/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyPush.java index cf331ed7df..157f184a23 100644 --- a/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyPush.java +++ b/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyPush.java @@ -261,7 +261,7 @@ public void push(final String method, final String path, final Map files(final String name) throws IOException { return ImmutableList.copyOf(this.files.get(name)); } + @Override + public List files() throws IOException { + decodeParams(); + return ImmutableList.copyOf(this.files.values()); + } + @Override public InputStream in() { ByteBuf content = ((HttpContent) req).content(); diff --git a/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyWebSocket.java b/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyWebSocket.java index c2c4b6cbff..070ede05cb 100644 --- a/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyWebSocket.java +++ b/modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyWebSocket.java @@ -208,11 +208,13 @@ import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.function.BiConsumer; import java.util.function.Consumer; +import io.netty.handler.codec.http.websocketx.*; import org.jooby.WebSocket; import org.jooby.WebSocket.OnError; import org.jooby.WebSocket.SuccessCallback; @@ -224,10 +226,6 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelConfig; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame; -import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; -import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; -import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; import io.netty.util.Attribute; import io.netty.util.AttributeKey; import io.netty.util.concurrent.Future; @@ -259,6 +257,10 @@ public class NettyWebSocket implements NativeWebSocket { private final CountDownLatch ready = new CountDownLatch(1); + private ByteBuf buffer = null; + + private boolean bufferIsText = false; + public NettyWebSocket(final ChannelHandlerContext ctx, final WebSocketServerHandshaker handshaker, final Consumer handshake) { this.ctx = ctx; @@ -369,10 +371,8 @@ public void hankshake() { public void handle(final Object msg) { ready(); - if (msg instanceof TextWebSocketFrame) { - onTextCallback.accept(((TextWebSocketFrame) msg).text()); - } else if (msg instanceof BinaryWebSocketFrame) { - onBinaryCallback.accept(((BinaryWebSocketFrame) msg).content().nioBuffer()); + if (msg instanceof TextWebSocketFrame || msg instanceof BinaryWebSocketFrame || msg instanceof ContinuationWebSocketFrame){ + handleWebsocketMessage((WebSocketFrame) msg); } else if (msg instanceof CloseWebSocketFrame) { CloseWebSocketFrame closeFrame = ((CloseWebSocketFrame) msg).retain(); int statusCode = closeFrame.statusCode(); @@ -384,6 +384,40 @@ public void handle(final Object msg) { } } + private void handleWebsocketMessage(WebSocketFrame webSocketMessage) { + if (!webSocketMessage.isFinalFragment()) { + if (this.buffer == null) { + if (webSocketMessage instanceof ContinuationWebSocketFrame){ + throw new IllegalStateException("Received ContinuationWebSocketFrame as a first frame of a message."); + } + this.buffer = Unpooled.copiedBuffer(webSocketMessage.content()); + this.bufferIsText = webSocketMessage instanceof TextWebSocketFrame; + } else { + this.buffer.writeBytes(webSocketMessage.content()); + } + } else { + if (this.buffer != null) { + this.buffer.writeBytes(webSocketMessage.content()); + try{ + if (this.bufferIsText) { + onTextCallback.accept(this.buffer.toString(StandardCharsets.UTF_8)); + } else { + onBinaryCallback.accept(this.buffer.nioBuffer()); + } + } finally { + this.buffer = null; + } + } else { + // shortcut to avoid allocating unnecessary copiedBuffers + if (webSocketMessage instanceof TextWebSocketFrame) { + onTextCallback.accept(((TextWebSocketFrame) webSocketMessage).text()); + } else if (webSocketMessage instanceof BinaryWebSocketFrame) { + onBinaryCallback.accept(webSocketMessage.content().nioBuffer()); + } + } + } + } + /** * Make sure hankshake/connect is set. */ diff --git a/modules/jooby-netty/src/test/java/org/jooby/internal/netty/NettyWebSocketTest.java b/modules/jooby-netty/src/test/java/org/jooby/internal/netty/NettyWebSocketTest.java index 8cbc4f1d10..dbd5a05df0 100644 --- a/modules/jooby-netty/src/test/java/org/jooby/internal/netty/NettyWebSocketTest.java +++ b/modules/jooby-netty/src/test/java/org/jooby/internal/netty/NettyWebSocketTest.java @@ -486,6 +486,7 @@ public void handleTextFrame() throws Exception { ready.await(); TextWebSocketFrame frame = unit.get(TextWebSocketFrame.class); + expect(frame.isFinalFragment()).andReturn(true); expect(frame.text()).andReturn("text"); Consumer callback = unit.get(Consumer.class); @@ -517,6 +518,7 @@ public void handleBinaryFrame() throws Exception { expect(buff.nioBuffer()).andReturn(nioBuff); BinaryWebSocketFrame frame = unit.get(BinaryWebSocketFrame.class); + expect(frame.isFinalFragment()).andReturn(true); expect(frame.content()).andReturn(buff); Consumer callback = unit.get(Consumer.class); diff --git a/modules/jooby-pac4j/README.md b/modules/jooby-pac4j/README.md index fceae14ea1..19f4f1ab1d 100644 --- a/modules/jooby-pac4j/README.md +++ b/modules/jooby-pac4j/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-pac4j) -[](https://javadoc.io/doc/org.jooby/jooby-pac4j/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-pac4j/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-pac4j/1.6.6) [](http://jooby.org/doc/pac4j) # pac4j @@ -22,7 +22,7 @@ Authentication module via: [Pac4j 1.x](https://github.com/pac4j/pac4j). org.jooby jooby-pac4j - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index bc428a279c..90de5eee01 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-pac4j2/README.md b/modules/jooby-pac4j2/README.md index a3b1dc9b0a..975bd84ea5 100644 --- a/modules/jooby-pac4j2/README.md +++ b/modules/jooby-pac4j2/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-pac4j2) -[](https://javadoc.io/doc/org.jooby/jooby-pac4j2/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-pac4j2/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-pac4j2/1.6.6) [](http://jooby.org/doc/pac4j2) # pac4j module @@ -19,7 +19,7 @@ Authentication module via: Pac4j 2.x org.jooby jooby-pac4j2 - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-pac4j2/pom.xml b/modules/jooby-pac4j2/pom.xml index 91dee44552..51c6a3a98c 100644 --- a/modules/jooby-pac4j2/pom.xml +++ b/modules/jooby-pac4j2/pom.xml @@ -6,7 +6,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-pebble/README.md b/modules/jooby-pebble/README.md index c9ef8d5c33..35dfb2b599 100644 --- a/modules/jooby-pebble/README.md +++ b/modules/jooby-pebble/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-pebble) -[](https://javadoc.io/doc/org.jooby/jooby-pebble/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-pebble/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-pebble/1.6.6) [](http://jooby.org/doc/pebble) # pebble @@ -16,7 +16,7 @@ org.jooby jooby-pebble - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index ec8aa84aaf..9a3e954bcd 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-quartz/README.md b/modules/jooby-quartz/README.md index d431ccbec1..3b90f75dcb 100644 --- a/modules/jooby-quartz/README.md +++ b/modules/jooby-quartz/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-quartz) -[](https://javadoc.io/doc/org.jooby/jooby-quartz/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-quartz/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-quartz/1.6.6) [](http://jooby.org/doc/quartz) # quartz @@ -11,7 +11,7 @@ Cron triggers, job scheduling and async processing via [Quartz](http://quartz-sc org.jooby jooby-quartz - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 27da25eff2..52f3573da8 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-querydsl/README.md b/modules/jooby-querydsl/README.md index c4394c7fc4..50a01e9b76 100644 --- a/modules/jooby-querydsl/README.md +++ b/modules/jooby-querydsl/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-querydsl) -[](https://javadoc.io/doc/org.jooby/jooby-querydsl/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-querydsl/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-querydsl/1.6.6) [](http://jooby.org/doc/querydsl) # queryDSL @@ -17,7 +17,7 @@ SQL abstraction provided by QueryDSL using org.jooby jooby-querydsl - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-querydsl/pom.xml b/modules/jooby-querydsl/pom.xml index 1f6f5a26e3..acba22394a 100644 --- a/modules/jooby-querydsl/pom.xml +++ b/modules/jooby-querydsl/pom.xml @@ -4,7 +4,7 @@ modules org.jooby - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-reactor/README.md b/modules/jooby-reactor/README.md index 70991445d5..4552bcd46c 100644 --- a/modules/jooby-reactor/README.md +++ b/modules/jooby-reactor/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-reactor) -[](https://javadoc.io/doc/org.jooby/jooby-reactor/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-reactor/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-reactor/1.6.6) [](http://jooby.org/doc/reactor) # reactor @@ -11,7 +11,7 @@ org.jooby jooby-reactor - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-reactor/pom.xml b/modules/jooby-reactor/pom.xml index 8733c1d138..93eba99a84 100644 --- a/modules/jooby-reactor/pom.xml +++ b/modules/jooby-reactor/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-requery/README.md b/modules/jooby-requery/README.md index f814f2cd37..6a3c9da432 100644 --- a/modules/jooby-requery/README.md +++ b/modules/jooby-requery/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-requery) -[](https://javadoc.io/doc/org.jooby/jooby-requery/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-requery/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-requery/1.6.6) [](http://jooby.org/doc/requery) # requery @@ -15,7 +15,7 @@ Safe, clean and efficient database access via { + + private Class type; + + private Registry registry; + + public ProxyEntityStateListener(Class type) { + this.type = type; + } + + @Override public void accept(Registry registry) { + this.registry = registry; + } + + private EntityStateListener forwarding() { + if (registry == null) { + throw new IllegalStateException("Registry was not set"); + } + return (EntityStateListener) registry.require(type); + } + + @Override public void postDelete(Object entity) { + forwarding().postDelete(entity); + } + + @Override public void postInsert(Object entity) { + forwarding().postInsert(entity); + } + + @Override public void postLoad(Object entity) { + forwarding().postLoad(entity); + } + + @Override public void postUpdate(Object entity) { + forwarding().postUpdate(entity); + } + + @Override public void preDelete(Object entity) { + forwarding().preDelete(entity); + } + + @Override public void preInsert(Object entity) { + forwarding().preInsert(entity); + } + + @Override public void preUpdate(Object entity) { + forwarding().preUpdate(entity); + } +} diff --git a/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyStatementListener.java b/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyStatementListener.java new file mode 100644 index 0000000000..db25ad6f30 --- /dev/null +++ b/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyStatementListener.java @@ -0,0 +1,259 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.requery; + +import io.requery.sql.BoundParameters; +import io.requery.sql.StatementListener; +import org.jooby.Registry; + +import java.sql.Statement; +import java.util.function.Consumer; + +class ProxyStatementListener implements StatementListener, Consumer { + + private Class type; + + private Registry registry; + + public ProxyStatementListener(Class type) { + this.type = type; + } + + private StatementListener forwarding() { + if (registry == null) { + throw new IllegalStateException("Registry was not set"); + } + return (StatementListener) registry.require(type); + } + + @Override + public void beforeExecuteUpdate(Statement statement, String sql, BoundParameters parameters) { + forwarding().beforeExecuteUpdate(statement, sql, parameters); + } + + @Override public void afterExecuteUpdate(Statement statement, int count) { + forwarding().afterExecuteUpdate(statement, count); + } + + @Override public void beforeExecuteBatchUpdate(Statement statement, String sql) { + forwarding().beforeExecuteBatchUpdate(statement, sql); + } + + @Override public void afterExecuteBatchUpdate(Statement statement, int[] count) { + forwarding().afterExecuteBatchUpdate(statement, count); + } + + @Override + public void beforeExecuteQuery(Statement statement, String sql, BoundParameters parameters) { + forwarding().beforeExecuteQuery(statement, sql, parameters); + } + + @Override public void afterExecuteQuery(Statement statement) { + forwarding().afterExecuteQuery(statement); + } + + @Override public void accept(Registry registry) { + this.registry = registry; + } +} diff --git a/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyTransactionListener.java b/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyTransactionListener.java new file mode 100644 index 0000000000..9c28e9085d --- /dev/null +++ b/modules/jooby-requery/src/main/java/org/jooby/requery/ProxyTransactionListener.java @@ -0,0 +1,259 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.requery; + +import io.requery.TransactionIsolation; +import io.requery.TransactionListener; +import io.requery.meta.Type; +import io.requery.sql.EntityStateListener; +import org.jooby.Registry; + +import java.util.Set; +import java.util.function.Consumer; + +class ProxyTransactionListener implements TransactionListener, Consumer { + + private Class type; + + private Registry registry; + + public ProxyTransactionListener(Class type) { + this.type = type; + } + + @Override public void accept(Registry registry) { + this.registry = registry; + } + + private TransactionListener forwarding() { + if (registry == null) { + throw new IllegalStateException("Registry was not set"); + } + return (TransactionListener) registry.require(type); + } + + @Override public void beforeBegin(TransactionIsolation isolation) { + forwarding().beforeBegin(isolation); + } + + @Override public void afterBegin(TransactionIsolation isolation) { + forwarding().afterBegin(isolation); + } + + @Override public void beforeCommit(Set> types) { + forwarding().beforeCommit(types); + } + + @Override public void afterCommit(Set> types) { + forwarding().afterCommit(types); + } + + @Override public void beforeRollback(Set> types) { + forwarding().beforeRollback(types); + } + + @Override public void afterRollback(Set> types) { + forwarding().afterRollback(types); + } +} diff --git a/modules/jooby-requery/src/main/java/org/jooby/requery/Requery.java b/modules/jooby-requery/src/main/java/org/jooby/requery/Requery.java index 03cbf337a4..d79a80d48f 100644 --- a/modules/jooby-requery/src/main/java/org/jooby/requery/Requery.java +++ b/modules/jooby-requery/src/main/java/org/jooby/requery/Requery.java @@ -205,8 +205,10 @@ import com.google.inject.name.Names; import io.requery.sql.KotlinEntityDataStore; + import static java.util.Objects.requireNonNull; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.NoSuchElementException; @@ -215,6 +217,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; +import java.util.stream.Collectors; import javax.inject.Provider; import javax.sql.DataSource; @@ -222,6 +225,7 @@ import org.jooby.Env; import org.jooby.Env.ServiceKey; import org.jooby.Jooby.Module; +import org.jooby.Registry; import org.jooby.jdbc.Jdbc; import org.slf4j.bridge.SLF4JBridgeHandler; @@ -588,6 +592,28 @@ public void configure(final Env env, final Config conf, final Binder binder) { if (callback != null) { callback.accept(conf, builder); } + List> proxies = new ArrayList<>(); + statements.stream() + .map(ProxyStatementListener::new) + .forEach(proxy -> { + builder.addStatementListener(proxy); + proxies.add(proxy); + }); + + states.stream() + .map(ProxyEntityStateListener::new) + .forEach(proxy -> { + builder.addEntityStateListener(proxy); + proxies.add(proxy); + }); + + transactions.stream() + .map(ProxyTransactionListener::new) + .forEach(proxy -> { + builder.addTransactionListenerFactory(() -> proxy); + proxies.add(proxy); + }); + Configuration configuration = builder.build(); Object newStore = store.apply(configuration); @@ -611,12 +637,7 @@ public void configure(final Env env, final Config conf, final Binder binder) { env.onStart(registry -> { schema(conf, schema, schema -> new SchemaModifier(dataSource, model).createTables(schema)); - states - .forEach(t -> builder.addEntityStateListener((EntityStateListener) registry.require(t))); - statements - .forEach(t -> builder.addStatementListener((StatementListener) registry.require(t))); - transactions.forEach(t -> builder - .addTransactionListenerFactory(() -> (TransactionListener) registry.require(t))); + proxies.forEach(consumer -> consumer.accept(registry)); }); } diff --git a/modules/jooby-requery/src/test/java/org/jooby/requery/RequeryTest.java b/modules/jooby-requery/src/test/java/org/jooby/requery/RequeryTest.java index 9056df2e49..9cae624f2c 100644 --- a/modules/jooby-requery/src/test/java/org/jooby/requery/RequeryTest.java +++ b/modules/jooby-requery/src/test/java/org/jooby/requery/RequeryTest.java @@ -28,16 +28,21 @@ import io.requery.sql.StatementListener; import io.requery.sql.TableCreationMode; import io.requery.util.function.Supplier; + import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; + import org.jooby.Env; import org.jooby.Env.ServiceKey; import org.jooby.Registry; import org.jooby.test.MockUnit; import org.jooby.test.MockUnit.Block; import org.jooby.funzy.Throwing; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -339,10 +344,8 @@ public void preUpdate(final Object entity) { .expect(eds) .expect(unit -> { ConfigurationBuilder builder = unit.get(ConfigurationBuilder.class); - expect(builder.addEntityStateListener(listener)).andReturn(builder); - - Registry registry = unit.get(Registry.class); - expect(registry.require(MyListener.class)).andReturn(listener); + expect(builder.addEntityStateListener(isA(ProxyEntityStateListener.class))) + .andReturn(builder); }) .run(unit -> { new Requery(unit.get(EntityModel.class)) @@ -396,10 +399,8 @@ public void afterExecuteQuery(final Statement statement) { .expect(eds) .expect(unit -> { ConfigurationBuilder builder = unit.get(ConfigurationBuilder.class); - expect(builder.addStatementListener(listener)).andReturn(builder); - - Registry registry = unit.get(Registry.class); - expect(registry.require(MyListener.class)).andReturn(listener); + expect(builder.addStatementListener(isA(ProxyStatementListener.class))) + .andReturn(builder); }) .run(unit -> { new Requery(unit.get(EntityModel.class)) @@ -453,9 +454,6 @@ public void afterRollback(final Set> types) { ConfigurationBuilder builder = unit.get(ConfigurationBuilder.class); expect(builder.addTransactionListenerFactory(unit.capture(Supplier.class))) .andReturn(builder); - - Registry registry = unit.get(Registry.class); - expect(registry.require(MyListener.class)).andReturn(listener); }) .run(unit -> { new Requery(unit.get(EntityModel.class)) @@ -464,7 +462,8 @@ public void afterRollback(final Set> types) { }, unit -> { unit.captured(Throwing.Consumer.class).iterator().next() .accept(unit.get(Registry.class)); - assertEquals(listener, unit.captured(Supplier.class).iterator().next().get()); + assertTrue(unit.captured(Supplier.class).iterator().next() + .get() instanceof ProxyTransactionListener); }); } diff --git a/modules/jooby-rocker/README.md b/modules/jooby-rocker/README.md index 6b7974e67c..45f0334f86 100644 --- a/modules/jooby-rocker/README.md +++ b/modules/jooby-rocker/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-rocker) -[](https://javadoc.io/doc/org.jooby/jooby-rocker/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-rocker/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-rocker/1.6.6) [](http://jooby.org/doc/rocker) # rocker @@ -17,7 +17,7 @@ Java 8 optimized, memory efficient, speedy template engine producing statically org.jooby jooby-rocker - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index d58532cadf..8e6222f650 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 jooby-rocker jooby-rocker diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 5451091af2..78a1253d8f 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-run/src/main/java/org/jooby/run/Watcher.java b/modules/jooby-run/src/main/java/org/jooby/run/Watcher.java index 7661972069..a6cd8b9be0 100644 --- a/modules/jooby-run/src/main/java/org/jooby/run/Watcher.java +++ b/modules/jooby-run/src/main/java/org/jooby/run/Watcher.java @@ -203,7 +203,6 @@ */ package org.jooby.run; -import com.sun.nio.file.SensitivityWatchEventModifier; import static java.nio.file.LinkOption.NOFOLLOW_LINKS; import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; @@ -212,6 +211,8 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; import java.nio.file.Files; @@ -231,7 +232,18 @@ */ public class Watcher { - private static final WatchEvent.Modifier HIGH = SensitivityWatchEventModifier.HIGH; + private static final WatchEvent.Modifier HIGH = modifier("HIGH"); + + public static WatchEvent.Modifier modifier(String name) { + try { + Class e = Watcher.class.getClassLoader() + .loadClass("com.sun.nio.file.SensitivityWatchEventModifier"); + Method m = e.getDeclaredMethod("valueOf", String.class); + return (WatchEvent.Modifier) m.invoke(null, name); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException x) { + return () -> name; + } + } private final WatchService watcher; private volatile Map keys; @@ -240,7 +252,7 @@ public class Watcher { private volatile boolean stopped = false; public Watcher(final BiConsumer, Path> listener, final Path... dirs) - throws IOException { + throws IOException { this.watcher = FileSystems.getDefault().newWatchService(); this.keys = new HashMap<>(); this.listener = listener; @@ -275,7 +287,8 @@ public void stop() { * Register the given directory with the WatchService */ private void register(final Path dir) throws IOException { - WatchKey key = dir.register(watcher, new Kind[]{ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY }, HIGH); + WatchKey key = dir + .register(watcher, new Kind[]{ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY}, HIGH); keys.put(key, dir); } diff --git a/modules/jooby-rxjava-jdbc/README.md b/modules/jooby-rxjava-jdbc/README.md index 8ab7f81a08..d67c885578 100644 --- a/modules/jooby-rxjava-jdbc/README.md +++ b/modules/jooby-rxjava-jdbc/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-rxjava-jdbc) -[](https://javadoc.io/doc/org.jooby/jooby-rxjava-jdbc/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-rxjava-jdbc/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-rxjava-jdbc/1.6.6) [](http://jooby.org/doc/rxjava-jdbc) # rxjdbc @@ -13,7 +13,7 @@ org.jooby jooby-rxjava-jdbc - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-rxjava-jdbc/pom.xml b/modules/jooby-rxjava-jdbc/pom.xml index 2d915e751d..9750d8e606 100644 --- a/modules/jooby-rxjava-jdbc/pom.xml +++ b/modules/jooby-rxjava-jdbc/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-rxjava/README.md b/modules/jooby-rxjava/README.md index 8b46a6915a..f908144d9e 100644 --- a/modules/jooby-rxjava/README.md +++ b/modules/jooby-rxjava/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-rxjava) -[](https://javadoc.io/doc/org.jooby/jooby-rxjava/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-rxjava/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-rxjava/1.6.6) [](http://jooby.org/doc/rxjava) # rxjava @@ -13,7 +13,7 @@ RxJava is a Java VM implementation of Reactive Ext org.jooby jooby-rxjava - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-rxjava/pom.xml b/modules/jooby-rxjava/pom.xml index 7f58f614c1..db2defa0e8 100644 --- a/modules/jooby-rxjava/pom.xml +++ b/modules/jooby-rxjava/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-scanner/README.md b/modules/jooby-scanner/README.md index 9d792bd354..f149cdfbfb 100644 --- a/modules/jooby-scanner/README.md +++ b/modules/jooby-scanner/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-scanner) -[](https://javadoc.io/doc/org.jooby/jooby-scanner/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-scanner/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-scanner/1.6.6) [](http://jooby.org/doc/scanner) # scanner @@ -13,7 +13,7 @@ This module provides `class-path` scanning services for `MVC routes`, `services` org.jooby jooby-scanner - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-scanner/pom.xml b/modules/jooby-scanner/pom.xml index 2e959756d4..5c49059510 100644 --- a/modules/jooby-scanner/pom.xml +++ b/modules/jooby-scanner/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 @@ -39,8 +39,8 @@ - io.github.lukehutch - fast-classpath-scanner + io.github.classgraph + classgraph diff --git a/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java b/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java index 7727b2a36a..ebb8317bce 100644 --- a/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java +++ b/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java @@ -211,14 +211,16 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.typesafe.config.Config; -import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner; -import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult; +import io.github.classgraph.ClassGraph; +import io.github.classgraph.ClassInfo; +import io.github.classgraph.ScanResult; import org.jooby.Env; import org.jooby.Jooby; import org.jooby.Router; import org.jooby.funzy.Throwing; -import static org.jooby.funzy.Throwing.throwingConsumer; + import static org.jooby.funzy.Throwing.throwingSupplier; + import org.jooby.mvc.Path; import javax.annotation.PostConstruct; @@ -399,7 +401,8 @@ public void configure(final Env env, final Config conf, final Binder binder) { Set spec = Sets.newLinkedHashSet(packages); serviceTypes.forEach(it -> spec.add(it.getPackage().getName())); - FastClasspathScanner scanner = new FastClasspathScanner(spec.toArray(new String[spec.size()])); + ClassGraph scanner = new ClassGraph().enableAllInfo() + .whitelistPackages(spec.toArray(new String[spec.size()])); Router routes = env.router(); @@ -415,24 +418,26 @@ public void configure(final Env env, final Config conf, final Binder binder) { env.lifeCycle(klass); }; - ScanResult result = scanner.scan(conf.getInt("runtime.processors") + 1); + ScanResult result = scanner.scan(); - Predicate inPackage = name -> packages.stream() - .anyMatch(name::startsWith); + Predicate inPackage = c -> packages.stream() + .anyMatch(c.getName()::startsWith); /** Controllers: */ - result.getNamesOfClassesWithAnnotation(Path.class) + result.getClassesWithAnnotation(Path.class.getName()) .stream() .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(routes::use); String mainClass = conf.getString("application.class"); /** Apps: */ - result.getNamesOfSubclassesOf(Jooby.class) + result.getSubclasses(Jooby.class.getName()) .stream() .filter(once) + .map(ClassInfo::getName) .filter(name -> !name.equals(mainClass)) .map(loadClass) .filter(C) @@ -441,9 +446,10 @@ public void configure(final Env env, final Config conf, final Binder binder) { /** Annotated with: */ serviceTypes.stream() .filter(A) - .forEach(a -> result.getNamesOfClassesWithAnnotation(a) + .forEach(a -> result.getClassesWithAnnotation(a.getName()) .stream() .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(bind)); @@ -452,10 +458,11 @@ public void configure(final Env env, final Config conf, final Binder binder) { serviceTypes.stream() .filter(I) .filter(type -> type != Jooby.Module.class && type != Module.class && type != Service.class) - .forEach(i -> result.getNamesOfClassesImplementing(i) + .forEach(i -> result.getClassesImplementing(i.getName()) .stream() .filter(inPackage) .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(bind)); @@ -463,20 +470,22 @@ public void configure(final Env env, final Config conf, final Binder binder) { /** SubclassOf: */ serviceTypes.stream() .filter(S) - .forEach(k -> result.getNamesOfSubclassesOf(k) + .forEach(k -> result.getSubclasses(k.getName()) .stream() .filter(inPackage) .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(bind)); /** Guice modules: */ if (serviceTypes.contains(Module.class)) { - result.getNamesOfClassesImplementing(Module.class) + result.getClassesImplementing(Module.class.getName()) .stream() .filter(inPackage) .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(klass -> ((Module) newObject(klass)).configure(binder)); @@ -485,10 +494,11 @@ public void configure(final Env env, final Config conf, final Binder binder) { /** Guava services: */ if (serviceTypes.contains(Service.class)) { Set> guavaServices = new HashSet<>(); - result.getNamesOfClassesImplementing(Service.class) + result.getClassesImplementing(Service.class.getName()) .stream() .filter(inPackage) .filter(once) + .map(ClassInfo::getName) .map(loadClass) .filter(C) .forEach(guavaServices::add); diff --git a/modules/jooby-scanner/src/test/java/org/jooby/scanner/ScannerTest.java b/modules/jooby-scanner/src/test/java/org/jooby/scanner/ScannerTest.java deleted file mode 100644 index 679e6a14b5..0000000000 --- a/modules/jooby-scanner/src/test/java/org/jooby/scanner/ScannerTest.java +++ /dev/null @@ -1,448 +0,0 @@ -package org.jooby.scanner; - -import app.ns.AbsController; -import app.ns.AbsFoo; -import app.ns.FooApp; -import app.ns.FooController; -import app.ns.FooImpl; -import app.ns.FooModule; -import app.ns.FooSub; -import app.ns.GuavaService; -import app.ns.GuiceModule; -import app.ns.IFoo; -import app.ns.NamedFoo; -import app.ns.SingletonFoo; -import com.google.common.collect.Lists; -import com.google.common.util.concurrent.Service; -import com.google.common.util.concurrent.ServiceManager; -import com.google.inject.Binder; -import com.google.inject.Module; -import com.google.inject.binder.AnnotatedBindingBuilder; -import com.typesafe.config.Config; -import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner; -import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isA; -import org.jooby.Env; -import org.jooby.Jooby; -import org.jooby.Registry; -import org.jooby.Router; -import org.jooby.mvc.Path; -import org.jooby.test.MockUnit; -import org.jooby.test.MockUnit.Block; -import org.jooby.funzy.Throwing; -import static org.junit.Assert.assertEquals; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import javax.inject.Provider; -import java.util.Arrays; -import java.util.List; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({Scanner.class, FastClasspathScanner.class, FooModule.class, ServiceManager.class}) -public class ScannerTest { - - private Block routes = unit -> { - Env env = unit.get(Env.class); - expect(env.router()).andReturn(unit.get(Router.class)); - }; - - private Block runtimeProcessors = unit -> { - expect(unit.get(Config.class).getInt("runtime.processors")).andReturn(1); - }; - - @Test - public void newScanner() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .run(unit -> { - new Scanner() - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void newScannerWithSpec() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(runtimeProcessors) - .expect(scanResult("test.pkg")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .run(unit -> { - new Scanner("test.pkg") - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void scanController() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect(annotations(Path.class, FooController.class.getName())) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(unit -> { - Router routes = unit.get(Router.class); - expect(routes.use(FooController.class)).andReturn(null); - }) - .run(unit -> { - new Scanner() - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void scanApp() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class, FooApp.class.getName())) - .expect(appclass(ScannerTest.class.getName())) - .expect(unit -> { - Router routes = unit.get(Router.class); - expect(routes.use(isA(FooApp.class))).andReturn(routes); - }) - .run(unit -> { - new Scanner() - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("unchecked") - @Test - public void scanAnnotation() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns", "javax.inject", "com.google.inject.name")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(annotations(javax.inject.Named.class, NamedFoo.class.getName())) - .expect(annotations(com.google.inject.name.Named.class)) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - - AnnotatedBindingBuilder abb = unit.mock(AnnotatedBindingBuilder.class); - abb.asEagerSingleton(); - expect(binder.bind(NamedFoo.class)).andReturn(abb); - - Env env = unit.get(Env.class); - expect(env.lifeCycle(NamedFoo.class)).andReturn(env); - }) - .run(unit -> { - new Scanner() - .scan(javax.inject.Named.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("unchecked") - @Test - public void scanSingleton() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns", "javax.inject", "com.google.inject")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(annotations(javax.inject.Singleton.class, SingletonFoo.class.getName())) - .expect(annotations(com.google.inject.Singleton.class)) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - - AnnotatedBindingBuilder abb = unit.mock(AnnotatedBindingBuilder.class); - abb.asEagerSingleton(); - expect(binder.bind(SingletonFoo.class)).andReturn(abb); - - Env env = unit.get(Env.class); - expect(env.lifeCycle(SingletonFoo.class)).andReturn(env); - }) - .run(unit -> { - new Scanner() - .scan(javax.inject.Singleton.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("unchecked") - @Test - public void scanImplements() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(implementing(IFoo.class, FooImpl.class.getName())) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - - AnnotatedBindingBuilder abb = unit.mock(AnnotatedBindingBuilder.class); - abb.asEagerSingleton(); - expect(binder.bind(FooImpl.class)).andReturn(abb); - - Env env = unit.get(Env.class); - expect(env.lifeCycle(FooImpl.class)).andReturn(env); - }) - .run(unit -> { - new Scanner() - .scan(IFoo.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("unchecked") - @Test - public void scanSubclass() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(subClassesOf(AbsFoo.class, FooSub.class.getName())) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - - AnnotatedBindingBuilder abb = unit.mock(AnnotatedBindingBuilder.class); - abb.asEagerSingleton(); - expect(binder.bind(FooSub.class)).andReturn(abb); - - Env env = unit.get(Env.class); - expect(env.lifeCycle(FooSub.class)).andReturn(env); - }) - .run(unit -> { - new Scanner() - .scan(AbsFoo.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void scanGuiceModule() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns", "com.google.inject")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(implementing(Module.class, GuiceModule.class.getName())) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - expect(binder.bind(GuiceModule.class)).andReturn(null); - }) - .run(unit -> { - new Scanner() - .scan(Module.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("unchecked") - @Test - public void scanGuavaService() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class, Registry.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns", "com.google.common.util.concurrent")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(implementing(Service.class, GuavaService.class.getName())) - .expect(unit -> { - Binder binder = unit.get(Binder.class); - AnnotatedBindingBuilder abb = unit.mock(AnnotatedBindingBuilder.class); - abb.asEagerSingleton(); - expect(binder.bind(GuavaService.class)).andReturn(abb); - - AnnotatedBindingBuilder abbsm = unit.mock(AnnotatedBindingBuilder.class); - expect(abbsm.toProvider(unit.capture(Provider.class))).andReturn(abbsm); - expect(binder.bind(ServiceManager.class)).andReturn(abbsm); - - Env env = unit.get(Env.class); - expect(env.onStart(unit.capture(Throwing.Consumer.class))).andReturn(env); - expect(env.onStop(unit.capture(Throwing.Runnable.class))).andReturn(env); - }) - .expect(unit -> { - GuavaService service = unit.mock(GuavaService.class); - Registry registry = unit.get(Registry.class); - expect(registry.require(GuavaService.class)).andReturn(service); - - ServiceManager sm = unit.constructor(ServiceManager.class) - .build(Lists.newArrayList(service)); - - unit.registerMock(ServiceManager.class, sm); - - expect(sm.startAsync()).andReturn(sm); - sm.awaitHealthy(); - - expect(sm.stopAsync()).andReturn(sm); - sm.awaitStopped(); - }) - .run(unit -> { - new Scanner() - .scan(Service.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }, unit -> { - unit.captured(Throwing.Consumer.class).iterator().next().accept(unit.get(Registry.class)); - - assertEquals(unit.get(ServiceManager.class), - unit.captured(Provider.class).iterator().next().get()); - - unit.captured(Throwing.Runnable.class).iterator().next().run(); - }); - } - - @Test - public void scanEmptyGuavaService() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class, Registry.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns", "com.google.common.util.concurrent")) - .expect(routes) - .expect(annotations(Path.class)) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(implementing(Service.class)) - .run(unit -> { - new Scanner() - .scan(Service.class) - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void scanShouldCreateJustOneController() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect( - annotations(Path.class, FooController.class.getName(), FooController.class.getName())) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .expect(unit -> { - Router routes = unit.get(Router.class); - expect(routes.use(FooController.class)).andReturn(null); - }) - .run(unit -> { - new Scanner() - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @Test - public void scanShouldIgnoreAbsClasses() throws Exception { - new MockUnit(Env.class, Config.class, Binder.class, Router.class) - .expect(ns("app.ns")) - .expect(runtimeProcessors) - .expect(scanResult("app.ns")) - .expect(routes) - .expect( - annotations(Path.class, AbsController.class.getName())) - .expect(subClassesOf(Jooby.class)) - .expect(appclass(ScannerTest.class.getName())) - .run(unit -> { - new Scanner() - .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class)); - }); - } - - @SuppressWarnings("rawtypes") - private Block annotations(final Class type, final String... names) { - return annotations(type, Arrays.asList(names)); - } - - @SuppressWarnings("rawtypes") - private Block annotations(final Class type, final List classes) { - return unit -> { - ScanResult result = unit.get(ScanResult.class); - expect(result.getNamesOfClassesWithAnnotation(type)).andReturn(classes); - }; - } - - @SuppressWarnings("rawtypes") - private Block implementing(final Class type, final String... names) { - return implementing(type, Arrays.asList(names)); - } - - @SuppressWarnings("rawtypes") - private Block implementing(final Class type, final List classes) { - return unit -> { - ScanResult result = unit.get(ScanResult.class); - expect(result.getNamesOfClassesImplementing(type)) - .andReturn(classes); - }; - } - - @SuppressWarnings("rawtypes") - private Block subClassesOf(final Class type, final String... names) { - return subClassesOf(type, Arrays.asList(names)); - } - - @SuppressWarnings("rawtypes") - private Block subClassesOf(final Class type, final List classes) { - return unit -> { - ScanResult result = unit.get(ScanResult.class); - expect(result.getNamesOfSubclassesOf(type)) - .andReturn(classes); - }; - } - - private Block ns(final String pkg) { - return unit -> { - Config conf = unit.get(Config.class); - expect(conf.getString("application.ns")).andReturn(pkg); - }; - } - - private Block appclass(final String main) { - return unit -> { - Config conf = unit.get(Config.class); - expect(conf.getString("application.class")).andReturn(main); - }; - } - - private Block scanResult(final Object... spec) { - return unit -> { - FastClasspathScanner scanner = unit.constructor(FastClasspathScanner.class) - .args(String[].class) - .build(spec); - - ScanResult result = unit.mock(ScanResult.class); - - expect(scanner.scan(2)).andReturn(result); - - unit.registerMock(ScanResult.class, result); - }; - } -} diff --git a/modules/jooby-servlet/README.md b/modules/jooby-servlet/README.md index 66fd90591d..f910d06aee 100644 --- a/modules/jooby-servlet/README.md +++ b/modules/jooby-servlet/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-servlet) -[](https://javadoc.io/doc/org.jooby/jooby-servlet/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-servlet/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-servlet/1.6.6) [](http://jooby.org/doc/servlet) # servlets diff --git a/modules/jooby-servlet/pom.xml b/modules/jooby-servlet/pom.xml index 682419dbae..61d9602921 100644 --- a/modules/jooby-servlet/pom.xml +++ b/modules/jooby-servlet/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java b/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java index c4943bee11..cea546e372 100644 --- a/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java +++ b/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java @@ -369,6 +369,20 @@ public List files(final String name) throws IOException { } } + @Override + public List files() throws IOException { + try { + if (multipart) { + return req.getParts().stream() + .map(part -> new ServletUpload(part, tmpdir)) + .collect(Collectors.toList()); + } + return Collections.emptyList(); + } catch (ServletException ex) { + throw new IOException("Unable to get files", ex); + } + } + @Override public InputStream in() throws IOException { return req.getInputStream(); diff --git a/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletResponse.java b/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletResponse.java index bb9e8f35a5..409a33463c 100644 --- a/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletResponse.java +++ b/modules/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletResponse.java @@ -334,8 +334,6 @@ public void end() { } committed = true; } - req = null; - rsp = null; } protected void close() { diff --git a/modules/jooby-sitemap/README.md b/modules/jooby-sitemap/README.md index 99f1b45d58..a41fb19a8c 100644 --- a/modules/jooby-sitemap/README.md +++ b/modules/jooby-sitemap/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-sitemap) -[](https://javadoc.io/doc/org.jooby/jooby-sitemap/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-sitemap/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-sitemap/1.6.6) [](http://jooby.org/doc/sitemap) # sitemap @@ -15,7 +15,7 @@ Generate sitemap.xml files org.jooby jooby-sitemap - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-sitemap/pom.xml b/modules/jooby-sitemap/pom.xml index ceb17a761b..34d5ddc203 100644 --- a/modules/jooby-sitemap/pom.xml +++ b/modules/jooby-sitemap/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-spymemcached/README.md b/modules/jooby-spymemcached/README.md index 0be71fb679..bd7cd829e2 100644 --- a/modules/jooby-spymemcached/README.md +++ b/modules/jooby-spymemcached/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-spymemcached) -[](https://javadoc.io/doc/org.jooby/jooby-spymemcached/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-spymemcached/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-spymemcached/1.6.6) [](http://jooby.org/doc/spymemcached) # spymemcached @@ -15,7 +15,7 @@ Provides memcached access via [SpyMemcached](https://github.com/dustin/java-memc org.jooby jooby-spymemcached - 1.5.0 + 1.6.6 ``` @@ -65,7 +65,7 @@ or programmatically: org.jooby jooby-spymemcached - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-spymemcached/pom.xml b/modules/jooby-spymemcached/pom.xml index f9db27dac2..298b8e5207 100644 --- a/modules/jooby-spymemcached/pom.xml +++ b/modules/jooby-spymemcached/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-thymeleaf/README.md b/modules/jooby-thymeleaf/README.md index a6ccc5c9ce..af62c4ea11 100644 --- a/modules/jooby-thymeleaf/README.md +++ b/modules/jooby-thymeleaf/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-thymeleaf) -[](https://javadoc.io/doc/org.jooby/jooby-thymeleaf/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-thymeleaf/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-thymeleaf/1.6.6) [](http://jooby.org/doc/thymeleaf) # thymeleaf @@ -11,7 +11,7 @@ org.jooby jooby-thymeleaf - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 5e409effe5..f45599d93a 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-unbescape/README.md b/modules/jooby-unbescape/README.md index 373ab90695..5f8da4709b 100644 --- a/modules/jooby-unbescape/README.md +++ b/modules/jooby-unbescape/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-unbescape) -[](https://javadoc.io/doc/org.jooby/jooby-unbescape/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-unbescape/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-unbescape/1.6.6) [](http://jooby.org/doc/unbescape) # unbescape @@ -11,7 +11,7 @@ org.jooby jooby-unbescape - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-unbescape/pom.xml b/modules/jooby-unbescape/pom.xml index 0f41cda346..d0037ceddd 100644 --- a/modules/jooby-unbescape/pom.xml +++ b/modules/jooby-unbescape/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-undertow/README.md b/modules/jooby-undertow/README.md index ec3795a17b..4381490a61 100644 --- a/modules/jooby-undertow/README.md +++ b/modules/jooby-undertow/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-undertow) -[](https://javadoc.io/doc/org.jooby/jooby-undertow/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-undertow/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-undertow/1.6.6) [](http://jooby.org/doc/undertow) # undertow @@ -15,7 +15,7 @@ org.jooby jooby-undertow - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-undertow/pom.xml b/modules/jooby-undertow/pom.xml index a421d91e80..adef4b78ce 100644 --- a/modules/jooby-undertow/pom.xml +++ b/modules/jooby-undertow/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/LogIoCallback.java b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/LogIoCallback.java index 8e79a30792..a2d120aa41 100644 --- a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/LogIoCallback.java +++ b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/LogIoCallback.java @@ -204,7 +204,9 @@ package org.jooby.internal.undertow; import java.io.IOException; +import java.nio.channels.ClosedChannelException; +import org.jooby.internal.ConnectionResetByPeer; import org.jooby.spi.NativeResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -232,7 +234,9 @@ public void onComplete(final HttpServerExchange exchange, final Sender sender) { @Override public void onException(final HttpServerExchange exchange, final Sender sender, final IOException x) { - log.error("execution of {} resulted in exception", exchange.getRequestPath(), x); + if (!(x instanceof ClosedChannelException)) { + log.error("execution of {} resulted in exception", exchange.getRequestPath(), x); + } callback.onException(exchange, sender, x); } diff --git a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java index 86f4262131..0416c868db 100644 --- a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java +++ b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java @@ -208,14 +208,12 @@ import java.io.InputStream; import java.net.InetAddress; import java.net.URLDecoder; -import java.util.Collections; -import java.util.Deque; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.concurrent.Executor; import java.util.stream.Collectors; +import java.util.stream.StreamSupport; -import io.undertow.server.handlers.form.FormDataParser; +import io.undertow.server.handlers.form.*; import org.jooby.Cookie; import org.jooby.MediaType; import org.jooby.Router; @@ -233,10 +231,7 @@ import io.undertow.server.BlockingHttpExchange; import io.undertow.server.HttpServerExchange; -import io.undertow.server.handlers.form.FormData; import io.undertow.server.handlers.form.FormData.FormValue; -import io.undertow.server.handlers.form.FormEncodedDataDefinition; -import io.undertow.server.handlers.form.MultiPartParserDefinition; import io.undertow.util.AttachmentKey; import io.undertow.util.HeaderValues; import io.undertow.util.HttpString; @@ -357,6 +352,21 @@ public List files(final String name) { return builder.build(); } + @Override + public List files() throws IOException { + FormData formData = parseForm(); + Iterator keyIterator = formData.iterator(); + Iterable iterableKeys = () -> keyIterator; + List retVal = StreamSupport.stream(iterableKeys.spliterator(), true) + .map(formData::get) + .filter(formValues -> formValues.peekFirst().isFileItem()) + .flatMap(Collection::stream) + .map(UndertowUpload::new) + .collect(Collectors.toList()); + + return Collections.unmodifiableList(retVal); + } + @Override public InputStream in() { blocking.get(); @@ -410,25 +420,22 @@ private FormData parseForm() { try { String tmpdir = conf.getString("application.tmpdir"); String charset = conf.getString("application.charset"); - String value = exchange.getRequestHeaders().getFirst("Content-Type"); - if (value != null) { - MediaType type = MediaType.valueOf(value); - if (MediaType.form.name().equals(type.name())) { - blocking.get(); - form = new FormEncodedDataDefinition() - .setDefaultEncoding(charset) - .create(exchange) - .parseBlocking(); - } else if (MediaType.multipart.name().equals(type.name())) { - blocking.get(); - form = new MultiPartParserDefinition() + + FormEncodedDataDefinition encodedParser = new FormEncodedDataDefinition().setDefaultEncoding(charset); + MultiPartParserDefinition multiPartParser = new MultiPartParserDefinition() .setTempFileLocation(new File(tmpdir).toPath()) - .setDefaultEncoding(charset) - .create(exchange) - .parseBlocking(); - } - } - } catch (IOException x) { + .setDefaultEncoding(charset); + blocking.get(); + FormDataParser parser = FormParserFactory + .builder(false) + .addParser(encodedParser) + .addParser(multiPartParser) + .build() + .createParser(exchange); + + form = parser != null ? parser.parseBlocking() : NO_FORM; + } catch (IOException iox) { + throw new IllegalArgumentException("Bad Request...", iox); } } return form; diff --git a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java index 81ee01cbc1..7a1d60bf05 100644 --- a/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java +++ b/modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java @@ -268,7 +268,8 @@ public void send(final byte[] bytes) throws Exception { @Override public void send(final ByteBuffer buffer) throws Exception { - exchange.getResponseSender().send(buffer); + endExchange = false; + exchange.getResponseSender().send(buffer, new LogIoCallback(IoCallback.END_EXCHANGE)); } @Override diff --git a/modules/jooby-whoops/README.md b/modules/jooby-whoops/README.md index 9f05af05ca..69ca0eef4a 100644 --- a/modules/jooby-whoops/README.md +++ b/modules/jooby-whoops/README.md @@ -1,5 +1,5 @@ -[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-whoops) -[](https://javadoc.io/doc/org.jooby/jooby-whoops/1.5.0) +[](http://mvnrepository.com/artifact/org.jooby/jooby-whoops/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-whoops/1.6.6) [](http://jooby.org/doc/whoops) # whoops @@ -15,7 +15,7 @@ Pretty error page that helps you debug your web application. org.jooby jooby-whoops - 1.5.0 + 1.6.6 ``` diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index ee659ecb8b..94507ea4cf 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -5,7 +5,7 @@ org.jooby modules - 1.5.1-SNAPSHOT + 1.6.9 4.0.0 diff --git a/modules/jooby-yasson/README.md b/modules/jooby-yasson/README.md new file mode 100644 index 0000000000..41cc52faf4 --- /dev/null +++ b/modules/jooby-yasson/README.md @@ -0,0 +1,60 @@ +[](http://mvnrepository.com/artifact/org.jooby/jooby-yasson/1.6.6) +[](https://javadoc.io/doc/org.jooby/jooby-yasson/1.6.6) +[](http://jooby.org/doc/yasson) +# yasson + +JSON support via [yasson](https://github.com/eclipse-ee4j/yasson) library. + +## exports + +* [json-b](http://json-b.net/users-guide.html) +* [Parser](/apidocs/org/jooby/Parser.html) +* [Renderer](/apidocs/org/jooby/Renderer.html) + +## dependency + +```xml + + org.jooby + jooby-yasson + 1.6.6 + +``` + +## usage + +```java +import org.jooby.json.Yasson; + +{ + use(new Yasson()); + + // sending + get("/my-api", req -> new MyObject()); + + // receiving a json body + post("/my-api", req -> { + MyObject obj = req.body(MyObject.class); + return obj; + }); + + // direct access to Jsonb + get("/access", req -> { + Jsonb jsonb = require(Jsonb.class); + // ... + }); +} +``` + +### configuration + +If you need a special setting or configuration for your [json-b](http://json-b.net/users-guide.html): + +```java +{ + use(new Yasson().doWith(builder -> { + builder.withFormatting(true); + // ... + }); +} +``` diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml new file mode 100644 index 0000000000..4c3eafe522 --- /dev/null +++ b/modules/jooby-yasson/pom.xml @@ -0,0 +1,94 @@ + + + + + org.jooby + modules + 1.6.9 + + + 4.0.0 + jooby-yasson + + yasson module + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + **/*Feature.java + **/Issue*.java + + + + + + + + + + + org.jooby + jooby + ${project.version} + + + + + org.eclipse + yasson + + + + org.glassfish + javax.json + + + + + org.jooby + jooby + ${project.version} + test + tests + + + + junit + junit + test + + + + org.easymock + easymock + test + + + + org.powermock + powermock-api-easymock + test + + + + org.powermock + powermock-module-junit4 + test + + + + org.jacoco + org.jacoco.agent + runtime + test + + + + \ No newline at end of file diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/Yasson.java b/modules/jooby-yasson/src/main/java/org/jooby/json/Yasson.java new file mode 100644 index 0000000000..652df9c408 --- /dev/null +++ b/modules/jooby-yasson/src/main/java/org/jooby/json/Yasson.java @@ -0,0 +1,380 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.json; + +import static java.util.Objects.requireNonNull; + +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +import javax.json.Json; +import javax.json.bind.Jsonb; +import javax.json.bind.JsonbBuilder; +import javax.json.bind.JsonbConfig; + +import org.jooby.Env; +import org.jooby.Jooby; +import org.jooby.MediaType; +import org.jooby.Parser; +import org.jooby.Renderer; + +import com.google.inject.Binder; +import com.google.inject.multibindings.Multibinder; +import com.typesafe.config.Config; + +/** + * JSON support via Yasson library. + * + * exposes + * + * + * A {@link Jsonb} + * A {@link Parser} + * A {@link Renderer} + * + * + * usage + * + * + * { + * use(new Yasson()); + * + * // sending + * get("/my-api", req {@literal ->} new MyObject()); + * + * // receiving a json body + * post("/my-api", req {@literal ->} { + * MyObject obj = req.body(MyObject.class); + * return obj; + * }); + * + * // direct access to Jsonb + * get("/access", req {@literal ->} { + * Jsonb jsonb = req.require(Jsonb.class); + * // ... + * }); + * } + * + * + * configuration + * + * + * If you need a special setting or configuration for your {@link Jsonb}: + * + * + * + * { + * use(new Yasson().doWith(builder {@literal ->} { + * builder.withFormatting(true); + * // ... + * }); + * } + * + * + * @author Daniel Dias + * @since 1.6.0 + */ +public class Yasson implements Jooby.Module { + + private final MediaType type; + + private BiConsumer configurer; + + private boolean raw; + + /** + * Creates a new {@link Jsonb}. + * + * @param type {@link MediaType} to use. + */ + public Yasson(final MediaType type) { + this.type = requireNonNull(type, "Media type is required."); + } + + /** + * Creates a new {@link Jsonb} and set type to: {@link MediaType#json}. + * + */ + public Yasson() { + this(MediaType.json); + } + + /** + * Configurer callback. + * + * + * { + * use(new Yasson().doWith(builder {@literal ->} { + * builder.withFormatting(true); + * // ... + * }); + * } + * + * + * @param configurer A callback. + * @return This instance. + */ + public Yasson doWith(final BiConsumer configurer) { + this.configurer = requireNonNull(configurer, "Configurer callback is required."); + return this; + } + + /** + * Configurer callback. + * + * + * { + * use(new Yasson().doWith((builder, config) {@literal ->} { + * builder.withFormatting(true); + * // ... + * }); + * } + * + * + * @param configurer A callback. + * @return This instance. + */ + public Yasson doWith(final Consumer configurer) { + requireNonNull(configurer, "Configurer callback is required."); + this.configurer = (jsonConfig, conf) -> configurer.accept(jsonConfig); + return this; + } + + @Override + public void configure(final Env env, final Config config, final Binder binder) { + JsonbConfig jsonbConfig = new JsonbConfig(); + + if (configurer != null) { + configurer.accept(jsonbConfig, config); + } + + Jsonb jsonb = JsonbBuilder.create(jsonbConfig); + + binder.bind(Jsonb.class).toInstance(jsonb); + + Multibinder.newSetBinder(binder, Parser.class).addBinding().toInstance(new YassonParser(type, jsonb)); + + YassonRenderer renderer = raw ? new YassonRawRenderer(type, jsonb) : new YassonRenderer(type, jsonb); + + Multibinder.newSetBinder(binder, Renderer.class).addBinding().toInstance(renderer); + } + + /** + * Add support raw string json responses: + * + * {@code + * { + * get("/raw", () -> { + * return "{\"raw\": \"json\"}"; + * }); + * } + * } + * + * @return This module. + */ + public Yasson raw() { + raw = true; + return this; + } +} \ No newline at end of file diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java new file mode 100644 index 0000000000..4113412e9b --- /dev/null +++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java @@ -0,0 +1,249 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.json; + +import static java.util.Objects.requireNonNull; +import javax.json.bind.Jsonb; + +import org.jooby.MediaType; +import org.jooby.Parser; +import org.jooby.Parser.Context; + +import com.google.inject.TypeLiteral; + + /** + * @author Daniel Dias + * @since 1.6.0 + */ +class YassonParser implements Parser { + + private final MediaType type; + + private final Jsonb jsonb; + + public YassonParser(final MediaType type, final Jsonb jsonb) { + this.type = requireNonNull(type, "Media type is required."); + this.jsonb = requireNonNull(jsonb, "Jsonb is required."); + } + + @Override + public Object parse(final TypeLiteral type, final Context ctx) throws Throwable { + MediaType ctype = ctx.type(); + if (ctype.isAny()) { + return ctx.next(); + } + + if (ctype.matches(this.type)) { + return ctx + .ifbody(body -> jsonb.fromJson(body.text(), type.getType())) + .ifparam(values -> jsonb.fromJson(values.first(), type.getType())); + } + return ctx.next(); + } + + @Override + public String toString() { + return "yasson"; + } +} \ No newline at end of file diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java new file mode 100644 index 0000000000..47169063b6 --- /dev/null +++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java @@ -0,0 +1,229 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jooby.json; + +import javax.json.bind.Jsonb; + +import org.jooby.MediaType; + +/** + * @author Daniel Dias + * @since 1.6.0 + */ +public class YassonRawRenderer extends YassonRenderer { + + public YassonRawRenderer(MediaType type, Jsonb jsonb) { + super(type, jsonb); + } + + @Override + public void render(Object value, Context ctx) throws Exception { + if (value instanceof CharSequence) { + ctx.type(type).send(value.toString()); + } else { + super.render(value, ctx); + } + } +} \ No newline at end of file diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java new file mode 100644 index 0000000000..7fcebdc205 --- /dev/null +++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java @@ -0,0 +1,245 @@ +/** + * Apache License + * Version 2.0, January 2004 + * http://www.apache.org/licenses/ + * + * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + * + * 1. Definitions. + * + * "License" shall mean the terms and conditions for use, reproduction, + * and distribution as defined by Sections 1 through 9 of this document. + * + * "Licensor" shall mean the copyright owner or entity authorized by + * the copyright owner that is granting the License. + * + * "Legal Entity" shall mean the union of the acting entity and all + * other entities that control, are controlled by, or are under common + * control with that entity. For the purposes of this definition, + * "control" means (i) the power, direct or indirect, to cause the + * direction or management of such entity, whether by contract or + * otherwise, or (ii) ownership of fifty percent (50%) or more of the + * outstanding shares, or (iii) beneficial ownership of such entity. + * + * "You" (or "Your") shall mean an individual or Legal Entity + * exercising permissions granted by this License. + * + * "Source" form shall mean the preferred form for making modifications, + * including but not limited to software source code, documentation + * source, and configuration files. + * + * "Object" form shall mean any form resulting from mechanical + * transformation or translation of a Source form, including but + * not limited to compiled object code, generated documentation, + * and conversions to other media types. + * + * "Work" shall mean the work of authorship, whether in Source or + * Object form, made available under the License, as indicated by a + * copyright notice that is included in or attached to the work + * (an example is provided in the Appendix below). + * + * "Derivative Works" shall mean any work, whether in Source or Object + * form, that is based on (or derived from) the Work and for which the + * editorial revisions, annotations, elaborations, or other modifications + * represent, as a whole, an original work of authorship. For the purposes + * of this License, Derivative Works shall not include works that remain + * separable from, or merely link (or bind by name) to the interfaces of, + * the Work and Derivative Works thereof. + * + * "Contribution" shall mean any work of authorship, including + * the original version of the Work and any modifications or additions + * to that Work or Derivative Works thereof, that is intentionally + * submitted to Licensor for inclusion in the Work by the copyright owner + * or by an individual or Legal Entity authorized to submit on behalf of + * the copyright owner. For the purposes of this definition, "submitted" + * means any form of electronic, verbal, or written communication sent + * to the Licensor or its representatives, including but not limited to + * communication on electronic mailing lists, source code control systems, + * and issue tracking systems that are managed by, or on behalf of, the + * Licensor for the purpose of discussing and improving the Work, but + * excluding communication that is conspicuously marked or otherwise + * designated in writing by the copyright owner as "Not a Contribution." + * + * "Contributor" shall mean Licensor and any individual or Legal Entity + * on behalf of whom a Contribution has been received by Licensor and + * subsequently incorporated within the Work. + * + * 2. Grant of Copyright License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * copyright license to reproduce, prepare Derivative Works of, + * publicly display, publicly perform, sublicense, and distribute the + * Work and such Derivative Works in Source or Object form. + * + * 3. Grant of Patent License. Subject to the terms and conditions of + * this License, each Contributor hereby grants to You a perpetual, + * worldwide, non-exclusive, no-charge, royalty-free, irrevocable + * (except as stated in this section) patent license to make, have made, + * use, offer to sell, sell, import, and otherwise transfer the Work, + * where such license applies only to those patent claims licensable + * by such Contributor that are necessarily infringed by their + * Contribution(s) alone or by combination of their Contribution(s) + * with the Work to which such Contribution(s) was submitted. If You + * institute patent litigation against any entity (including a + * cross-claim or counterclaim in a lawsuit) alleging that the Work + * or a Contribution incorporated within the Work constitutes direct + * or contributory patent infringement, then any patent licenses + * granted to You under this License for that Work shall terminate + * as of the date such litigation is filed. + * + * 4. Redistribution. You may reproduce and distribute copies of the + * Work or Derivative Works thereof in any medium, with or without + * modifications, and in Source or Object form, provided that You + * meet the following conditions: + * + * (a) You must give any other recipients of the Work or + * Derivative Works a copy of this License; and + * + * (b) You must cause any modified files to carry prominent notices + * stating that You changed the files; and + * + * (c) You must retain, in the Source form of any Derivative Works + * that You distribute, all copyright, patent, trademark, and + * attribution notices from the Source form of the Work, + * excluding those notices that do not pertain to any part of + * the Derivative Works; and + * + * (d) If the Work includes a "NOTICE" text file as part of its + * distribution, then any Derivative Works that You distribute must + * include a readable copy of the attribution notices contained + * within such NOTICE file, excluding those notices that do not + * pertain to any part of the Derivative Works, in at least one + * of the following places: within a NOTICE text file distributed + * as part of the Derivative Works; within the Source form or + * documentation, if provided along with the Derivative Works; or, + * within a display generated by the Derivative Works, if and + * wherever such third-party notices normally appear. The contents + * of the NOTICE file are for informational purposes only and + * do not modify the License. You may add Your own attribution + * notices within Derivative Works that You distribute, alongside + * or as an addendum to the NOTICE text from the Work, provided + * that such additional attribution notices cannot be construed + * as modifying the License. + * + * You may add Your own copyright statement to Your modifications and + * may provide additional or different license terms and conditions + * for use, reproduction, or distribution of Your modifications, or + * for any such Derivative Works as a whole, provided Your use, + * reproduction, and distribution of the Work otherwise complies with + * the conditions stated in this License. + * + * 5. Submission of Contributions. Unless You explicitly state otherwise, + * any Contribution intentionally submitted for inclusion in the Work + * by You to the Licensor shall be under the terms and conditions of + * this License, without any additional terms or conditions. + * Notwithstanding the above, nothing herein shall supersede or modify + * the terms of any separate license agreement you may have executed + * with Licensor regarding such Contributions. + * + * 6. Trademarks. This License does not grant permission to use the trade + * names, trademarks, service marks, or product names of the Licensor, + * except as required for reasonable and customary use in describing the + * origin of the Work and reproducing the content of the NOTICE file. + * + * 7. Disclaimer of Warranty. Unless required by applicable law or + * agreed to in writing, Licensor provides the Work (and each + * Contributor provides its Contributions) on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied, including, without limitation, any warranties or conditions + * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + * PARTICULAR PURPOSE. You are solely responsible for determining the + * appropriateness of using or redistributing the Work and assume any + * risks associated with Your exercise of permissions under this License. + * + * 8. Limitation of Liability. In no event and under no legal theory, + * whether in tort (including negligence), contract, or otherwise, + * unless required by applicable law (such as deliberate and grossly + * negligent acts) or agreed to in writing, shall any Contributor be + * liable to You for damages, including any direct, indirect, special, + * incidental, or consequential damages of any character arising as a + * result of this License or out of the use or inability to use the + * Work (including but not limited to damages for loss of goodwill, + * work stoppage, computer failure or malfunction, or any and all + * other commercial damages or losses), even if such Contributor + * has been advised of the possibility of such damages. + * + * 9. Accepting Warranty or Additional Liability. While redistributing + * the Work or Derivative Works thereof, You may choose to offer, + * and charge a fee for, acceptance of support, warranty, indemnity, + * or other liability obligations and/or rights consistent with this + * License. However, in accepting such obligations, You may act only + * on Your own behalf and on Your sole responsibility, not on behalf + * of any other Contributor, and only if You agree to indemnify, + * defend, and hold each Contributor harmless for any liability + * incurred by, or claims asserted against, such Contributor by reason + * of your accepting any such warranty or additional liability. + * + * END OF TERMS AND CONDITIONS + * + * APPENDIX: How to apply the Apache License to your work. + * + * To apply the Apache License to your work, attach the following + * boilerplate notice, with the fields enclosed by brackets "{}" + * replaced with your own identifying information. (Don't include + * the brackets!) The text should be enclosed in the appropriate + * comment syntax for the file format. We also recommend that a + * file or class name and description of purpose be included on the + * same "printed page" as the copyright notice for easier + * identification within third-party archives. + * + * Copyright 2014 Edgar Espina + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jooby.json; + +import static java.util.Objects.requireNonNull; + +import javax.json.bind.Jsonb; + +import org.jooby.MediaType; +import org.jooby.Renderer; + + /** + * @author Daniel Dias + * @since 1.6.0 + */ +public class YassonRenderer implements Renderer { + + protected final MediaType type; + + private final Jsonb jsonb; + + public YassonRenderer(final MediaType type, final Jsonb jsonb) { + this.type = requireNonNull(type, "Media type is required."); + + this.jsonb = requireNonNull(jsonb, "Jsonb is required."); + } + + @Override + public void render(final Object object, final Context ctx) throws Exception { + if (ctx.accepts(this.type)) { + ctx.type(this.type).send(jsonb.toJson(object)); + } + } + + @Override + public String name() { + return "json"; + } + + @Override + public String toString() { + return name(); + } +} \ No newline at end of file diff --git a/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java new file mode 100644 index 0000000000..5b4f6e618d --- /dev/null +++ b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java @@ -0,0 +1,124 @@ +package org.jooby.json; + +import static org.easymock.EasyMock.expect; +import static org.junit.Assert.assertEquals; + +import javax.json.bind.Jsonb; + +import org.jooby.MediaType; +import org.jooby.Parser; +import org.jooby.Parser.Context; +import org.jooby.test.MockUnit; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import com.google.inject.TypeLiteral; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({YassonParser.class, Jsonb.class }) +public class YassonParserTest { + + @SuppressWarnings("unchecked") + @Test + public void parseBody() throws Exception { + TypeLiteral type = TypeLiteral.get(YassonParserTest.class); + Object value = new Object(); + new MockUnit(Jsonb.class, Parser.Context.class, Parser.BodyReference.class) + .expect(unit -> { + Context ctx = unit.get(Parser.Context.class); + expect(ctx.type()).andReturn(MediaType.json); + + Parser.Builder builder = unit.mock(Parser.Builder.class); + + expect(ctx.ifbody(unit.capture(Parser.Callback.class))).andReturn(builder); + expect(builder.ifparam(unit.capture(Parser.Callback.class))).andReturn(builder); + }) + .expect(unit -> { + Parser.BodyReference ref = unit.get(Parser.BodyReference.class); + expect(ref.text()).andReturn("{}"); + }) + .expect(unit -> { + Jsonb jsonb = unit.get(Jsonb.class); + expect(jsonb.fromJson("{}", type.getType())).andReturn(value); + }) + .run(unit -> { + new YassonParser(MediaType.json, unit.get(Jsonb.class)) + .parse(type, unit.get(Parser.Context.class)); + }, unit -> { + unit.captured(Parser.Callback.class).iterator().next() + .invoke(unit.get(Parser.BodyReference.class)); + }); + } + + @SuppressWarnings("unchecked") + @Test + public void parseParam() throws Exception { + TypeLiteral type = TypeLiteral.get(YassonParserTest.class); + Object value = new Object(); + new MockUnit(Jsonb.class, Parser.Context.class, Parser.ParamReference.class) + .expect(unit -> { + Context ctx = unit.get(Parser.Context.class); + expect(ctx.type()).andReturn(MediaType.json); + + Parser.Builder builder = unit.mock(Parser.Builder.class); + + expect(ctx.ifbody(unit.capture(Parser.Callback.class))).andReturn(builder); + expect(builder.ifparam(unit.capture(Parser.Callback.class))).andReturn(builder); + }) + .expect(unit -> { + Parser.ParamReference ref = unit.get(Parser.ParamReference.class); + expect(ref.first()).andReturn("{}"); + }) + .expect(unit -> { + Jsonb jsonb = unit.get(Jsonb.class); + expect(jsonb.fromJson("{}", type.getType())).andReturn(value); + }) + .run(unit -> { + new YassonParser(MediaType.json, unit.get(Jsonb.class)) + .parse(type, unit.get(Parser.Context.class)); + }, unit -> { + unit.captured(Parser.Callback.class).get(1) + .invoke(unit.get(Parser.ParamReference.class)); + }); + } + + @Test + public void next() throws Exception { + TypeLiteral type = TypeLiteral.get(YassonParserTest.class); + new MockUnit(Jsonb.class, Parser.Context.class, Parser.BodyReference.class) + .expect(unit -> { + Context ctx = unit.get(Parser.Context.class); + expect(ctx.type()).andReturn(MediaType.html); + expect(ctx.next()).andReturn(null); + }) + .run(unit -> { + new YassonParser(MediaType.json, unit.get(Jsonb.class)) + .parse(type, unit.get(Parser.Context.class)); + }); + } + + @Test + public void nextAny() throws Exception { + TypeLiteral type = TypeLiteral.get(YassonParserTest.class); + new MockUnit(Jsonb.class, Parser.Context.class, Parser.BodyReference.class) + .expect(unit -> { + Context ctx = unit.get(Parser.Context.class); + expect(ctx.type()).andReturn(MediaType.all); + expect(ctx.next()).andReturn(null); + }) + .run(unit -> { + new YassonParser(MediaType.json, unit.get(Jsonb.class)) + .parse(type, unit.get(Parser.Context.class)); + }); + } + + @Test + public void toStr() throws Exception { + new MockUnit(Jsonb.class) + .run(unit -> { + assertEquals("yasson", new YassonParser(MediaType.json, unit.get(Jsonb.class)).toString()); + }); + } + +} diff --git a/modules/jooby-yasson/src/test/java/org/jooby/json/YassonRendererTest.java b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonRendererTest.java new file mode 100644 index 0000000000..988fbf63cd --- /dev/null +++ b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonRendererTest.java @@ -0,0 +1,102 @@ +package org.jooby.json; + +import static org.easymock.EasyMock.expect; +import static org.junit.Assert.assertEquals; + +import javax.json.bind.Jsonb; + +import org.jooby.MediaType; +import org.jooby.Renderer; +import org.jooby.Renderer.Context; +import org.jooby.test.MockUnit; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({YassonRenderer.class, Jsonb.class }) +public class YassonRendererTest { + + @Test + public void render() throws Exception { + Object value = new YassonRendererTest(); + new MockUnit(Jsonb.class, Renderer.Context.class) + .expect(unit -> { + Context ctx = unit.get(Renderer.Context.class); + expect(ctx.accepts(MediaType.json)).andReturn(true); + expect(ctx.type(MediaType.json)).andReturn(ctx); + ctx.send("{}"); + }) + .expect(unit -> { + Jsonb gson = unit.get(Jsonb.class); + expect(gson.toJson(value)).andReturn("{}"); + }) + .run(unit -> { + new YassonRenderer(MediaType.json, unit.get(Jsonb.class)) + .render(value, unit.get(Renderer.Context.class)); + }, unit -> { + }); + } + + @Test + public void renderSkip() throws Exception { + Object value = new YassonRendererTest(); + new MockUnit(Jsonb.class, Renderer.Context.class) + .expect(unit -> { + Context ctx = unit.get(Renderer.Context.class); + expect(ctx.accepts(MediaType.json)).andReturn(false); + }) + .run(unit -> { + new YassonRenderer(MediaType.json, unit.get(Jsonb.class)) + .render(value, unit.get(Renderer.Context.class)); + }, unit -> { + }); + } + + @Test + public void toStr() throws Exception { + new MockUnit(Jsonb.class) + .run(unit -> { + assertEquals("json", new YassonRenderer(MediaType.json, unit.get(Jsonb.class)).toString()); + }); + } + + @Test + public void rawWithCharSequence() throws Exception { + String value = "{\"foo\":\"bar\"}"; + new MockUnit(Jsonb.class, Renderer.Context.class) + .expect(unit -> { + Context ctx = unit.get(Renderer.Context.class); + expect(ctx.type(MediaType.json)).andReturn(ctx); + ctx.send(value); + }) + .run(unit -> { + new YassonRawRenderer(MediaType.json, unit.get(Jsonb.class)) + .render(value, unit.get(Renderer.Context.class)); + }, unit -> { + }); + } + + @Test + public void rawWithObject() throws Exception { + Object value = new YassonRendererTest(); + new MockUnit(Jsonb.class, Renderer.Context.class) + .expect(unit -> { + Context ctx = unit.get(Renderer.Context.class); + expect(ctx.accepts(MediaType.json)).andReturn(true); + expect(ctx.type(MediaType.json)).andReturn(ctx); + ctx.send("{}"); + }) + .expect(unit -> { + Jsonb gson = unit.get(Jsonb.class); + expect(gson.toJson(value)).andReturn("{}"); + }) + .run(unit -> { + new YassonRawRenderer(MediaType.json, unit.get(Jsonb.class)) + .render(value, unit.get(Renderer.Context.class)); + }, unit -> { + }); + } + +} diff --git a/modules/pom.xml b/modules/pom.xml index f33aed46cf..4d9ebc8b33 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,13 +6,14 @@ org.jooby jooby-project - 1.5.1-SNAPSHOT + 1.6.9 modules pom + jooby-exposed jooby-apitool jooby-executor jooby-jackson @@ -80,6 +81,7 @@ jooby-rocker jooby-livereload jooby-eventbus + jooby-yasson jooby-frontend jooby-assets diff --git a/pom.xml b/pom.xml index b553c219d3..a3788ad87a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.jooby jooby-project - 1.5.1-SNAPSHOT + 1.6.9 pom jooby-project @@ -83,6 +83,12 @@ ${jooby.version} + + org.jooby + jooby-exposed + ${jooby.version} + + org.jooby jooby-executor @@ -125,6 +131,12 @@ ${jooby.version} + + org.jooby + jooby-yasson + ${jooby.version} + + org.jooby jooby-maven-plugin @@ -609,9 +621,9 @@ - io.github.lukehutch - fast-classpath-scanner - ${fast-classpath-scanner.version} + io.github.classgraph + classgraph + ${classgraph.version} @@ -899,6 +911,19 @@ ${gson.version} + + + org.eclipse + yasson + ${yasson.version} + + + + org.glassfish + javax.json + ${javax.json.version} + + org.jdbi @@ -1089,14 +1114,21 @@ org.elasticsearch.client - rest - ${elasticsearch} + elasticsearch-rest-high-level-client + ${elasticsearch.version} + + + + + javax.enterprise + cdi-api + ${cdi-api.version} org.hibernate - hibernate-entitymanager + hibernate-core ${hibernate.version} @@ -1114,7 +1146,7 @@ - org.glassfish.web + org.glassfish javax.el ${javax.el-ref.version} @@ -1612,6 +1644,12 @@ + + org.crashub + crash.cli + ${crash.version} + + org.crashub crash.connectors.telnet @@ -3117,14 +3155,15 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 2.5.13 4.7 3.0.17 - 6.2 + 7.3.1 1.9.40 2.1.2 1.11.358 3.3.4 - 2.0.8.Final + 2.0.25.Final 2.9.2 2.6.2 + 1.1 2.18.3 3.2.6 v20180610 @@ -3142,7 +3181,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 11.11.2 11.18.2 2.10.5 - 5.5.3 + 7.5.0 5.1.3 2.3.28 1.6 @@ -3150,29 +3189,31 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 2.5.0 25.1-jre 2.8.5 + 1.0.1 + 1.1 4.2.0 1.4.197 4.1.0 - 3.10.2 + 3.11 5.1.3.Final - 5.2.1.Final - 3.2.0 + 5.3.9.Final + 3.3.1 4.5.5 4.6.0 - 2.9.6 + 2.10.1 1.2.7 3.22.0-GA - 2.2.5 - 2.2.6 + 3.0.1-b06 + 3.0.1-b10 1 2.0 1.8.5.Final 3.9.0 2.78 - 3.3.0 + 3.11.1 2.9.0 1.19.4 - 9.4.10.v20180503 + 9.4.24.v20191120 1.4.0 1.11.3 2.1.3 @@ -3180,7 +3221,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 5.2.0 1.11.3 3.0.2 - 1.2.51 + 1.3.31 1.17.2 1.2 1.2.3 @@ -3191,11 +3232,11 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 3.8.0 ${mongo-java-driver.version} 1.3.2 - 5.1.42 + 5.1.47 3.4.0.52.4 3.4.0.52 3.3.2 - 4.1.27.Final + 4.1.43.Final 1.9.9 2.3.1 2.4.0 @@ -3214,16 +3255,17 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 3.1.0 1.7.25 1.7.25 - 1.19 + 1.25 2.12.3 1.0.36 3.0.0 3.17.1 1.5.20 - 3.0.9.RELEASE - 2.0.9.Final + 3.0.10.RELEASE + 2.0.28.Final 2.1 2.4.8 + 0.12.1 ** @@ -3233,7 +3275,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 3.11.2 - 4.1.4 + 4.2.1 2.0.4 @@ -3245,7 +3287,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 3.5.0 2.5.9 1.1.1 - 3.1.6 + 4.6.18 0.0.8 2.2 1.2.0 @@ -3273,7 +3315,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true 3.1.0 2.1.1 0.4.13 - 0.9.13 + 0.9.18 1.2.1 1.6.0 ${jacoco.version}](https://github.com/goo
<dependency>
<groupId>org.jooby</groupId>
<artifactId>jooby-guava-cache</artifactId>
- <version>1.5.0</version>
+ <version>1.6.6</version>
</dependency>
```
@@ -107,7 +107,7 @@ public MyService(Cache<Integer, String> cache) {
<dependency>
<groupId>org.jooby</groupId>
<artifactId>jooby-guava-cache</artifactId>
- <version>1.5.0</version>
+ <version>1.6.6</version>
</dependency>
```
diff --git a/modules/jooby-guava-cache/pom.xml b/modules/jooby-guava-cache/pom.xml
index 34831c4157..97b51ac564 100644
--- a/modules/jooby-guava-cache/pom.xml
+++ b/modules/jooby-guava-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jooby</groupId>
<artifactId>modules</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/jooby-hazelcast/README.md b/modules/jooby-hazelcast/README.md
index 8d6267483c..6f4cfeed49 100644
--- a/modules/jooby-hazelcast/README.md
+++ b/modules/jooby-hazelcast/README.md
@@ -1,5 +1,5 @@
-[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-hazelcast)
-[](https://javadoc.io/doc/org.jooby/jooby-hazelcast/1.5.0)
+[](http://mvnrepository.com/artifact/org.jooby/jooby-hazelcast/1.6.6)
+[](https://javadoc.io/doc/org.jooby/jooby-hazelcast/1.6.6)
[](http://jooby.org/doc/hazelcast)
# hazelcast
@@ -16,7 +16,7 @@ Provides cache solution and session storage via [Hazelcast](http://hazelcast.org
<dependency>
<groupId>org.jooby</groupId>
<artifactId>jooby-hazelcast</artifactId>
- <version>1.5.0</version>
+ <version>1.6.6</version>
</dependency>
```
@@ -57,7 +57,7 @@ Configuration can be done programmatically via: ```doWith(Consumer)```
<dependency>
<groupId>org.jooby</groupId>
<artifactId>jooby-hazelcast</artifactId>
- <version>1.5.0</version>
+ <version>1.6.6</version>
</dependency>
```
diff --git a/modules/jooby-hazelcast/pom.xml b/modules/jooby-hazelcast/pom.xml
index f52aa20c9f..0f22a46c5f 100644
--- a/modules/jooby-hazelcast/pom.xml
+++ b/modules/jooby-hazelcast/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jooby</groupId>
<artifactId>modules</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/jooby-hbm/README.md b/modules/jooby-hbm/README.md
index 93c87a88ba..2acf7db7c7 100644
--- a/modules/jooby-hbm/README.md
+++ b/modules/jooby-hbm/README.md
@@ -1,5 +1,5 @@
-[](https://maven-badges.herokuapp.com/maven-central/org.jooby/jooby-hbm)
-[](https://javadoc.io/doc/org.jooby/jooby-hbm/1.5.0)
+[](http://mvnrepository.com/artifact/org.jooby/jooby-hbm/1.6.6)
+[](https://javadoc.io/doc/org.jooby/jooby-hbm/1.6.6)
[](http://jooby.org/doc/hbm)
# hibernate
@@ -21,7 +21,7 @@ This module setup and configure <a href=){kind=link}
+ * {
+ * use(new RedisSentinel("db1"));
+ * }
+ *
+ *
+ * application.conf
+ *
+ * + * jedis.sentinel.hosts = ["localhost:26379", "host2:26379"] + * jedis.sentinel.master = "master" + * jedis.password = "mySuperSecretPasswordPutHere" + *+ * + * Example: + *
+ * try (Jedis redis = request.require(JedisSentinelPool.class).getResource()) {
+ * System.out.println( redis.set("test", "this is work") );
+ * System.out.println( redis.get("test");
+ * } catch (Exception e) {
+ * e.printStackTrace();
+ * }
+ *
+ */
+
+ @Override
+ public void configure(Env env, Config config, Binder binder) {
+ /**
+ * Pool
+ */
+ GenericObjectPoolConfig poolConfig = poolConfig(config.getConfig("jedis.pool"));
+ int timeout = (int) config.getDuration("jedis.timeout", TimeUnit.MILLISECONDS);
+
+ List
+ * {
+ * use(new Yasson());
+ *
+ * // sending
+ * get("/my-api", req {@literal ->} new MyObject());
+ *
+ * // receiving a json body
+ * post("/my-api", req {@literal ->} {
+ * MyObject obj = req.body(MyObject.class);
+ * return obj;
+ * });
+ *
+ * // direct access to Jsonb
+ * get("/access", req {@literal ->} {
+ * Jsonb jsonb = req.require(Jsonb.class);
+ * // ...
+ * });
+ * }
+ *
+ *
+ * + * If you need a special setting or configuration for your {@link Jsonb}: + *
+ * + *
+ * {
+ * use(new Yasson().doWith(builder {@literal ->} {
+ * builder.withFormatting(true);
+ * // ...
+ * });
+ * }
+ *
+ *
+ * @author Daniel Dias
+ * @since 1.6.0
+ */
+public class Yasson implements Jooby.Module {
+
+ private final MediaType type;
+
+ private BiConsumer
+ * {
+ * use(new Yasson().doWith(builder {@literal ->} {
+ * builder.withFormatting(true);
+ * // ...
+ * });
+ * }
+ *
+ *
+ * @param configurer A callback.
+ * @return This instance.
+ */
+ public Yasson doWith(final BiConsumer
+ * {
+ * use(new Yasson().doWith((builder, config) {@literal ->} {
+ * builder.withFormatting(true);
+ * // ...
+ * });
+ * }
+ *
+ *
+ * @param configurer A callback.
+ * @return This instance.
+ */
+ public Yasson doWith(final Consumer{@code
+ * {
+ * get("/raw", () -> {
+ * return "{\"raw\": \"json\"}";
+ * });
+ * }
+ * }
+ *
+ * @return This module.
+ */
+ public Yasson raw() {
+ raw = true;
+ return this;
+ }
+}
\ No newline at end of file
diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java
new file mode 100644
index 0000000000..4113412e9b
--- /dev/null
+++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonParser.java
@@ -0,0 +1,249 @@
+/**
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "{}"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2014 Edgar Espina
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jooby.json;
+
+import static java.util.Objects.requireNonNull;
+import javax.json.bind.Jsonb;
+
+import org.jooby.MediaType;
+import org.jooby.Parser;
+import org.jooby.Parser.Context;
+
+import com.google.inject.TypeLiteral;
+
+ /**
+ * @author Daniel Dias
+ * @since 1.6.0
+ */
+class YassonParser implements Parser {
+
+ private final MediaType type;
+
+ private final Jsonb jsonb;
+
+ public YassonParser(final MediaType type, final Jsonb jsonb) {
+ this.type = requireNonNull(type, "Media type is required.");
+ this.jsonb = requireNonNull(jsonb, "Jsonb is required.");
+ }
+
+ @Override
+ public Object parse(final TypeLiteral type, final Context ctx) throws Throwable {
+ MediaType ctype = ctx.type();
+ if (ctype.isAny()) {
+ return ctx.next();
+ }
+
+ if (ctype.matches(this.type)) {
+ return ctx
+ .ifbody(body -> jsonb.fromJson(body.text(), type.getType()))
+ .ifparam(values -> jsonb.fromJson(values.first(), type.getType()));
+ }
+ return ctx.next();
+ }
+
+ @Override
+ public String toString() {
+ return "yasson";
+ }
+}
\ No newline at end of file
diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java
new file mode 100644
index 0000000000..47169063b6
--- /dev/null
+++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRawRenderer.java
@@ -0,0 +1,229 @@
+/**
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "{}"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2014 Edgar Espina
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jooby.json;
+
+import javax.json.bind.Jsonb;
+
+import org.jooby.MediaType;
+
+/**
+ * @author Daniel Dias
+ * @since 1.6.0
+ */
+public class YassonRawRenderer extends YassonRenderer {
+
+ public YassonRawRenderer(MediaType type, Jsonb jsonb) {
+ super(type, jsonb);
+ }
+
+ @Override
+ public void render(Object value, Context ctx) throws Exception {
+ if (value instanceof CharSequence) {
+ ctx.type(type).send(value.toString());
+ } else {
+ super.render(value, ctx);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java
new file mode 100644
index 0000000000..7fcebdc205
--- /dev/null
+++ b/modules/jooby-yasson/src/main/java/org/jooby/json/YassonRenderer.java
@@ -0,0 +1,245 @@
+/**
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "{}"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2014 Edgar Espina
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jooby.json;
+
+import static java.util.Objects.requireNonNull;
+
+import javax.json.bind.Jsonb;
+
+import org.jooby.MediaType;
+import org.jooby.Renderer;
+
+ /**
+ * @author Daniel Dias
+ * @since 1.6.0
+ */
+public class YassonRenderer implements Renderer {
+
+ protected final MediaType type;
+
+ private final Jsonb jsonb;
+
+ public YassonRenderer(final MediaType type, final Jsonb jsonb) {
+ this.type = requireNonNull(type, "Media type is required.");
+
+ this.jsonb = requireNonNull(jsonb, "Jsonb is required.");
+ }
+
+ @Override
+ public void render(final Object object, final Context ctx) throws Exception {
+ if (ctx.accepts(this.type)) {
+ ctx.type(this.type).send(jsonb.toJson(object));
+ }
+ }
+
+ @Override
+ public String name() {
+ return "json";
+ }
+
+ @Override
+ public String toString() {
+ return name();
+ }
+}
\ No newline at end of file
diff --git a/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java
new file mode 100644
index 0000000000..5b4f6e618d
--- /dev/null
+++ b/modules/jooby-yasson/src/test/java/org/jooby/json/YassonParserTest.java
@@ -0,0 +1,124 @@
+package org.jooby.json;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+
+import javax.json.bind.Jsonb;
+
+import org.jooby.MediaType;
+import org.jooby.Parser;
+import org.jooby.Parser.Context;
+import org.jooby.test.MockUnit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import com.google.inject.TypeLiteral;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({YassonParser.class, Jsonb.class })
+public class YassonParserTest {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void parseBody() throws Exception {
+ TypeLiteral