Skip to content

Commit 206f036

Browse files
author
Psilo
committed
add joins
1 parent 148441e commit 206f036

File tree

6 files changed

+182
-37
lines changed

6 files changed

+182
-37
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<modelVersion>4.0.0</modelVersion>
1919
<artifactId>http-server</artifactId>
20-
<version>0.0.39</version>
20+
<version>0.0.40</version>
2121
<name>HttpServer</name>
2222
<packaging>jar</packaging>
2323

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ private void getList(final Context ctx) {
7676
Long size = hu.getQueryParamAsLong(ctx, QueryField.PAGINATION_SIZE, Long.MAX_VALUE);
7777

7878
GetListInterceptorResult interceptorResult = GetListInterceptorResult.builder()
79+
.selectClause("o")
80+
.joinClause("")
7981
.whereClause("")
8082
.params(null)
8183
.partOfQueryString("")
@@ -92,8 +94,8 @@ private void getList(final Context ctx) {
9294

9395
DaoTransaction<E> transaction = daoTransactionManager.beginTransaction();
9496

95-
ListJson<P> bList = dao.getList(transaction.getManager(), offset, size, interceptorResult.getWhereClause(),
96-
interceptorResult.getParams());
97+
ListJson<P> bList = dao.getList(transaction.getManager(), offset, size, interceptorResult.getSelectClause(),
98+
interceptorResult.getJoinClause(), interceptorResult.getWhereClause(), interceptorResult.getParams());
9799
ListJson<J> jList = new ListJson<>();
98100
for (P entry : bList.getEntries())
99101
jList.getEntries().add(orikaMapper.map(entry, jsonType));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public class Information {
44
public static final String name = "Http-Server";
5-
public static final String buildTime = "2020-07-30T16:11:03Z";
6-
public static final String pomVersion = "0.0.39";
5+
public static final String buildTime = "2020-08-05T09:24:23Z";
6+
public static final String pomVersion = "0.0.40";
77
}

src/main/java/info/unterrainer/commons/httpserver/daos/BasicDao.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public interface BasicDao<P extends BasicJpa, E> {
2929

3030
ListJson<P> getList(E em, long offset, long size, String whereClause, ParamMap params);
3131

32+
ListJson<P> getList(E em, long offset, long size, String joinClause, String whereClause, ParamMap params);
33+
34+
ListJson<P> getList(E em, long offset, long size, String selectClause, String joinClause, String whereClause,
35+
ParamMap params);
36+
3237
P create(E em, P entity);
3338

3439
P update(E em, P entity);

0 commit comments

Comments
 (0)