oli

Author: dfriveros11

pom.xml

@@ -54,12 +54,6 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.12</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashOrder.java

@@ -37,15 +37,17 @@ public static ApkHashOrder getInstance() {
 	}
 
 	public synchronized ApkHashSeparator setApkHashSeparator(ApkHashSeparator nuevoApkHashSeparator) {
-		ApkHashSeparator apkHashSeparatorDuplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
-		if (apkHashSeparatorDuplicate != null && apkHashSeparatorDuplicate.equals(nuevoApkHashSeparator)) {
-			return apkHashSeparatorDuplicate;
-		} else {
-			nuevoApkHashSeparator.setId(id);
-			apkHashesSeparator.put(nuevoApkHashSeparator, nuevoApkHashSeparator);
-			id++;
-			return null;
-		}
+		boolean isInCollection = apkHashesSeparator.containsKey(nuevoApkHashSeparator);
+		if (isInCollection) {
+			ApkHashSeparator apkHashSeparatorDuplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
+			if(apkHashSeparatorDuplicate != null && nuevoApkHashSeparator.equals(apkHashSeparatorDuplicate)) {
+				return apkHashSeparatorDuplicate;
+			}
+		} 
+		nuevoApkHashSeparator.setId(id);
+		apkHashesSeparator.put(nuevoApkHashSeparator, nuevoApkHashSeparator);
+		id++;
+		return null;
 	}
 
 	public synchronized int getId() {

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashSeparator.java

@@ -1,15 +1,12 @@
 package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
 
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode
 public class ApkHashSeparator {
 
-	@EqualsAndHashCode.Exclude private int id = -1;
+	private int id = -1;
 	private final String hashManifest;
 	private final String hashSmali;
 	private final String hashResource;
-	@EqualsAndHashCode.Exclude private final int mutanteId; 
+	private final int mutanteId; 
 
 	public static class Builder {
 		private final String hashManifest;
@@ -59,6 +56,29 @@ public String getHashResource() {
 	public int getMutanteId() {
 		return mutanteId;
 	}
+	
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		} else if (!(o instanceof ApkHashSeparator)) {
+			return false;
+		} else {
+			ApkHashSeparator apkHashseparator = (ApkHashSeparator) o;
+			return hashManifest.equals(apkHashseparator.getHashManifest())
+					&& hashSmali.equals(apkHashseparator.getHashSmali())
+					&& hashResource.equals(apkHashseparator.getHashResource());
+		}
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = hashManifest.hashCode();
+		result = 31 * result + hashSmali.hashCode();
+		result = 31 * result + hashResource.hashCode();
+		return result;
+	}
 
 	@Override
 	public String toString() {