FIX FINALE, ultimo commit

E' stato un ppiacere addio
CFerrara98 · Jan 20, 2022 · f704cd9 · f704cd9
1 parent ef51223
commit f704cd9
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 77 deletions.
diff --git a/DigitalDonation/pom.xml b/DigitalDonation/pom.xml
@@ -18,17 +18,10 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
-        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
-            <version>2.4.5</version>
-        </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
         <dependency>
@@ -97,34 +90,19 @@
             <artifactId>hibernate-java8</artifactId>
         </dependency>
 
-        <!-- Java Mail API -->
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.3</version>
-        </dependency>
-
         <!-- send email -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
         <!-- MySQL -->
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Hamcrest -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-            <version>2.0.0.0</version>
-        </dependency>
-
         <!-- Spring DevTools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -169,26 +147,6 @@
             <artifactId>font-awesome</artifactId>
             <version>5.12.0</version>
         </dependency>
-        <!--Errors-->
-        <!-- https://mvnrepository.com/artifact/org.webjars/font-awesome -->
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>5.1.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -213,27 +171,12 @@
             <version>1.22.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
-        <dependency>
-            <groupId>com.google.oauth-client</groupId>
-            <artifactId>google-oauth-client-jetty</artifactId>
-            <version>1.15.0-rc</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-drive</artifactId>
             <version>v3-rev26-1.18.0-rc</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.5</version>
-        </dependency>
-
-
-
     </dependencies>
 
     <build>

