diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java
index 0b0338fa73cb467d4ab3caf0d306120318caab13..da442409c7c083e3f6ac8fe596274fa93a1ef641 100644
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationTimeSeriesController.java
@@ -78,7 +78,6 @@ public class ObservationTimeSeriesController extends HttpServlet {
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- LOGGER.info("Process request in ObservationTimeSeriesController");
response.setContentType("text/html;charset=UTF-8");
String action = request.getParameter("action");
VipsLogicUser user = (VipsLogicUser) request.getSession().getAttribute("user");
@@ -86,7 +85,6 @@ public class ObservationTimeSeriesController extends HttpServlet {
List<ObservationTimeSeries> observationTimeSeriesList = observationTimeSeriesBean.getObservationTimeSeriesListForUser(user);
if (request.getServletPath().endsWith("/observationTimeSeries")) {
- LOGGER.info("Action is {}", action);
if (action == null) {
request.setAttribute("observationTimeSeriesList", observationTimeSeriesList);
LOGGER.info("Display list of {} observationTimeSeries", observationTimeSeriesList.size());
@@ -108,12 +106,11 @@ public class ObservationTimeSeriesController extends HttpServlet {
userBean.authorizeUser(user, VipsLogicRole.OBSERVER, VipsLogicRole.ORGANIZATION_ADMINISTRATOR,
VipsLogicRole.SUPERUSER);
if (!authorized) {
- LOGGER.info("User {} not authorized", user.getUserId());
+ LOGGER.error("User {} not authorized", user.getUserId());
response.sendError(403, "Access not authorized");
}
if (action.equals("editObservationTimeSeriesForm")) {
Integer observationTimeSeriesId = Integer.valueOf(request.getParameter("observationTimeSeriesId"));
- LOGGER.info("Display form for editing observationTimeSeries {}", observationTimeSeriesId);
ObservationTimeSeries observationTimeSeries =
observationTimeSeriesBean.getObservationTimeSeries(observationTimeSeriesId);
Long observationCount = em.createNamedQuery("Observation.findCountByObservationTimeSeries", Long.class)
@@ -129,14 +126,12 @@ public class ObservationTimeSeriesController extends HttpServlet {
observationBean.getObservationsForTimeSeries(observationTimeSeries));
request.getRequestDispatcher("/observationTimeSeriesForm.ftl").forward(request, response);
} else if (action.equals("newObservationTimeSeriesForm")) {
- LOGGER.info("Create new observationTimeSeries");
ObservationTimeSeries observationTimeSeries = new ObservationTimeSeries();
request.setAttribute("observationTimeSeries", observationTimeSeries);
buildFormRequest(request, user, observationTimeSeries);
request.setAttribute("isEditable", true);
request.getRequestDispatcher("/observationTimeSeriesForm.ftl").forward(request, response);
} else if (action.equals("observationTimeSeriesFormSubmit")) {
- LOGGER.info("Submit changes for observationTimeSeries");
Map<String, String[]> parameterMap;
List<FileItem> items;
if (JakartaServletFileUpload.isMultipartContent(request)) {
@@ -182,7 +177,8 @@ public class ObservationTimeSeriesController extends HttpServlet {
observationTimeSeries.setName(formValidation.getFormField("name").getWebValue());
observationTimeSeries.setDescription(formValidation.getFormField("description").getWebValue());
observationTimeSeries = observationTimeSeriesBean.storeObservationTimeSeries(observationTimeSeries);
- LOGGER.info("Redirect to edit form with observationTimeSeriesId={}", observationTimeSeries.getObservationTimeSeriesId());
+ LOGGER.info("Submit changes for observationTimeSeries {}", observationTimeSeries.getName());
+
response.sendRedirect(Globals.PROTOCOL + "://" +
ServletUtil.getServerName(request) +
"/observationTimeSeries?action=editObservationTimeSeriesForm&observationTimeSeriesId=" +
diff --git a/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java b/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
index 9241bd6d341b4787229bffe1286051e7ed113810..9a4545b3657d9b00a2f8a3e161dc470f03085b5e 100755
--- a/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barleynetblotch/BarleyNetBlotchModelService.java
@@ -196,7 +196,6 @@ public class BarleyNetBlotchModelService {
if ("weatherstation".equals(weatherDataSourceType.trim())) {
PointOfInterestWeatherStation weatherStation =
em.find(PointOfInterestWeatherStation.class, weatherStationId);
- LOGGER.info("Run model with weatherdata from weatherstation {}", weatherStation.getName());
try {
observations = wsdUtil.getWeatherObservations(
weatherStation,
diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationService.java b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
index 2065fbd264fa236f08f46c8450de6c9774b6e487..09f31ed6ec7594ce820482b1b121d09b9673aa93 100755
--- a/src/main/java/no/nibio/vips/logic/service/ObservationService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
@@ -578,13 +578,10 @@ public class ObservationService {
public Response getObservationsForUser(
@QueryParam("observationIds") String observationIds
) {
- LOGGER.info("getObservationsForUser for observationIds={}", observationIds);
try {
VipsLogicUser user = userBean.getUserFromUUID(httpServletRequest);
if (user != null) {
- LOGGER.info("Get observations for user={}", user.getUserId());
List<Observation> allObs = observationBean.getObservationsForUser(user);
- LOGGER.info("Found {} observations for user {}", allObs.size(), user.getUserId());
if (observationIds != null) {
Set<Integer> observationIdSet = Arrays.asList(observationIds.split(",")).stream()
.map(s -> Integer.valueOf(s))
@@ -991,8 +988,6 @@ public class ObservationService {
public Response syncObservationFromApp(
String observationJson
) {
- LOGGER.info("In syncObservationFromApp");
-
try {
VipsLogicUser user = userBean.getUserFromUUID(httpServletRequest);
if (user == null) {
@@ -1119,8 +1114,8 @@ public class ObservationService {
String disableMessagingSystemProperty = System.getProperty("no.nibio.vips.logic.DISABLE_MESSAGING_SYSTEM");
boolean messagingSystemDisabled = disableMessagingSystemProperty != null && disableMessagingSystemProperty.equals("true");
- LOGGER.info("Send notification? " + sendNotification);
- LOGGER.info("Messaging system enabled? " + !messagingSystemDisabled);
+ LOGGER.info("Send notification? {}", sendNotification);
+ LOGGER.info("Messaging system enabled? {}", !messagingSystemDisabled);
// All transactions finished, we can send notifications
// if conditions are met
diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java b/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
index e18d4d5333d34da98f695329e3c269f0aa84408c..f92c6340fa819562bc4da6357f286a70eb2549de 100644
--- a/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ObservationTimeSeriesService.java
@@ -176,7 +176,6 @@ public class ObservationTimeSeriesService {
@Produces(APPLICATION_JSON)
@TypeHint(ObservationTimeSeries.class)
public Response syncObservationTimeSeriesFromApp(String jsonOts) {
- LOGGER.info("In syncObservationTimeSeriesFromApp");
LOGGER.info(jsonOts);
VipsLogicUser user = userBean.getUserFromUUID(httpServletRequest);
if (user == null) {
@@ -241,7 +240,6 @@ public class ObservationTimeSeriesService {
LOGGER.error("The observation time series is missing location data");
return Response.status(Response.Status.BAD_REQUEST).entity("The observation time series is missing location data").build();
}
- LOGGER.info("otsToSave before storing: " + otsToSave);
otsToSave = observationTimeSeriesBean.storeObservationTimeSeries(otsToSave);
return Response.ok().entity(otsToSave).build();
} catch (IOException e) {
diff --git a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
index 30b120b4e47eb54d3c0df15e9c2ddaab6794b3f0..dd9eb671e3f25f4825265a19beb7154542e1467b 100755
--- a/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
+++ b/src/main/java/no/nibio/vips/util/weather/WeatherDataSourceUtil.java
@@ -73,7 +73,6 @@ public class WeatherDataSourceUtil {
*/
public List<WeatherObservation> getWeatherObservations(PointOfInterestWeatherStation station, Integer logIntervalId, String[] elementMeasurementTypes, Date startTime, Date endTime, Boolean ignoreErrors, Set<Integer> toleratedLogIntervalIds) throws WeatherDataSourceException {
// Get measured (and possibly forecasted, depending on the data source) observations
- LOGGER.info("Get weather observations for {} with URL {}", station.getName(), station.getDataFetchUri());
List<WeatherObservation> observations = this.getWeatherObservations(station.getDataFetchUri(), logIntervalId, elementMeasurementTypes, startTime, endTime, TimeZone.getTimeZone(station.getTimeZone()), ignoreErrors, toleratedLogIntervalIds);
Collections.sort(observations);
// Append forecasts, if available