small fixes

.travis.yml

@@ -8,6 +8,7 @@ script:
   - mvn clean install sonar:sonar
 addons:
   sonarcloud:
+    organization: "erudika"
     token:
       secure: "Y/RKxv18CIQUdzIP62vEV66FRuFf6Zx+iCRQ7/7Rh+R5kEiN0eiY6ckh0MVtoF9ZDOqDDVGvhFdX6Fnzk8+nA7wW3MoTgCZaSLB9gr5W2sRA+HQrT2Kd+e1VLnhYupYtlNRye79SrjX843EqIxwVzKTWGx++uoE0zmZptVsS05RQyySJ0YSzkUJud990fF9UfOkG87G1MTOTwLFQUUYNe3Q1+CaXStPv5vFf4OI9691SxpRX9We9ldT4LSnAsN6ssayUe3LG//JRwDOg+jKMcWxzQNbdTBCn6ticzyNzgp8/w+lUOm81pqvdssj6lcE2fXRmrl+P949tY4bqA/XqNDmC7Z0F2+TRemNdLQKAPCcqf+UV2udZ194U7oKdw0GIOzPTdAMBpYsQOz7dylI+tdiyBd53AtCx9ClfAPTjwbTrS1r2P3hk5KY8TK7mvuB2SinLHSEKmJJsaFIOxX/RWTLsogFgXktcZ+uF7QcHkSZmS01UWit102EkCRekuYENnCQc3UoFMu6J7wnIBahtB3P5+3LIahxWsDjQru8CT9XmIXeYoTr/upUn4POZgmyMWT/d6ct9bKJNsoAimQH8vZ3rclnlqKFILPPTtSGa30ypmUcaM0kqsEomOKut2qlRFIORaopHiFD+qBcYayGKywP+3DM8t9mYjO5uPJyALuw="
 cache:

src/main/java/com/erudika/para/persistence/MongoDBDAO.java

@@ -46,6 +46,7 @@
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import org.bson.conversions.Bson;
 
@@ -197,7 +198,7 @@ public <P extends ParaObject> void createAll(String appid, List<P> objects) {
 		if (!documents.isEmpty()) {
 			getTable(appid).insertMany(documents);
 		}
-		logger.debug("DAO.createAll() {}", (objects == null) ? 0 : objects.size());
+		logger.debug("DAO.createAll() {}", objects.size());
 	}
 
 	@Override
@@ -213,7 +214,9 @@ public <P extends ParaObject> Map<String, P> readAll(String appid, List<String>
 		while (cursor.hasNext()) {
 			Document d = cursor.next();
 			P obj = fromRow(d);
-			results.put(d.getString(_ID), obj);
+			if (d != null) {
+				results.put(d.getString(_ID), obj);
+			}
 		}
 
 		logger.debug("DAO.readAll() {}", results.size());
@@ -279,7 +282,7 @@ public <P extends ParaObject> void updateAll(String appid, List<P> objects) {
 		} catch (Exception e) {
 			logger.error(null, e);
 		}
-		logger.debug("DAO.updateAll() {}", (objects == null) ? 0 : objects.size());
+		logger.debug("DAO.updateAll() {}", objects.size());
 	}
 
 	@Override
@@ -314,7 +317,7 @@ private <P extends ParaObject> Document toRow(P so, Class<? extends Annotation>
 		// field values will be stored as they are - object structure and types will be preserved
 		for (Entry<String, Object> entry : ParaObjectUtils.getAnnotatedFields(so, filter, false).entrySet()) {
 			Object value = entry.getValue();
-			if ((value != null && !StringUtils.isBlank(value.toString())) || setNullFields) {
+			if (value != null && (!StringUtils.isBlank(value.toString()) || setNullFields)) {
 				// "id" in ParaObject is translated to "_ID" mongodb
 				if (entry.getKey().equals(Config._ID)) {
 					row.put(_ID, value.toString());
@@ -341,7 +344,7 @@ private <P extends ParaObject> P fromRow(Map<String, Object> row) {
 	private Map<String, Object> documentToMap(Document row) {
 		if (row == null || row.isEmpty()) {
 			logger.debug("row is null or empty");
-			return null;
+			return Collections.emptyMap();
 		}
 		Map<String, Object> props = new HashMap<String, Object>();
 		for (Entry<String, Object> col : row.entrySet()) {

src/main/java/com/erudika/para/persistence/MongoDBUtils.java

@@ -160,7 +160,9 @@ public static boolean deleteTable(String appid) {
 		}
 		try {
 			MongoCollection<Document> collection = getTable(appid);
-			collection.drop();
+			if (collection != null) {
+				collection.drop();
+			}
 			logger.info("Deleted MongoDB table '{}'.", getTableNameForAppid(appid));
 		} catch (Exception e) {
 			logger.error(null, e);
@@ -179,8 +181,8 @@ public static long getTableCount(final String appid) {
 			return -1;
 		}
 		try {
-			MongoCollection<Document> td = getTable(appid);
-			return td.count();
+			MongoCollection<Document> collection = getTable(appid);
+			return (collection == null) ? 0 : collection.count();
 		} catch (Exception e) {
 			logger.error(null, e);
 		}