[Jtimer-commits] r3033 - in branches/ng-jtimer/src/main/java/org/chorem/jtimer: config web

Author: ymartel Date: 2014-10-21 10:28:50 +0200 (Tue, 21 Oct 2014) New Revision: 3033 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/3033 Log: just some code review on way to catch exception and log them Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/config/JtimerConfig.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmsResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ImportResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ReportResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimesResource.java Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/config/JtimerConfig.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/config/JtimerConfig.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/config/JtimerConfig.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,12 +1,13 @@ package org.chorem.jtimer.config; +import java.util.Properties; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; -import java.util.Properties; - /** * Created by olivia on 11/06/14. * <p/> @@ -35,7 +36,10 @@ appConfig.loadDefaultOptions(JtimerConfigOption.values()); appConfig.parse(); - }catch(Exception e){ + } catch(ArgumentsParserException e){ + if (log.isErrorEnabled()) { + log.error("Unable to read default property file", e); + } throw new Exception("Can't read property file"); } @@ -51,9 +55,16 @@ defaultConfig.parse(); if (StringUtils.isNotBlank(configFileName)) { - Properties flatOptions = defaultConfig.getFlatOptions(false); - appConfig = new ApplicationConfig(flatOptions, configFileName); - appConfig.parse(); + try { + Properties flatOptions = defaultConfig.getFlatOptions(false); + appConfig = new ApplicationConfig(flatOptions, configFileName); + appConfig.parse(); + } catch (ArgumentsParserException ape) { + if (log.isErrorEnabled()) { + String message = String.format("Unable to read property file '%s', continue with default one", configFileName); + log.error(message, ape); + } + } } else { if (log.isWarnEnabled()) { log.warn("No specific configuration provided, using the default one"); @@ -61,7 +72,10 @@ appConfig = defaultConfig; } - } catch (Exception e) { + } catch (ArgumentsParserException e) { + if (log.isErrorEnabled()) { + log.error("Unable to read property file", e); + } throw new Exception("Can't read property file"); } } Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,9 @@ package org.chorem.jtimer.web; +import java.io.IOException; +import java.util.Date; +import java.util.List; + import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -13,10 +17,6 @@ import org.restlet.resource.Put; import org.restlet.resource.ResourceException; -import java.io.IOException; -import java.util.Date; -import java.util.List; - /** * Created by olivia on 01/07/14. * <p/> @@ -92,8 +92,8 @@ log.info(newAlarm.toString()); - if (log.isInfoEnabled()) { - log.info("L'alarme suivante est cree : " + newAlarm.toString()); + if (log.isDebugEnabled()) { + log.debug("L'alarme suivante est cree : " + newAlarm.toString()); } storage.addTaskAlarm(newAlarm); @@ -110,14 +110,12 @@ if(representation.isAvailable()) { - - Gson gson = builder.create(); String jsonRepr = representation.getText(); TimerAlarm t = gson.fromJson(jsonRepr, TimerAlarm.class); - if (log.isInfoEnabled()) { - log.info("La periode suivante est en maj : " + t.toString()); + if (log.isDebugEnabled()) { + log.debug("La periode suivante est en maj : " + t.toString()); } storage.modifyAlarm(t); Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmsResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmsResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/AlarmsResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,7 @@ package org.chorem.jtimer.web; +import java.util.ArrayList; + import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -10,8 +12,6 @@ import org.restlet.resource.Get; import org.restlet.resource.ResourceException; -import java.util.ArrayList; - /** * Created by olivia on 01/07/14. * <p/> @@ -41,7 +41,7 @@ @Get("json") public Representation getAlarmForATask() { - Long date = (long) 0; + Long date; try { date = Long.valueOf(getQuery().getValues("date")); @@ -52,8 +52,6 @@ Gson gson = builder.create(); ArrayList<TimerAlarm> timerAlarms = storage.getAlarms(date); - - String json = gson.toJson(timerAlarms); return new StringRepresentation(json, MediaType.APPLICATION_JSON); Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ImportResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ImportResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ImportResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,8 @@ package org.chorem.jtimer.web; +import java.io.File; +import java.io.IOException; + import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -9,9 +12,6 @@ import org.restlet.representation.StringRepresentation; import org.restlet.resource.Post; -import java.io.File; -import java.io.IOException; - /** * Created by olivia on 11/08/14. * <p/> @@ -31,7 +31,7 @@ public Representation importTasks(Representation representation) throws IOException { //Le message a retourner - String json = "No available path."; + String json = "{\"message\" : \"No available path.\""; if(representation.isAvailable()) { Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ReportResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ReportResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/ReportResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,8 @@ package org.chorem.jtimer.web; +import java.io.IOException; +import java.util.HashMap; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.lang3.ArrayUtils; @@ -12,9 +15,6 @@ import org.restlet.resource.Post; import org.restlet.resource.ResourceException; -import java.io.IOException; -import java.util.HashMap; - /** * Created by olivia on 11/06/14. * <p/> @@ -33,6 +33,7 @@ storage = (Storage) getContext().getAttributes().get(Storage.class.getName()); } + /** * Methode qui retourne la representation du rapport * Suite a une requete de type GET Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,9 @@ package org.chorem.jtimer.web; +import java.util.Date; +import java.util.Iterator; +import java.util.Timer; + import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -11,11 +15,7 @@ import org.restlet.Restlet; import org.restlet.routing.Router; -import java.util.Date; -import java.util.Iterator; -import java.util.Timer; - public class RestApplication extends Application { /** Timer qui va se lancer toutes les x minutes */ @@ -47,7 +47,9 @@ try { initContext(context); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during Restlet root context initialization", e); + } } Router router = new Router(context); Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TaskResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,7 @@ package org.chorem.jtimer.web; +import java.util.Date; + import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -11,9 +13,7 @@ import org.restlet.resource.Get; import org.restlet.resource.ResourceException; -import java.util.Date; - public class TaskResource extends AbstractResource { private static final Log log = LogFactory.getLog(TaskResource.class); @@ -60,10 +60,10 @@ String taskId = (String)getRequest().getAttributes().get("taskId"); storage.removeTaskWithId(taskId, new Date().getTime()); + if(dispatch) { + todoList.pushDeletedTask(taskId); + } - - if(dispatch) - todoList.pushDeletedTask(taskId); } /** @@ -76,7 +76,9 @@ try { res = Boolean.valueOf(getQuery().getValues("dispatch")); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Unable to get values of 'dispatch'", e); + } res = true; } return res; Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TasksResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,8 @@ package org.chorem.jtimer.web; +import java.io.IOException; +import java.util.ArrayList; + import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -14,9 +17,6 @@ import org.restlet.resource.Put; import org.restlet.resource.ResourceException; -import java.io.IOException; -import java.util.ArrayList; - public class TasksResource extends AbstractResource { private static final Log log = LogFactory.getLog(TasksResource.class); @@ -88,12 +88,12 @@ @Post("json") public void createTask(Representation representation) throws IOException { - Gson gson = builder.create(); - String repr1; + if (representation.isAvailable()) { - dispatch = getDispatch(); + Gson gson = builder.create(); + String repr1; - if (representation.isAvailable()) { + dispatch = getDispatch(); repr1 = representation.getText(); TimerTask t = gson.fromJson(repr1, TimerTask.class); @@ -106,6 +106,10 @@ todoList.pushCreatedTask(repr1); log.info("on dispatch"); } + } else { + if (log.isWarnEnabled()) { + log.warn("Representation non available."); + } } } @@ -119,7 +123,9 @@ try { res = Boolean.valueOf(getQuery().getValues("dispatch")); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Unable to get values of 'dispatch'", e); + } res = true; } return res; @@ -132,23 +138,25 @@ @Put("json") public void updateTask(Representation representation) throws IOException { - dispatch = getDispatch(); - if(representation.isAvailable()) { + dispatch = getDispatch(); + Gson gson = builder.create(); String repr1 = representation.getText(); - TimerTask t = gson.fromJson(repr1, TimerTask.class); + TimerTask timerTask = gson.fromJson(repr1, TimerTask.class); - if (log.isInfoEnabled()) { - log.info("La task suivante est en cours de maj : " + t.toString()); + if (log.isDebugEnabled()) { + log.debug("La task suivante est en cours de maj : " + timerTask.toString()); } - storage.modifyTask(t); + storage.modifyTask(timerTask); if (dispatch) { todoList.pushUpdatedTask(repr1); - log.info("on dispatch update"); + if (log.isDebugEnabled()) { + log.debug("on dispatch update"); + } } } } Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -37,6 +37,7 @@ /** * Methode qui va pousser vers le serveur distant une tache qui vient d'etre creee + * * @param t la representation dune tache * @return booleen de succes */ @@ -54,7 +55,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpPost); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -63,7 +66,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during task post", e); + } } return success; @@ -88,7 +93,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpPut); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -97,7 +104,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during task update", e); + } } return success; @@ -117,7 +126,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpDelete); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -126,7 +137,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during task delete", e); + } } return success; @@ -148,7 +161,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpPost); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -157,7 +172,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during time post on tiers server", e); + } } return success; @@ -182,7 +199,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpPut); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -191,7 +210,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during time update on tiers server", e); + } } return success; @@ -210,7 +231,9 @@ try{ CloseableHttpResponse response2 = httpclient.execute(httpDelete); - log.info(" Reponse du server 2 : " +response2.getStatusLine()); + if (log.isDebugEnabled()) { + log.debug(" Reponse du server 2 : " + response2.getStatusLine()); + } //On ferme la reponse response2.close(); @@ -219,7 +242,9 @@ success = true; }catch(Exception e){ - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Error during time delete on tiers server", e); + } } return success; Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,9 @@ package org.chorem.jtimer.web; +import java.io.IOException; +import java.util.Date; +import java.util.List; + import com.google.gson.Gson; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -15,10 +19,6 @@ import org.restlet.resource.Put; import org.restlet.resource.ResourceException; -import java.io.IOException; -import java.util.Date; -import java.util.List; - public class TimeResource extends AbstractResource { private static final Log log = LogFactory.getLog(TimeResource.class); @@ -50,7 +50,7 @@ @Get("json") public Representation getTime() { - Long date = (long) 0; + Long date; try{ date = Long.valueOf(getQuery().getValues("date")); } @@ -100,8 +100,8 @@ String jsonRepr = representation.getText(); TimerTime newTime = gson.fromJson(jsonRepr, TimerTime.class); - if (log.isInfoEnabled()) { - log.info("La periode suivante est cree : " + newTime.toString()); + if (log.isDebugEnabled()) { + log.debug("La periode suivante est creee : " + newTime.toString()); } storage.addTaskTime(newTime); @@ -110,8 +110,6 @@ String taskId = (String) getRequest().getAttributes().get("taskId"); Pair p = Pair.of(taskId, jsonRepr); - //log.info(" la pair cree" + p.toString()+ p.getKey().toString()+p.getValue().toString()); - todoList.pushCreatedTime(p); } } @@ -130,13 +128,13 @@ Gson gson = builder.create(); String jsonRepr = representation.getText(); - TimerTime t = gson.fromJson(jsonRepr, TimerTime.class); + TimerTime timerTime = gson.fromJson(jsonRepr, TimerTime.class); - if (log.isInfoEnabled()) { - log.info("La periode suivante est en maj : " + t.toString()); + if (log.isDebugEnabled()) { + log.debug("La periode suivante est en maj : " + timerTime.toString()); } - storage.modifyTime(t); + storage.modifyTime(timerTime); if (dispatch) { String taskId = (String) getRequest().getAttributes().get("taskId"); @@ -158,7 +156,9 @@ try { res = Boolean.valueOf(getQuery().getValues("dispatch")); } catch (Exception e) { - e.printStackTrace(); + if (log.isErrorEnabled()) { + log.error("Unable to get values of 'dispatch'", e); + } res = true; } return res; Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimesResource.java =================================================================== --- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimesResource.java 2014-08-22 14:54:01 UTC (rev 3032) +++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimesResource.java 2014-10-21 08:28:50 UTC (rev 3033) @@ -1,5 +1,7 @@ package org.chorem.jtimer.web; +import java.util.ArrayList; + import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -10,8 +12,6 @@ import org.restlet.resource.Get; import org.restlet.resource.ResourceException; -import java.util.ArrayList; - /** * Created by olivia on 21/05/14. */ @@ -37,7 +37,7 @@ @Get("json") public Representation getTimes() { - Long date = (long) 0; + Long date; try { date = Long.valueOf(getQuery().getValues("date"));