From fa5608c2b3de31fd4e1967900c2bcd601e34c7b0 Mon Sep 17 00:00:00 2001
From: Miguel Reboiro-Jato <mrjato@uvigo.es>
Date: Wed, 8 Feb 2017 22:07:16 +0100
Subject: [PATCH] Refactorizes the backend

Some backend classes have been refactorized and simplified.
---
 src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java | 6 ++++--
 src/main/java/es/uvigo/esei/daa/dao/DAO.java               | 6 +-----
 src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java          | 1 +
 src/main/java/es/uvigo/esei/daa/entities/Person.java       | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java b/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
index 1857d92..2a67f22 100644
--- a/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
+++ b/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
@@ -24,8 +24,10 @@ import es.uvigo.esei.daa.rest.UsersResource;
 public class DAAExampleApplication extends Application {
 	@Override
 	public Set<Class<?>> getClasses() {
-		return Stream.of(PeopleResource.class, UsersResource.class)
-			.collect(toSet());
+		return Stream.of(
+			PeopleResource.class,
+			UsersResource.class
+		).collect(toSet());
 	}
 	
 	@Override
diff --git a/src/main/java/es/uvigo/esei/daa/dao/DAO.java b/src/main/java/es/uvigo/esei/daa/dao/DAO.java
index 1a83eee..1856874 100644
--- a/src/main/java/es/uvigo/esei/daa/dao/DAO.java
+++ b/src/main/java/es/uvigo/esei/daa/dao/DAO.java
@@ -5,7 +5,6 @@ import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
@@ -27,11 +26,8 @@ public abstract class DAO {
 	 * Constructs a new instance of {@link DAO}.
 	 */
 	public DAO() {
-		Context initContext;
 		try {
-			initContext = new InitialContext();
-			
-			this.dataSource = (DataSource) initContext.lookup(JNDI_NAME);
+			this.dataSource = (DataSource) new InitialContext().lookup(JNDI_NAME);
 		} catch (NamingException e) {
 			LOG.log(Level.SEVERE, "Error initializing DAO", e);
 			throw new RuntimeException(e);
diff --git a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
index 8c17b7e..c3b9eb7 100644
--- a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
+++ b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
@@ -19,6 +19,7 @@ import es.uvigo.esei.daa.entities.User;
 public class UsersDAO extends DAO {
 	private final static Logger LOG = Logger.getLogger(UsersDAO.class.getName());
 	
+	// Yes, SALT should come from external configuration (for example, a property in Tomcat's context).
 	private final static String SALT = "daaexample-";
 	
 	/**
diff --git a/src/main/java/es/uvigo/esei/daa/entities/Person.java b/src/main/java/es/uvigo/esei/daa/entities/Person.java
index 3df16c4..b2f3285 100644
--- a/src/main/java/es/uvigo/esei/daa/entities/Person.java
+++ b/src/main/java/es/uvigo/esei/daa/entities/Person.java
@@ -89,7 +89,7 @@ public class Person {
 			return true;
 		if (obj == null)
 			return false;
-		if (getClass() != obj.getClass())
+		if (!(obj instanceof Person))
 			return false;
 		Person other = (Person) obj;
 		if (id != other.id)
-- 
2.18.1