Merge branch 'findbugs' into 'master'

Findbugs

Few bufgixes found by Findbugs-eclipse plugin. (You should try it too!)

NOTE! This should only be accepted after ee7 MR

code/moya-beans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java

@@ -107,7 +107,7 @@ public class ReaderBean implements ReaderBeanLocal {
 		{
 			ReaderEvent lastevent = lastevents.get(0);
 
-			if (lastevent.getValue() == event.getValue() && (lastevent.getUpdatetime().getTime() + 60000l) > event.getTime().getTime()) {
+			if (lastevent.getValue().equals(event.getValue()) && (lastevent.getUpdatetime().getTime() + 60000l) > event.getTime().getTime()) {
 
 				lastevent = readerEventFacade.reload(lastevent);
 				lastevent = readerEventFacade.merge(lastevent);

code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -979,7 +979,7 @@ public class UserBean implements UserBeanLocal {
 			logger.info("Catched exeption {}", ex.getMessage());
 		}
 
-		if (hash != "" && hash.length() > 2) {
+		if (!hash.isEmpty() && hash.length() > 2) {
 			// Generating code by concatenating hex string and first 3
 			// characters from hash
 			code = code.concat(hex);

code/moya-utils/src/main/java/fi/codecrew/moya/utilities/JsonUtils.java

@@ -52,13 +52,12 @@ public class JsonUtils {
 	 *            The value associate to the key
 	 * @return JsonObject with the key:value pair added
 	 */
-	public static JsonObject assocJsonObject(JsonObject jsonObject, String key,
-			JsonValue value) {
+	public static JsonObject assocJsonObject(JsonObject jsonObject, String key, JsonValue value) {
 		JsonObjectBuilder builder = Json.createObjectBuilder();
 
 		// Copy all non conflicting json entries
 		for (Map.Entry<String, JsonValue> v : jsonObject.entrySet()) {
-			if (v.getKey() != key) {
+			if (v.getKey().equals(key)) {
 				builder = builder.add(v.getKey(), v.getValue());
 			}
 		}

code/moya-web/src/main/java/fi/codecrew/moya/rest/NetworkAssociationRestView.java

@@ -50,7 +50,7 @@ public class NetworkAssociationRestView {
 				resp.getPendings().add(new NetworkAssociationActionPojo(na.getIP(), na.getMAC()));
 		} catch(Exception e) {
 			resp.getResult().setResultCode(0);
-			if(e.getMessage() != null && e.getMessage() != "") {
+			if(e.getMessage() != null && !e.getMessage().isEmpty()) {
 				resp.getResult().setMessage(e.getMessage());
 			} else {
 				resp.getResult().setMessage("UNKNOWN_ERROR");
@@ -81,7 +81,7 @@ public class NetworkAssociationRestView {
 				resp.getPendings().add(new NetworkAssociationActionPojo(na.getIP(), na.getMAC()));
 		} catch(Exception e) {
 			resp.getResult().setResultCode(0);
-			if(e.getMessage() != null && e.getMessage() != "") {
+			if(e.getMessage() != null && !e.getMessage().isEmpty()) {
 				resp.getResult().setMessage(e.getMessage());
 			} else {
 				resp.getResult().setMessage("UNKNOWN_ERROR");

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java

@@ -284,7 +284,7 @@ public class ReaderView extends GenericCDIView {
 		if(lastReadEvent == null || lastReadEvent.getId() == null)
 			return true;
 
-		return (newEvent.getId() != lastReadEvent.getId());
+		return (newEvent.getId().equals(lastReadEvent.getId()));
 	}
 
 	

code/moya-web/src/main/java/fi/codecrew/moya/web/lecture/LectureReportsView.java

@@ -113,7 +113,7 @@ public class LectureReportsView extends GenericCDIView {
 	   
 	   // sometimes you just are lazy
 	   for(EventUser user : getCurrentLecture().getParticipants()) {
-		   if(user.getId() == userId) {
+		   if(user.getId().equals(userId)) {
 			   lectureBean.unparticipate(user, getCurrentLecture());
 			   break;
 		   }