diff --git a/...it/unisa/is/c09/digitaldonation/gestionetesserinomanagement/GestioneTesserinoService.java b/...it/unisa/is/c09/digitaldonation/gestionetesserinomanagement/GestioneTesserinoService.java
@@ -198,10 +198,10 @@ public String validaCodiceFiscale(String codiceFiscale) throws TesserinoFormExce
    * @throws TesserinoFormException eccezione per il tesserino
    */
   public String validaImage(String image) throws TesserinoFormException {
-    if (image == null || image.equals("")) {
+    if (image == null || image.isEmpty()) {
       throw new TesserinoFormException("TesserinoImageError",
               "Il formato dell’immagine non è corretto. "
-                      + "Inserire un’immagine che ha formato png o jpg.");
+                      + "Inserire un’immagine che ha formato png o jpeg.");
     }
     String end = image.substring(image.indexOf("."));
     if (end.matches(".png") || end.matches(".jpeg")) {

diff --git a/...agement/web/GestioneSeduteController.java → ...onation/web/GestioneSeduteController.java b/...agement/web/GestioneSeduteController.java → ...onation/web/GestioneSeduteController.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web;
+package it.unisa.is.c09.digitaldonation.web;
 
 import it.unisa.is.c09.digitaldonation.erroremanagement.organizzazioneseduteerror.CannotSaveDataRepositoryException;
 import it.unisa.is.c09.digitaldonation.gestionesedutemanagement.GestioneSeduteService;

diff --git a/...ment/web/GestioneTesserinoController.java → ...tion/web/GestioneTesserinoController.java b/...ment/web/GestioneTesserinoController.java → ...tion/web/GestioneTesserinoController.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web;
+package it.unisa.is.c09.digitaldonation.web;
 
 import com.google.api.services.drive.model.File;
 import it.unisa.is.c09.digitaldonation.erroremanagement.organizzazioneseduteerror.CannotSaveDataRepositoryException;
@@ -25,7 +25,6 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,9 +49,6 @@
 )
 public class GestioneTesserinoController {
 
-  private static Logger logger = Logger
-          .getLogger(String.valueOf(OrganizzazioneSeduteController.class));
-
   @Autowired
   GestioneTesserinoService gestioneTesserinoService;
   @Autowired

diff --git a/...t/web/OrganizzazioneSeduteController.java → ...n/web/OrganizzazioneSeduteController.java b/...t/web/OrganizzazioneSeduteController.java → ...n/web/OrganizzazioneSeduteController.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web;
+package it.unisa.is.c09.digitaldonation.web;
 
 import it.unisa.is.c09.digitaldonation.erroremanagement.organizzazioneseduteerror.CannotDeleteDataRepositoryException;
 import it.unisa.is.c09.digitaldonation.erroremanagement.organizzazioneseduteerror.CannotLoadDataRepositoryException;

diff --git a/...edutemanagement/web/UtenteController.java → ...digitaldonation/web/UtenteController.java b/...edutemanagement/web/UtenteController.java → ...digitaldonation/web/UtenteController.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web;
+package it.unisa.is.c09.digitaldonation.web;
 
 import it.unisa.is.c09.digitaldonation.erroremanagement.gestioneutenteerror.AccessNotAuthorizedException;
 import it.unisa.is.c09.digitaldonation.erroremanagement.gestioneutenteerror.UserNotLoggedException;

diff --git a/...stionesedutemanagement/web/WebConfig.java → ...is/c09/digitaldonation/web/WebConfig.java b/...stionesedutemanagement/web/WebConfig.java → ...is/c09/digitaldonation/web/WebConfig.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web;
+package it.unisa.is.c09.digitaldonation.web;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;

diff --git a/...ent/web/autogenerate/GoogleDriveTest.java → ...ion/web/autogenerate/GoogleDriveTest.java b/...ent/web/autogenerate/GoogleDriveTest.java → ...ion/web/autogenerate/GoogleDriveTest.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web.autogenerate;
+package it.unisa.is.c09.digitaldonation.web.autogenerate;
 
 
 import it.unisa.is.c09.digitaldonation.googledriveapi.GoogleDriveService;

diff --git a/...management/web/error/ErrorController.java → ...aldonation/web/error/ErrorController.java b/...management/web/error/ErrorController.java → ...aldonation/web/error/ErrorController.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web.error;
+package it.unisa.is.c09.digitaldonation.web.error;
 
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;

diff --git a/...gement/web/filters/WebSecurityConfig.java → ...nation/web/filters/WebSecurityConfig.java b/...gement/web/filters/WebSecurityConfig.java → ...nation/web/filters/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package it.unisa.is.c09.digitaldonation.gestionesedutemanagement.web.filters;
+package it.unisa.is.c09.digitaldonation.web.filters;
 
 
 import org.jboss.logging.Logger;

diff --git a/.../unisa/is/c09/digitaldonation/gestionetesserinomanagement/GestioneTesserinoServiceUT.java b/.../unisa/is/c09/digitaldonation/gestionetesserinomanagement/GestioneTesserinoServiceUT.java
@@ -516,14 +516,14 @@ public void verificaValidaImageNull() {
         dataDonazione = datadonazione.getTime();
         tipoDonazione = "cito";
 
-        final String message = "Il formato dell’immagine non è corretto. Inserire un’immagine che ha formato png o jpg.";
+        final String message = "Il formato dell’immagine non è corretto. Inserire un’immagine che ha formato png o jpeg.";
         try {
             gestioneTesserinoService.validaImage(null);
         } catch (TesserinoFormException exception) {
             assertEquals(message, exception.getMessage());
             return;
         }
-        fail("Errore! nessuna eccezione laciata");
+        fail("Errore! nessuna eccezione lanciata");
     }
 
     /**
@@ -777,7 +777,7 @@ public void verificaValidaResidenzaFormato() {
         Calendar dataNascita = new GregorianCalendar(2000, 1, 13);
         dataDiNascita = dataNascita.getTime();
         luogoDiNascita = "Salerno";
-        residenza = "000000000";
+        residenza = "000000(000";
         email = "[email protected]";
         gruppoSanguigno = "A";
         rh = "POS";
@@ -797,7 +797,7 @@ public void verificaValidaResidenzaFormato() {
             assertEquals(message, exception.getMessage());
             return;
         }
-        fail("Errore! nessuna eccezione laciata");
+        fail("Errore! nessuna eccezione lanciata");
     }
 
     /**