fix(core): 🐛 fix diagnostic execution

src/main/java/onl/netfishers/netshot/device/Device.java

@@ -742,7 +742,7 @@ public void addDiagnosticResult(DiagnosticResult result) {
 		while (existingIterator.hasNext()) {
 			DiagnosticResult existingResult = existingIterator.next();
 			if (existingResult.getDiagnostic().equals(result.getDiagnostic())) {
-				if (result.equals(existingResult)) {
+				if (result.equals(existingResult) && result.valueEquals(existingResult)) {
 					existingResult.setLastCheckDate(result.getLastCheckDate());
 					doAdd = false;
 				}

src/main/java/onl/netfishers/netshot/device/attribute/ConfigAttribute.java

@@ -95,7 +95,7 @@ public ConfigAttribute(Config config, String name) {
 	@Transient
 	public abstract Object getData();
 
-	public abstract boolean deepEquals(ConfigAttribute other);
+	public abstract boolean valueEquals(ConfigAttribute other);
 
 	@Override
 	public int hashCode() {

src/main/java/onl/netfishers/netshot/device/attribute/ConfigBinaryAttribute.java

@@ -65,7 +65,7 @@ public Object getData() {
 	}
 
 	@Override
-	public boolean deepEquals(ConfigAttribute obj) {
+	public boolean valueEquals(ConfigAttribute obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof ConfigBinaryAttribute))

src/main/java/onl/netfishers/netshot/device/attribute/ConfigBinaryFileAttribute.java

@@ -95,7 +95,7 @@ public Object getData() {
 	}
 
 	@Override
-	public boolean deepEquals(ConfigAttribute obj) {
+	public boolean valueEquals(ConfigAttribute obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof ConfigBinaryFileAttribute))

src/main/java/onl/netfishers/netshot/device/attribute/ConfigLongTextAttribute.java

@@ -69,7 +69,7 @@ public Object getData() {
  	}
 
 	@Override
-	public boolean deepEquals(ConfigAttribute obj) {
+	public boolean valueEquals(ConfigAttribute obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof ConfigLongTextAttribute))

src/main/java/onl/netfishers/netshot/device/attribute/ConfigNumericAttribute.java

@@ -63,7 +63,7 @@ public Object getData() {
 	}
 
 	@Override
-	public boolean deepEquals(ConfigAttribute obj) {
+	public boolean valueEquals(ConfigAttribute obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof ConfigNumericAttribute))

src/main/java/onl/netfishers/netshot/device/attribute/ConfigTextAttribute.java

@@ -63,7 +63,7 @@ public Object getData() {
 	}
 
 	@Override
-	public boolean deepEquals(ConfigAttribute obj) {
+	public boolean valueEquals(ConfigAttribute obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof ConfigTextAttribute))

src/main/java/onl/netfishers/netshot/device/script/SnapshotCliScript.java

@@ -105,7 +105,7 @@ protected void run(Session session, Device device, Cli cli, Snmp snmp, DriverPro
 						ConfigAttribute oldAttribute = oldAttributes.get(definition.getName());
 						ConfigAttribute newAttribute = newAttributes.get(definition.getName());
 						if (oldAttribute != null) {
-							if (!oldAttribute.deepEquals(newAttribute)) {
+							if (!oldAttribute.valueEquals(newAttribute)) {
 								different = true;
 								break;
 							}

src/main/java/onl/netfishers/netshot/diagnostic/DiagnosticBinaryResult.java

@@ -23,6 +23,8 @@
 import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlElement;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonView;
 
 import lombok.Getter;
@@ -73,27 +75,13 @@ public Object getData() {
 	}
 
 	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((assumption == null) ? 0 : assumption.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
+	public boolean valueEquals(DiagnosticResult obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof DiagnosticBinaryResult))
 			return false;
 		DiagnosticBinaryResult other = (DiagnosticBinaryResult) obj;
-		if (assumption == null) {
-			if (other.assumption != null)
-				return false;
-		}
-		else if (!assumption.equals(other.assumption))
-			return false;
-		return true;
+		return Objects.equals(this.assumption, other.assumption);
 	}
 
 }

src/main/java/onl/netfishers/netshot/diagnostic/DiagnosticLongTextResult.java

@@ -21,10 +21,11 @@
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Transient;
 
+import java.util.Objects;
+
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
@@ -37,7 +38,7 @@
 public class DiagnosticLongTextResult extends DiagnosticResult {
 
 	@Getter(onMethod=@__({
-		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY),
+		@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true),
 		@OnDelete(action = OnDeleteAction.CASCADE)
 	}))
 	@Setter
@@ -70,27 +71,13 @@ public Object getData() {
  	}
 
 	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((longText == null) ? 0 : longText.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
+	public boolean valueEquals(DiagnosticResult obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof DiagnosticLongTextResult))
 			return false;
 		DiagnosticLongTextResult other = (DiagnosticLongTextResult) obj;
-		if (longText == null) {
-			if (other.longText != null)
-				return false;
-		}
-		else if (!longText.equals(other.longText))
-			return false;
-		return true;
+		return Objects.equals(this.longText, other.longText);
 	}
 
 }

src/main/java/onl/netfishers/netshot/diagnostic/DiagnosticNumericResult.java

@@ -23,6 +23,8 @@
 import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlElement;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonView;
 
 import lombok.Getter;
@@ -68,27 +70,13 @@ public Object getData() {
 	}
 
 	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((number == null) ? 0 : number.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
+	public boolean valueEquals(DiagnosticResult obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof DiagnosticNumericResult))
 			return false;
 		DiagnosticNumericResult other = (DiagnosticNumericResult) obj;
-		if (number == null) {
-			if (other.number != null)
-				return false;
-		}
-		else if (!number.equals(other.number))
-			return false;
-		return true;
+		return Objects.equals(this.number, other.number);
 	}
 
 }

src/main/java/onl/netfishers/netshot/diagnostic/DiagnosticResult.java

@@ -19,6 +19,7 @@
 package onl.netfishers.netshot.diagnostic;
 
 import java.util.Date;
+import java.util.Objects;
 
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorType;
@@ -145,4 +146,20 @@ public String getDiagnosticName() {
 		return this.getDiagnostic().getName();
 	}
 
+	public abstract boolean valueEquals(DiagnosticResult obj);
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(diagnostic, device);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+		if (!(obj instanceof DiagnosticResult)) return false;
+		DiagnosticResult other = (DiagnosticResult) obj;
+		return Objects.equals(diagnostic, other.diagnostic)
+			&& Objects.equals(device, other.device);
+	}
+
 }

