formatting and refactoring

src/main/java/de/kreth/clubhelper/model/controller/AttendanceController.java

@@ -17,9 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import de.kreth.clubhelper.model.dao.AttendanceDao;
 import de.kreth.clubhelper.model.dao.PersonDao;
 import de.kreth.clubhelper.model.data.Attendance;
@@ -40,13 +37,6 @@ public class AttendanceController {
     @ResponseBody
     public List<Attendance> getAttendencesOn(@PathVariable("date") @DateTimeFormat(iso = ISO.DATE) LocalDate date) {
 	List<Attendance> findByOnDate = attendanceDao.findByOnDate(date);
-	ObjectMapper mapper = new ObjectMapper();
-	try {
-	    String one = mapper.writeValueAsString(findByOnDate.get(0));
-	    System.out.println(one);
-	} catch (JsonProcessingException e) {
-	    e.printStackTrace();
-	}
 	return findByOnDate;
     }
 

src/main/java/de/kreth/clubhelper/model/data/CompetitionType.java

@@ -14,6 +14,8 @@ import javax.persistence.Table;
 @Table(name = "clubevent_addon")
 public class CompetitionType implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     @Id
     private String id;
 
@@ -86,16 +88,14 @@ public class CompetitionType implements Serializable {
 	    if (other.id != null) {
 		return false;
 	    }
-		}
+	} else if (!id.equals(other.id)) {
-		else if (!id.equals(other.id)) {
 	    return false;
 	}
 	if (type == null) {
 	    if (other.type != null) {
 		return false;
 	    }
-		}
+	} else if (!type.equals(other.type)) {
-		else if (!type.equals(other.type)) {
 	    return false;
 	}
 	return true;