Ajout log + Suppr class inutile

src/classes/Frequentation.java

@@ -1,38 +0,0 @@
-package classes;
-
-import java.io.Serializable;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class Frequentation implements Serializable{
-	
-	private static SimpleDateFormat sdf= new SimpleDateFormat("dd/MM/yyyy"); // 26/12/2019-14:00:00
-	private String idPersonne;
-	private String idEspace;
-	private Date date;
-	
-	public Frequentation(String idPersonne, String idEspace, String date) throws ParseException{
-		super();
-		this.idPersonne = idPersonne;
-		this.idEspace = idEspace;
-		this.date = sdf.parse(date);
-	}
-	
-	@Override
-	public String toString() {
-		return "{\"date\":\"" + date +"\",\"idPersonne\":" + idPersonne + ",\"idEspace\":" + idEspace+"}";
-	}
-
-	public String getIdPersonne() {
-		return idPersonne;
-	}
-
-	public String getIdEspace() {
-		return idEspace;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-}

src/microfolie/entry/rest/BadgeController.java

@@ -1,5 +1,7 @@
 package microfolie.entry.rest;
 
+import java.util.logging.Logger;
+
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -16,6 +18,8 @@ import microfolie.utils.JsonUtils;
 @Produces("application/json")
 public class BadgeController {
 	
+	private static final Logger LOGGER = Logger.getLogger(BadgeController.class.getName());
+	
 	private UsagerService usagerService = UsagerService.getInstance();
 	private EspaceService espaceService = EspaceService.getInstance();
 	private FrequentationService service = FrequentationService.getInstance();
@@ -23,6 +27,7 @@ public class BadgeController {
 	@POST
 	@Path("/{espace}/{code}")
 	public String scanner(@PathParam("espace") String espace, @PathParam("code") String code) {
+		LOGGER.info("Begin: Badge scanner (espace: " + espace + ", code: " + code + ")");
 		JSONObject result;
 		// Verification que les codes existes
 		if (!usagerService.exist(code)) {
@@ -39,6 +44,7 @@ public class BadgeController {
 			}
 			result = JsonUtils.success(data);
 		}
+		LOGGER.info("End: Badge scanner");
 		return result.toString();
 	}
 

src/microfolie/entry/rest/EspaceController.java

@@ -1,6 +1,7 @@
 package microfolie.entry.rest;
 
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -18,21 +19,27 @@ import microfolie.utils.JsonUtils;
 @Produces("application/json")
 public class EspaceController {
 	
+	private static final Logger LOGGER = Logger.getLogger(EspaceController.class.getName());
+	
 	private EspaceService service = EspaceService.getInstance();
 	
 	@GET
 	@Path("/list/all")
 	public String listAll() {
+		LOGGER.info("Begin: Espace list all");
 		List<EspaceDTO> espaces = service.getAll();
 		JSONArray data = new JSONArray(espaces);
+		LOGGER.info("End: Espace list all");
 		return JsonUtils.success(data).toString();
 	}
 	
 	@GET
 	@Path("/get/{code}")
 	public String getByCode(@PathParam("code") String code) {
+		LOGGER.info("Begin: Espace get by code (" + code + ")");
 		EspaceDTO espace = service.getByCode(code);
 		JSONObject data = new JSONObject(espace);
+		LOGGER.info("End: Espace get by code");
 		return JsonUtils.success(data).toString();
 	}
 

src/microfolie/entry/rest/RestApplication.java → src/microfolie/entry/rest/RestApi.java

@@ -5,9 +5,9 @@ import javax.ws.rs.ApplicationPath;
 import org.glassfish.jersey.server.ResourceConfig;
 
 @ApplicationPath("/api")
-public class RestApplication extends ResourceConfig {               
+public class RestApi extends ResourceConfig {               
 
-    public RestApplication() {
+    public RestApi() {
         packages("rest");
     }
     

src/microfolie/entry/rest/RestService.java

@@ -1,108 +0,0 @@
-package microfolie.entry.rest;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletContext;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-
-import classes.Frequentation;
-
-@Path("/old")
-@Produces("application/json")
-public class RestService {
-
-	private static Logger LOGGER = Logger.getLogger("jai.jaxrs");
-
-	private static SimpleDateFormat sdf= new SimpleDateFormat("MMddyyyy");
-
-	private static String messageBienvenue="Bienvenue à l'espace ";
-
-	private static String messagePlusieursPassages="De nouveau bienvenue à l'espace ";
-
-	@Path("/badge/{id}/{espace}")
-	@GET
-	public String validerBadge(@PathParam("id") String id, @PathParam("espace") String espace, @Context ServletContext context) {
-		LOGGER.info("validation du badge " + id + " a l'espace " + espace);
-		Map<String,String> mapPassageMicrofolies = (Map<String, String>) context.getAttribute("MapPassageMicrofolies");
-		String stringVerifPassage = sdf.format(new Date())+ " " + espace;
-		String messageRetour=messageBienvenue + espace;
-		if(mapPassageMicrofolies==null) {
-			mapPassageMicrofolies=new HashMap<String,String>();
-			mapPassageMicrofolies.put(id, stringVerifPassage);
-		}
-		else {
-			String listPassage = mapPassageMicrofolies.get(id);
-			if(listPassage==null) {
-				mapPassageMicrofolies.put(id,new Date().toString() + " " + espace);
-			} else {
-				if(!listPassage.contains(stringVerifPassage)){
-					mapPassageMicrofolies.put(id,listPassage);
-				} else {
-					messageRetour=messagePlusieursPassages + espace;
-				}
-			}
-		}	
-		context.setAttribute("MapPassageMicrofolies", mapPassageMicrofolies);
-		return messageRetour;
-	}
-
-	@Path("freq/{espace}/{from}/{to}")
-	@GET
-	public String frequence(@PathParam("espace") String espace, @PathParam("from") String from, @PathParam("to") String to, @Context ServletContext context) {
-		try {
-			Date begin = sdf.parse(from);
-			Date end = sdf.parse(to);
-			Pattern pattern = Pattern.compile(",");
-			try (BufferedReader in = new BufferedReader(new FileReader(context.getRealPath("data/frequentation.csv")));) {
-				List<Frequentation> frequentations = in .lines() .skip(1) .map(line -> { 
-					String[] x = pattern.split(line); 
-					try {
-						return new Frequentation(x[0], x[1], x[2]);
-					} catch (ParseException e) {
-						e.printStackTrace();
-					}
-					return null; }) .collect(Collectors.toList());
-				String toReturn = "{\"data\":[";
-				for (Frequentation f : frequentations) {
-					if(f.getDate().after(begin) && f.getDate().before(end))
-					toReturn+=f.toString()+",";
-				}
-				toReturn=toReturn.substring(0,toReturn.length()-1) + "]}";
-				return toReturn;
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-				return "File not valid";
-			} catch (IOException e) {
-				e.printStackTrace();
-				return "File not valid";
-			}
-		} catch (ParseException e1) {
-			e1.printStackTrace();
-			return "Date not valid, format : MMddyyyy";
-		}
-	}
-
-	@Path("profile/{id}")
-	@GET
-	public String profil(@PathParam("id")String id) {
-		LOGGER.info("profil " +id);
-		return "{\n\tid:" + id + "\n}";
-	}
-
-}

src/microfolie/entry/servlet/Configure.java

@@ -31,9 +31,8 @@ public class Configure extends HttpServlet {
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
 	 *      response)
 	 */
-	protected void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		request.getServletContext().log("configuring tablet");
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		request.getServletContext().log("Begin : Configuration");
 		String espace = request.getParameter("espace");
 		String page;
 
@@ -41,13 +40,16 @@ public class Configure extends HttpServlet {
 		 * go back to setting
 		 */
  		if (espace == null) {
+ 			request.getServletContext().log("No GET parameter espace");
 			page = "/settings/";
 		} else {
+			request.getServletContext().log("GET parameter espace = " + espace);
 			Cookie cookie = new Cookie("microfolies.lens.espace", espace);
 			cookie.setMaxAge(60 * 60 * 24 * 365);
 			page = "/scan/";
 			response.addCookie(cookie);
 		}
+ 		request.getServletContext().log("End : Configuration");
 		request.getRequestDispatcher(page).forward(request, response);
 	}