src/main/java/onl/netfishers/netshot/diagnostic/DiagnosticTextResult.java

@@ -24,6 +24,8 @@
 import jakarta.persistence.Transient;
 import jakarta.xml.bind.annotation.XmlElement;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonView;
 
 import lombok.Getter;
@@ -65,27 +67,13 @@ public Object getData() {
 	}
 
 	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((text == null) ? 0 : text.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
+	public boolean valueEquals(DiagnosticResult obj) {
 		if (this == obj)
 			return true;
 		if (!(obj instanceof DiagnosticTextResult))
 			return false;
 		DiagnosticTextResult other = (DiagnosticTextResult) obj;
-		if (text == null) {
-			if (other.text != null)
-				return false;
-		}
-		else if (!text.equals(other.text))
-			return false;
-		return true;
+		return Objects.equals(this.text, other.text);
 	}
 
 }

src/main/java/onl/netfishers/netshot/rest/RestService.java

@@ -9039,7 +9039,9 @@ public List<DiagnosticResult> getDeviceDiagnosticResults(@BeanParam PaginationPa
 		Session session = Database.getSession(true);
 		try {
 			Query<DiagnosticResult> query = session
-				.createQuery("from DiagnosticResult dr join fetch dr.diagnostic where dr.device.id = :id", DiagnosticResult.class)
+				.createQuery(
+					"from DiagnosticResult dr join fetch dr.diagnostic where dr.device.id = :id",
+					DiagnosticResult.class)
 				.setParameter("id", id);
 			paginationParams.apply(query);
 			return query.list();

src/main/java/onl/netfishers/netshot/work/Task.java

@@ -58,6 +58,7 @@
 import onl.netfishers.netshot.work.tasks.TakeGroupSnapshotTask;
 import onl.netfishers.netshot.work.tasks.TakeSnapshotTask;
 
+import org.hibernate.Session;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.quartz.JobKey;
@@ -492,8 +493,8 @@ public void onSchedule() {
 	/**
 	 * Prepare.
 	 */
-	public void prepare() {
-
+	public void prepare(Session session) {
+		// Override to actually do something
 	}
 
 	/**

src/main/java/onl/netfishers/netshot/work/TaskJob.java

@@ -74,20 +74,27 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
 			task.setRunning();
 			log.trace("The task runner ID for {} is {}", task.getId(), task.getRunnerId());
 			session.merge(task);
-			session.getTransaction().commit();
 			log.trace("Got the task.");
-			task.prepare();
+			task.prepare(session);
 			log.trace("The task has prepared its fields.");
+			session.getTransaction().commit();
 		}
 		catch (Exception e) {
-			log.error("Error while retrieving and updating the task.", e);
+			log.error("Error while retrieving, updating or preparing the task.", e);
 			try {
 				session.getTransaction().rollback();
+				session.beginTransaction();
+				Task eTask = (Task) session.get(Task.class, id);
+				eTask.setRunning();
+				eTask.setFailed();
+				eTask.setLog(e.getMessage());
+				session.merge(eTask);
+				session.getTransaction().commit();
 			}
 			catch (Exception e1) {
 
 			}
-			throw new JobExecutionException("Unable to access the task.");
+			throw new JobExecutionException("Unable to access or prepare the task.");
 		}
 		finally {
 			session.close();
@@ -103,7 +110,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
 
 		if (task.getStatus() == Status.RUNNING) {
 			log.error("The task {} exited with a status of RUNNING.", id);
-			task.setStatus(Status.FAILURE);
+			task.setFailed();
 		}
 
 		log.trace("Updating the task with the result.");

src/main/java/onl/netfishers/netshot/work/tasks/CheckComplianceTask.java

@@ -84,7 +84,7 @@ public CheckComplianceTask(Device device, String comments, String author) {
 	 * @see onl.netfishers.netshot.work.Task#prepare()
 	 */
 	@Override
-	public void prepare() {
+	public void prepare(Session session) {
 		Hibernate.initialize(device);
 	}
 

src/main/java/onl/netfishers/netshot/work/tasks/CheckGroupComplianceTask.java

@@ -96,7 +96,7 @@ public String getTaskDescription() {
 	 * @see onl.netfishers.netshot.work.Task#prepare()
 	 */
 	@Override
-	public void prepare() {
+	public void prepare(Session session) {
 		Hibernate.initialize(this.getDeviceGroup());
 	}
 

src/main/java/onl/netfishers/netshot/work/tasks/CheckGroupSoftwareTask.java

@@ -98,7 +98,7 @@ public String getTaskDescription() {
 	 * @see onl.netfishers.netshot.work.Task#prepare()
 	 */
 	@Override
-	public void prepare() {
+	public void prepare(Session session) {
 		Hibernate.initialize(this.getDeviceGroup());
 	}
 

src/main/java/onl/netfishers/netshot/work/tasks/DiscoverDeviceTypeTask.java

@@ -277,7 +277,7 @@ private boolean snmpv3Discover(DeviceSnmpv3Community cred) {
 	 * @see onl.netfishers.netshot.work.Task#prepare()
 	 */
 	@Override
-	public void prepare() {
+	public void prepare(Session session) {
 		Hibernate.initialize(this.getCredentialSets());
 		this.getDomain().getId();
 	}

src/main/java/onl/netfishers/netshot/work/tasks/RunDeviceGroupScriptTask.java

@@ -41,6 +41,7 @@
 import onl.netfishers.netshot.work.Task;
 
 import org.hibernate.Hibernate;
+import org.hibernate.Session;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
@@ -108,7 +109,7 @@ public String getTaskDescription() {
 	 * @see onl.netfishers.netshot.work.Task#prepare()
 	 */
 	@Override
-	public void prepare() {
+	public void prepare(Session session) {
 		Hibernate.initialize(this.getDeviceGroup());
 		Hibernate.initialize(this.getDeviceGroup().getCachedDevices());
 	}