Merge pull request #1046 from DevFactory/release/equals-methods-shoul…

…d-be-symmetric-and-work-for-subclasses,-Local-Variables-should-not-be-declared-and-then-immediately-returned-or-thrown-fix-1 squid:S2162, squid:S1488 - equals methods should be symmetric and wor…
caelum · Feb 4, 2016 · 9c37e62 · 9c37e62
2 parents 2e8b207 + f6c7c87
commit 9c37e62
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/http/Parameter.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/http/Parameter.java
@@ -94,7 +94,7 @@ public Annotation[] getDeclaredAnnotations() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof Parameter) {
+		if (this.getClass() == obj.getClass()) {
 			Parameter other = (Parameter) obj;
 			return other.index == index && other.holder.equals(holder);
 		}

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/http/ValuedParameter.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/http/ValuedParameter.java
@@ -58,7 +58,7 @@ public void setValue(Object value) {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof ValuedParameter) {
+		if (this.getClass() == obj.getClass()) {
 			ValuedParameter other = (ValuedParameter) obj;
 			return Objects.equals(parameter.getName(), other.getParameter().getName())
 					&& Objects.equals(value, other.getValue());

diff --git a/vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultMusicDao.java b/vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultMusicDao.java
@@ -57,11 +57,10 @@ public void add(Music music) {
 
 	@Override
 	public List<Music> searchSimilarTitle(String title) {
-		List<Music> musics = entityManager
-			.createQuery("select m from Music m where lower(m.title) like lower(:title)", Music.class)
+		return musics = entityManager
+				.createQuery("select m from Music m where lower(m.title) like lower(:title)", Music.class)
 				.setParameter("title", "%" + title+ "%")
 				.getResultList();
-		return musics;
 	}
 
 	@Override

diff --git a/vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultUserDao.java b/vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultUserDao.java
@@ -57,12 +57,11 @@ public DefaultUserDao(EntityManager entityManager) {
 	@Override
 	public User find(String login, String password) {
 		try {
-			User user = entityManager
-				.createQuery("select u from User u where u.login = :login and u.password = :password", User.class)
+			return entityManager
+					.createQuery("select u from User u where u.login = :login and u.password = :password", User.class)
 					.setParameter("login", login)
 					.setParameter("password", password)
 					.getSingleResult();
-			return user;
 		} catch (NoResultException e) {
 			return null;
 		}