Last bugfix for Sonarcloud

pastore99 · Jan 19, 2024 · d37859a · d37859a
1 parent 33ce29d
commit d37859a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/controller/ExerciseEvaluator.java b/src/main/java/controller/ExerciseEvaluator.java
@@ -137,10 +137,8 @@ private int evaluateITTnTTI(Map<String, String> execution, Map<String, String> s
             String executionValue = entry.getValue();
             String solutionValue = solution.get(k);
 
-            if (executionValue != null) {
-                if (executionValue.equals(solutionValue.toUpperCase())) {
-                    right++;
-                }
+            if (executionValue != null && executionValue.equals(solutionValue.toUpperCase())) {
+                right++;
             }
         }
         return (int)((right /total)*100);

diff --git a/src/main/java/controller/Login.java b/src/main/java/controller/Login.java
@@ -23,6 +23,7 @@ public class Login extends HttpServlet {
     private UserData userData;
     private UserRegistry userReg;
 
+    @Override
     public void init() {
         this.authService = new Authenticator();
         this.userData = new UserData();

diff --git a/src/main/java/model/DAO/DAOCondition.java b/src/main/java/model/DAO/DAOCondition.java
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 
 public class DAOCondition {
-    private static final Logger logger = LoggerFactory.getLogger(DAOConnection.class);
+    private static final Logger logger = LoggerFactory.getLogger(DAOCondition.class);
     private Connection connection;
     public DAOCondition(Connection connection) {this.connection=connection;}
 

diff --git a/src/main/java/model/service/condition/ConditionManager.java b/src/main/java/model/service/condition/ConditionManager.java
@@ -1,13 +1,14 @@
 package model.service.condition;
 
 import model.DAO.DAOCondition;
+import model.entity.Condition;
 
 import java.util.ArrayList;
 
 public class ConditionManager implements ConditionInterface {
     DAOCondition c=new DAOCondition();
-    public ArrayList<model.entity.Condition> getConditionsOfPatient(int id_patient) { return c.getConditionsOfPatient(id_patient);}
-    public ArrayList<model.entity.Condition> getConditionsNOTOfPatient(int id_patient) { return c.getConditionsNOTOfPatient(id_patient);}
+    public ArrayList<Condition> getConditionsOfPatient(int id_patient) { return c.getConditionsOfPatient(id_patient);}
+    public ArrayList<Condition> getConditionsNOTOfPatient(int id_patient) { return c.getConditionsNOTOfPatient(id_patient);}
     public boolean AddConditionPatient(int ID_condition, int ID_patient, int Severity) {return  c.AddConditionPatient(ID_condition, ID_patient,Severity);}
     public boolean RemoveConditionPatient(int ID_condition, int ID_patient) {return   c.RemoveConditionPatient(ID_condition,ID_patient);}
 }
diff --git a/src/main/webapp/JSP/viewPatientInfo.jsp b/src/main/webapp/JSP/viewPatientInfo.jsp
@@ -6,7 +6,7 @@
 <%@ page import="model.entity.Exercise" %>
 <%@ page import="java.util.List" %>
 <!DOCTYPE html>
-<html>
+<html lang="it">
 <head>
     <script src="https://cdn.jsdelivr.net/npm/chart.js" integrity="sha384-9nhczxUqK87bcKHh20fSQcTGD4qq5GhayNYSYWqwBkINBhOfQLg/P5HG5lF1urn4" crossorigin="anonymous"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2" crossorigin="anonymous"></script>