unused parameter removed

Author: taleksashina

src/main/java/ExecuteD2RQTaskServlet.java

@@ -24,7 +24,7 @@ public class ExecuteD2RQTaskServlet extends HttpServlet {
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
         try {
-            frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext(), false).getFrameworkUserManager();
+            frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext()).getFrameworkUserManager();
         } catch (Exception e) {
             throw new ServletException(e);
         }

src/main/java/ImportRDF.java

@@ -146,7 +146,7 @@ private int httpUpdate(String endpoint, String graph, Model model) throws Except
     RdfStoreManager rdfStoreManager = null;
     if (username != null && !username.isEmpty() && token != null && !token.isEmpty()) {
       FrameworkUserManager frameworkUserManager = FrameworkConfiguration.getInstance(
-          getServletContext(), false).getFrameworkUserManager();
+          getServletContext()).getFrameworkUserManager();
       if (frameworkUserManager.checkToken(username, token))
         rdfStoreManager = frameworkUserManager.getRdfStoreManager(username);
     }

src/main/java/authentication/FrameworkConfiguration.java

@@ -55,7 +55,7 @@ public class FrameworkConfiguration {
    * @return
    * @throws Exception
    */
-  public static synchronized FrameworkConfiguration getInstance(ServletContext context, boolean ignoreIsSetUp) throws Exception {
+  public static synchronized FrameworkConfiguration getInstance(ServletContext context) throws Exception {
 
     if (instance == null) {
 

src/main/java/authentication/web/AuthenticationServlet.java

@@ -44,7 +44,7 @@ public class AuthenticationServlet extends HttpServlet {
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
     try {
-      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext(), false)
+      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext())
           .getFrameworkUserManager();
     } catch (FileNotFoundException e) {
       throw new ServletException(e);
@@ -147,7 +147,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         frameworkUserManager.createUser(username, password, email);
 
-        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext(), false)
+        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
             .getDefaultEmailSender();
 
         emailSender.send(email, "GeoKnow registration", "Your login: " + username + ", password: "
@@ -205,7 +205,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         frameworkUserManager.setPassword(username, password);
 
         // send new password to user
-        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext(), false)
+        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
             .getDefaultEmailSender();
         emailSender.send(userProfile.getEmail(), "GeoKnow restore password", "Your login: "
             + username + ", password: " + password);

src/main/java/authentication/web/GraphManagerServlet.java

@@ -41,7 +41,7 @@ public void init(ServletConfig config) throws ServletException {
     super.init(config);
 
     try {
-      frameworkConfig = FrameworkConfiguration.getInstance(getServletContext(), false);
+      frameworkConfig = FrameworkConfiguration.getInstance(getServletContext());
       frameworkUserManager = frameworkConfig.getFrameworkUserManager();
       virtuosoUserManager = frameworkConfig.getVirtuosoUserManager();
       virtuosoGraphGroupManager = new VirtuosoGraphGroupManager(frameworkConfig

src/main/java/authentication/web/RdfStoreProxy.java

@@ -38,7 +38,7 @@ public void init(ServletConfig config) throws ServletException {
     FrameworkConfiguration frameworkConf;
     try {
       // TODO: parameterize from client the to reset configuration
-      frameworkConf = FrameworkConfiguration.getInstance(getServletContext(), false);
+      frameworkConf = FrameworkConfiguration.getInstance(getServletContext());
       frameworkUserManager = frameworkConf.getFrameworkUserManager();
       frameworkRdfStoreManager = new SecureRdfStoreManagerImpl(frameworkConf
           .getAuthSparqlEndpoint(), frameworkConf.getAuthSparqlUser(), frameworkConf
@@ -83,7 +83,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
       } else {
         System.out.println("new RdfStoreManagerImpl");
         rdfStoreManager = new RdfStoreManagerImpl(FrameworkConfiguration.getInstance(
-            getServletContext(), false).getPublicSparqlEndpoint());
+            getServletContext()).getPublicSparqlEndpoint());
       }
       String result = rdfStoreManager.execute(query, responseFormat);
       resp.setContentType(responseFormat);

src/main/java/authentication/web/UserManagerServlet.java

@@ -34,7 +34,7 @@ public class UserManagerServlet extends HttpServlet {
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
     try {
-      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext(), false)
+      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext())
           .getFrameworkUserManager();
     } catch (FileNotFoundException e) {
       throw new ServletException(e);
@@ -137,7 +137,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 
       EmailSender emailSender = null;
       try {
-        emailSender = FrameworkConfiguration.getInstance(getServletContext(), false)
+        emailSender = FrameworkConfiguration.getInstance(getServletContext())
             .getDefaultEmailSender();
         emailSender.send(email, "GeoKnow registration", "Your login: " + username + ", password: "
             + password);

src/main/java/authentication/web/VirtuosoProxy.java

@@ -27,7 +27,7 @@ public class VirtuosoProxy extends HttpServlet {
   public void init(ServletConfig config) throws ServletException {
     super.init(config);
     try {
-      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext(), false)
+      frameworkUserManager = FrameworkConfiguration.getInstance(getServletContext())
           .getFrameworkUserManager();
     } catch (FileNotFoundException e) {
       throw new ServletException(e);
@@ -64,7 +64,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
       ObjectPair<String, String> rdfStoreUser = frameworkUserManager.getRdfStoreUser(username,
           token);
       String result = HttpRequestManager.executePost(FrameworkConfiguration.getInstance(
-          getServletContext(), false).getAuthSparqlEndpoint(), urlParameters.toString(),
+          getServletContext()).getAuthSparqlEndpoint(), urlParameters.toString(),
           rdfStoreUser.getFirst(), rdfStoreUser.getSecond());
       resp.getWriter().print(result);
     } catch (Exception e) {

src/main/java/setup/InitialSetupServlet.java

@@ -48,7 +48,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         ServletContext context = getServletContext();
         FrameworkConfiguration frameworkConfiguration = null;
         try {
-            frameworkConfiguration = FrameworkConfiguration.getInstance(context, true);
+            frameworkConfiguration = FrameworkConfiguration.getInstance(context);
         } catch (Exception e) {
             throw new ServletException("Failed to get framework configuration", e);
         }