Skip to content

Commit 0465c33

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents b74a882 + f1e7a2a commit 0465c33

File tree

6 files changed

+52
-7
lines changed

6 files changed

+52
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ hs_err_pid*
3636
.settings/org.eclipse.wst.common.project.facet.core.xml
3737

3838
.settings/
39+
/bin/

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717

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

2424
<dependencies>
2525
<dependency>
2626
<groupId>info.unterrainer.commons</groupId>
2727
<artifactId>jre-utils</artifactId>
28-
<version>0.1.0</version>
28+
<version>0.1.2</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>info.unterrainer.commons</groupId>
3232
<artifactId>rdb-utils</artifactId>
33-
<version>0.1.1</version>
33+
<version>0.1.2</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>info.unterrainer.commons</groupId>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ private void getList(final Context ctx) {
121121
break;
122122
}
123123
} catch (Exception e) {
124-
log.debug("Interceptor threw an exception. Ignoring.", e);
124+
log.debug("Interceptor threw an exception [{}]: [{}]. Ignoring.", e.getClass().getSimpleName(),
125+
e.getMessage());
125126
}
126127

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

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-10-23T12:54:31Z";
6-
public static final String pomVersion = "0.1.9";
5+
public static final String buildTime = "2020-12-14T14:13:09Z";
6+
public static final String pomVersion = "0.1.12";
77
}

src/main/java/info/unterrainer/commons/httpserver/accessmanager/HttpAccessManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ private void checkAccess(final Context ctx, final Set<Role> permittedRoles,
117117
try {
118118
tokenVerifier.verifySignature();
119119
} catch (VerificationException e) {
120-
throw new UnauthorizedException();
120+
throw new UnauthorizedException(
121+
"Error verifying token from user with publicKey obtained from keycloak.", e);
121122
}
122123

123124
try {

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package info.unterrainer.commons.httpserver.daos;
22

3+
import java.util.Collection;
4+
import java.util.HashMap;
35
import java.util.Map;
6+
import java.util.Map.Entry;
7+
import java.util.Set;
48

59
import lombok.AllArgsConstructor;
610
import lombok.Builder;
@@ -14,4 +18,42 @@ public class ParamMap {
1418

1519
@Singular
1620
private Map<String, Object> parameters;
21+
22+
public ParamMap addParameter(final String parameterKey, final Object parameterValue) {
23+
parameters.put(parameterKey, parameterValue);
24+
return this;
25+
}
26+
27+
public Object get(final String parameterKey) {
28+
return parameters.get(parameterKey);
29+
}
30+
31+
public Set<Entry<String, Object>> entrySet() {
32+
return parameters.entrySet();
33+
}
34+
35+
public Set<String> keySet() {
36+
return parameters.keySet();
37+
}
38+
39+
public Collection<Object> valueSet() {
40+
return parameters.values();
41+
}
42+
43+
public boolean containsKey(final String parameterKey) {
44+
return parameters.containsKey(parameterKey);
45+
}
46+
47+
public boolean containsValue(final Object parameterValue) {
48+
return parameters.containsValue(parameterValue);
49+
}
50+
51+
public void clear() {
52+
parameters.clear();
53+
}
54+
55+
@Override
56+
public ParamMap clone() {
57+
return new ParamMap(new HashMap<String, Object>(parameters));
58+
}
1759
}

0 commit comments

Comments
 (0)