From b06cc04c2421a4e2b85cca55bb13d42988a0d6e0 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Mon, 27 Mar 2017 13:43:55 +0200
Subject: [PATCH] Add checkerframework Maven dependency
Additionally, made first use of it in CouchDBDao.
---
pom.xml | 5 +++++
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e62c1e96f..be4fe4586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,11 @@
<artifactId>metrics-annotation</artifactId>
<version>3.0.2</version>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>2.1.9</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 80663022e..00551b66a 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -39,6 +39,7 @@ import net.sf.ezmorph.bean.BeanMorpher;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.util.JSONUtils;
+import org.checkerframework.checker.nullness.qual.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.AopContext;
@@ -122,7 +123,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
* implemented (e.g. use of AspectJ's weaving).
* @return the proxy for CouchDBDao
*/
- private IDatabaseDao getDatabaseDao() {
+ private @NonNull IDatabaseDao getDatabaseDao() {
return (IDatabaseDao) AopContext.currentProxy();
}
--
GitLab