Omitted foundry injection in empty span, fixed multiple license rewrite.
Change-Id: I6bbe809d35fc016eda8849c8c1e6cbe84eff9b4f
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java b/core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
index 1881db8..40cb90d 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/JWTSigner.java
@@ -138,12 +138,12 @@
if (!new DateTime(client.getJWTClaimsSet().getExpirationTimeClaim())
.isAfterNow())
throw new KustvaktException(StatusCodes.EXPIRED,
- "authentication token is expired", token);
+ "Authentication token is expired", token);
}
catch (ParseException | JOSEException e) {
//todo: message or entity, how to treat??!
throw new KustvaktException(StatusCodes.ILLEGAL_ARGUMENT,
- "token could not be verified", token);
+ "Token could not be verified", token);
}
return client;
}
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
index 7f19536..09d495f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
+++ b/core/src/main/java/de/ids_mannheim/korap/interfaces/AuthenticationManagerIface.java
@@ -56,7 +56,7 @@
}
- public abstract TokenContext getTokenStatus (TokenType type,
+ public abstract TokenContext getTokenContext (TokenType type,
String token, String host, String useragent)
throws KustvaktException;
diff --git a/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
index 23d2838..948ec50 100644
--- a/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
+++ b/core/src/main/java/de/ids_mannheim/korap/resource/rewrite/FoundryInject.java
@@ -42,8 +42,10 @@
mapper = new LayerMapper(config);
if (node.get("@type").equals("koral:span")) {
- JsonNode term = rewriteQuery(node.at("/wrap"), config, user);
- node.replaceAt("/wrap", term, new RewriteIdentifier("koral:term", "replace"));
+ if (!node.at("/wrap").rawNode().isMissingNode()){
+ JsonNode term = rewriteQuery(node.at("/wrap"), config, user);
+ node.replaceAt("/wrap", term, new RewriteIdentifier("koral:term", "replace"));
+ }
}
else if (node.get("@type").equals("koral:term") && !node.has("foundry")) {
String layer;