Skip to content
Snippets Groups Projects
Verified Commit b8865342 authored by Martin Weise's avatar Martin Weise
Browse files

Hotfix nullpointer

parent 84562e2b
No related branches found
No related tags found
1 merge request!163Relase 1.3.0
...@@ -627,6 +627,14 @@ public interface QueryMapper { ...@@ -627,6 +627,14 @@ public interface QueryMapper {
log.error("Timestamp is null"); log.error("Timestamp is null");
throw new IllegalArgumentException("Please provide a timestamp before"); throw new IllegalArgumentException("Please provide a timestamp before");
} }
if (page == null) {
log.warn("page is null, default to 0");
page = 0L;
}
if (size == null) {
log.warn("size is null, default to 100");
size = 100L;
}
query = query.toLowerCase(Locale.ROOT) query = query.toLowerCase(Locale.ROOT)
.trim(); .trim();
if (query.matches(";$")) { if (query.matches(";$")) {
...@@ -760,10 +768,11 @@ public interface QueryMapper { ...@@ -760,10 +768,11 @@ public interface QueryMapper {
return null; return null;
} }
switch (column.getColumnType()) { switch (column.getColumnType()) {
case BLOB: case BLOB -> {
log.trace("mapping {} to blob", data); log.trace("mapping {} to blob", data);
return new MariaDbBlob((byte[]) data); return new MariaDbBlob((byte[]) data);
case DATE: }
case DATE -> {
if (column.getDateFormat() == null) { if (column.getDateFormat() == null) {
log.error("Missing date format for column {} of table {}", column.getId(), log.error("Missing date format for column {} of table {}", column.getId(),
column.getTable().getId()); column.getTable().getId());
...@@ -777,7 +786,8 @@ public interface QueryMapper { ...@@ -777,7 +786,8 @@ public interface QueryMapper {
final LocalDate date = LocalDate.parse(String.valueOf(data), formatter); final LocalDate date = LocalDate.parse(String.valueOf(data), formatter);
return date.atStartOfDay(ZoneId.of("UTC")) return date.atStartOfDay(ZoneId.of("UTC"))
.toInstant(); .toInstant();
case TIMESTAMP: }
case TIMESTAMP -> {
if (column.getDateFormat() == null) { if (column.getDateFormat() == null) {
log.error("Missing date format for column {} of table {}", column.getId(), log.error("Missing date format for column {} of table {}", column.getId(),
column.getTable().getId()); column.getTable().getId());
...@@ -786,25 +796,29 @@ public interface QueryMapper { ...@@ -786,25 +796,29 @@ public interface QueryMapper {
log.trace("mapping {} to timestamp with format '{}'", data, column.getDateFormat()); log.trace("mapping {} to timestamp with format '{}'", data, column.getDateFormat());
return Timestamp.valueOf(data.toString()) return Timestamp.valueOf(data.toString())
.toInstant(); .toInstant();
case ENUM: }
case TEXT: case ENUM, TEXT, STRING -> {
case STRING:
log.trace("mapping {} to character array", data); log.trace("mapping {} to character array", data);
return String.valueOf(data); return String.valueOf(data);
case NUMBER: }
case NUMBER -> {
log.trace("mapping {} to non-decimal number", data); log.trace("mapping {} to non-decimal number", data);
return new BigInteger(String.valueOf(data)); return new BigInteger(String.valueOf(data));
case DECIMAL: }
case DECIMAL -> {
log.trace("mapping {} to decimal number", data); log.trace("mapping {} to decimal number", data);
return Double.valueOf(String.valueOf(data)); return Double.valueOf(String.valueOf(data));
case BOOLEAN: }
case BOOLEAN -> {
log.trace("mapping {} to boolean", data); log.trace("mapping {} to boolean", data);
return Boolean.valueOf(String.valueOf(data)); return Boolean.valueOf(String.valueOf(data));
default: }
default -> {
log.warn("column type {} is not known", column.getColumnType()); log.warn("column type {} is not known", column.getColumnType());
throw new IllegalArgumentException("Column type not known"); throw new IllegalArgumentException("Column type not known");
} }
} }
}
@Named("EscapedString") @Named("EscapedString")
default String stringToEscapedString(String name) { default String stringToEscapedString(String name) {
......
...@@ -313,9 +313,6 @@ services: ...@@ -313,9 +313,6 @@ services:
networks: networks:
core: core:
public: public:
ports:
- "80:80"
- "443:443"
volumes: volumes:
- ./dbrepo.conf:/etc/nginx/conf.d/default.conf - ./dbrepo.conf:/etc/nginx/conf.d/default.conf
depends_on: depends_on:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment