From bcf166e3b5fad1d234ee55ea5bc08ecf9b7b40f0 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 5 Jan 2022 20:48:56 +0100
Subject: [PATCH] Removed SessionControllerGetter and all references to it
---
.../authenticate/AuthenticationFilter.java | 1 -
.../servlet/CropCategoryController.java | 2 -
.../ForecastConfigurationController.java | 3 +-
.../controller/servlet/MessageController.java | 1 -
.../servlet/ObservationController.java | 1 -
.../controller/session/ForecastBean.java | 2 -
.../session/PointOfInterestBean.java | 5 +-
.../messaging/sms/SMSHandlingService.java | 1 -
.../AppleFruitMothController.java | 1 -
.../barkbeetle/BarkbeetleController.java | 3 -
.../modules/roughage/RoughageService.java | 1 -
...DeliaRadicumFloralisModelPreprocessor.java | 3 +-
.../vips/logic/service/VIPSMobileService.java | 1 -
.../logic/util/SessionControllerGetter.java | 180 ------------------
14 files changed, 3 insertions(+), 202 deletions(-)
delete mode 100755 src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java
diff --git a/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java b/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
index 76ad9178..aeb950d2 100755
--- a/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
+++ b/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.util.ServletUtil;
/**
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
index 3789c3ce..f174c13f 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
@@ -20,7 +20,6 @@
package no.nibio.vips.logic.controller.servlet;
import java.io.IOException;
-import java.io.PrintWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,7 +35,6 @@ import no.nibio.vips.logic.entity.Organism;
import no.nibio.vips.logic.entity.Organization;
import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.util.ServletUtil;
import no.nibio.web.forms.FormUtil;
import no.nibio.web.forms.FormValidation;
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
index ddd0bf78..412e4c54 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -46,7 +46,6 @@ import no.nibio.vips.logic.entity.VipsLogicRole;
import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.ArrayUtil;
import no.nibio.vips.util.ServletUtil;
@@ -57,7 +56,7 @@ import no.nibio.web.forms.FormValidator;
/**
* Handles form configuration actions
- * @copyright 2020 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2020-2022 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ForecastConfigurationController extends HttpServlet {
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
index b1987c84..5aefe7f7 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
@@ -45,7 +45,6 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
import no.nibio.vips.logic.messaging.MessagingBean;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.ExceptionUtil;
import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
index c49849aa..eb18dd3d 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
@@ -57,7 +57,6 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
import no.nibio.vips.logic.messaging.MessagingBean;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.DateUtil;
import no.nibio.vips.util.DateUtilException;
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index 57d32334..0dee5a09 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -51,7 +51,6 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import javax.transaction.Transactional;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
@@ -77,7 +76,6 @@ import no.nibio.vips.logic.scheduling.model.ModelRunPreprocessorFactory;
import no.nibio.vips.logic.scheduling.model.PreprocessorException;
import no.nibio.vips.logic.util.GISEntityUtil;
import no.nibio.vips.logic.util.RunModelException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.WeatherUtil;
import no.nibio.web.forms.FormField;
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
index cc7997f7..0e029a33 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
@@ -30,7 +30,6 @@ import de.micromata.opengis.kml.v_2_2_0.Point;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.stream.Collectors;
@@ -53,13 +52,11 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.entity.WeatherStationDataSource;
import no.nibio.vips.logic.util.GISEntityUtil;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
-import no.nibio.web.forms.FormField;
/**
* Handles transactions for POIs
- * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2013-2022 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@LocalBean
diff --git a/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java b/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
index b85bcdf7..313db176 100755
--- a/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
@@ -27,7 +27,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.VipsLogicUser;
-import no.nibio.vips.logic.util.SessionControllerGetter;
/**
* @copyright 2016 <a href="http://www.nibio.no/">NIBIO</a>
diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
index 6a0df4f0..8287b9cd 100755
--- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
@@ -38,7 +38,6 @@ import no.nibio.vips.logic.controller.session.UserBean;
import no.nibio.vips.logic.entity.VipsLogicRole;
import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.ExceptionUtil;
import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
index a4d78ce6..0153a80b 100644
--- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
@@ -30,13 +30,11 @@ import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.stream.Collectors;
import javax.ejb.EJB;
-import javax.ejb.EJBException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -48,7 +46,6 @@ import no.nibio.vips.logic.entity.VipsLogicRole;
import no.nibio.vips.logic.entity.VipsLogicUser;
import no.nibio.vips.logic.gis.CoordinateXYZ;
import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.ExceptionUtil;
import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
index 14985497..791743c9 100755
--- a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
+++ b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
@@ -49,7 +49,6 @@ import no.nibio.vips.logic.controller.session.ForecastBean;
import no.nibio.vips.logic.entity.Organization;
import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
import no.nibio.vips.logic.util.RunModelException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.InvalidAggregationTypeException;
import no.nibio.vips.util.ParseRESTParamUtil;
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
index ccada9b3..31cdcd4b 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
@@ -34,13 +34,12 @@ import no.nibio.vips.logic.entity.Organism;
import no.nibio.vips.logic.entity.PointOfInterest;
import no.nibio.vips.logic.scheduling.model.ModelRunPreprocessor;
import no.nibio.vips.logic.scheduling.model.PreprocessorException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.observation.Observation;
import no.nibio.vips.util.WeatherUtil;
/**
- * @copyright 2017 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2017-2022 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class DeliaRadicumFloralisModelPreprocessor extends ModelRunPreprocessor{
diff --git a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
index ea71a490..d358d330 100755
--- a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
+++ b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
@@ -63,7 +63,6 @@ import no.nibio.vips.logic.entity.vipsmobile.VIPSMobileForecast;
import no.nibio.vips.logic.entity.vipsmobile.VIPSMobileMessage;
import no.nibio.vips.logic.entity.vipsmobile.VIPSMobilePresentation;
import no.nibio.vips.logic.i18n.SessionLocaleUtil;
-import no.nibio.vips.logic.util.SessionControllerGetter;
import no.nibio.vips.logic.util.SystemTime;
import no.nibio.vips.util.WeatherUtil;
import org.jboss.resteasy.spi.HttpRequest;
diff --git a/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java b/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java
deleted file mode 100755
index 51129a61..00000000
--- a/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
- *
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
- * it under the terms of the NIBIO Open Source License as published by
- * NIBIO, either version 1 of the License, or (at your option) any
- * later version.
- *
- * VIPSLogic is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * NIBIO Open Source License for more details.
- *
- * You should have received a copy of the NIBIO Open Source License
- * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>.
- *
- */
-
-package no.nibio.vips.logic.util;
-
-import no.nibio.vips.logic.controller.session.SchedulingBean;
-import no.nibio.vips.logic.controller.session.ForecastBean;
-import no.nibio.vips.logic.controller.session.UserBean;
-import no.nibio.vips.logic.controller.session.PointOfInterestBean;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import no.nibio.vips.logic.controller.session.MessageBean;
-import no.nibio.vips.logic.controller.session.ObservationBean;
-import no.nibio.vips.logic.controller.session.OrganismBean;
-import no.nibio.vips.logic.messaging.MessagingBean;
-import no.nibio.vips.logic.modules.applefruitmoth.AppleFruitMothBean;
-
-/**
- * @copyright 2013-2014 <a href="http://www.nibio.no/">NIBIO</a>
- * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
- */
-public class SessionControllerGetter {
-
- private static final String JNDI_PATH = "java:global/VIPSLogic-1.0-SNAPSHOT/";
-/*
- public static PointOfInterestBean getPointOfInterestBean()
- {
- try
- {
- InitialContext ic = new InitialContext();
- PointOfInterestBean retVal = (PointOfInterestBean) ic.lookup(SessionControllerGetter.getJndiPath(PointOfInterestBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + PointOfInterestBean.class.getSimpleName());
- return null;
- }
- }
-
- public static UserBean getUserBean()
- {
- try
- {
- InitialContext ic = new InitialContext();
- UserBean retVal = (UserBean) ic.lookup(SessionControllerGetter.getJndiPath(UserBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + UserBean.class.getSimpleName());
- return null;
- }
- }
-
- public static SchedulingBean getSchedulingBean()
- {
- try
- {
- InitialContext ic = new InitialContext();
- SchedulingBean retVal = (SchedulingBean) ic.lookup(SessionControllerGetter.getJndiPath(SchedulingBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + SchedulingBean.class.getSimpleName());
- return null;
- }
- }
-
- public static ForecastBean getForecastBean(){
- try
- {
- InitialContext ic = new InitialContext();
- ForecastBean retVal = (ForecastBean) ic.lookup(SessionControllerGetter.getJndiPath(ForecastBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + ForecastBean.class.getSimpleName());
- return null;
- }
- }
-
- public static OrganismBean getOrganismBean(){
- try
- {
- InitialContext ic = new InitialContext();
- OrganismBean retVal = (OrganismBean) ic.lookup(SessionControllerGetter.getJndiPath(OrganismBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + OrganismBean.class.getSimpleName());
- return null;
- }
- }
-
- public static MessageBean getMessageBean(){
- try
- {
- InitialContext ic = new InitialContext();
- MessageBean retVal = (MessageBean) ic.lookup(SessionControllerGetter.getJndiPath(MessageBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + MessageBean.class.getSimpleName());
- return null;
- }
- }
-
- public static MessagingBean getMessagingBean(){
- try
- {
- InitialContext ic = new InitialContext();
- MessagingBean retVal = (MessagingBean) ic.lookup(SessionControllerGetter.getJndiPath(MessagingBean.class));
- return retVal;
- }
- catch(NamingException ne)
- {
- System.out.println("Could not find " + MessagingBean.class.getSimpleName());
- return null;
- }
- }
-
- public static ObservationBean getObservationBean()
- {
- try
- {
- InitialContext ic = new InitialContext();
- ObservationBean retVal = (ObservationBean) ic.lookup(SessionControllerGetter.getJndiPath(ObservationBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + ObservationBean.class.getSimpleName());
- return null;
- }
- }
-
- public static AppleFruitMothBean getAppleFruitMothBean()
- {
- try
- {
- InitialContext ic = new InitialContext();
- AppleFruitMothBean retVal = (AppleFruitMothBean) ic.lookup(SessionControllerGetter.getJndiPath(AppleFruitMothBean.class));
-
- return retVal;
- }catch(NamingException ne)
- {
- System.out.println("Could not find " + AppleFruitMothBean.class.getSimpleName());
- return null;
- }
- }
-
- public static String getJndiPath(Class obj)
- {
- String retVal = SessionControllerGetter.JNDI_PATH + obj.getSimpleName();
- //System.out.println("JNDI-path=" + retVal);
- return retVal;
- }
-*/
-}
--
GitLab