SSDM-3745: createRequestHandlerPluginRunner() uses the generic way to get the...

SSDM-3745: createRequestHandlerPluginRunner() uses the generic way to get the right Jython evaluator. Remove createEvaluator27WithContentProviders().

SVN: 36760

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java

@@ -30,7 +30,6 @@ import ch.systemsx.cisd.common.jython.JythonUtils;
 import ch.systemsx.cisd.common.jython.evaluator.Evaluator;
 import ch.systemsx.cisd.common.jython.evaluator.EvaluatorException;
 import ch.systemsx.cisd.common.jython.evaluator.IJythonEvaluator;
-import ch.systemsx.cisd.common.jython.v27.Evaluator27;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.resource.IReleasable;
@@ -179,7 +178,7 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
 
         try
         {
-            Evaluator27 evaluator = createEvaluator27WithContentProviders(context, scriptString, pythonPath);
+            IJythonEvaluator evaluator = createEvaluatorWithContentProviders(context, scriptString, pythonPath);
 
             return new RequestHandlerPluginScriptRunner(evaluator);
         } catch (EvaluatorException ex)
@@ -188,36 +187,6 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
         }
     }
 
-    private Evaluator27 createEvaluator27WithContentProviders(DataSetProcessingContext context, String scriptString, String[] pythonPath)
-    {
-        final Evaluator27 evaluator = new Evaluator27("", pythonPath, scriptPath, null, scriptString, false);
-
-        evaluator.set(SEARCH_SERVICE_VARIABLE_NAME, createUserSearchService(context));
-        evaluator.set(SEARCH_SERVICE_UNFILTERED_VARIABLE_NAME, createUnfilteredSearchService());
-
-        evaluator.set(MAIL_SERVICE_VARIABLE_NAME, createMailService(context));
-        evaluator.set(DATA_SOURCE_QUERY_SERVICE_VARIABLE_NAME, createDataSourceQueryService());
-        evaluator.set(AUTHORIZATION_SERVICE, createAuthorizationService());
-        evaluator.set(USER_ID, context.getUserId());
-        evaluator.set(USER_SESSION_TOKEN, context.trySessionToken());
-        final ISessionWorkspaceProvider workspaceProvider =
-                context.tryGetSessionWorkspaceProvider();
-        if (workspaceProvider != null)
-        {
-            evaluator.set(SESSION_WORKSPACE_PROVIDER_NAME, workspaceProvider);
-        }
-
-        DataSetContentProvider contentProvider =
-                new DataSetContentProvider(context.getHierarchicalContentProvider());
-        evaluator.set(CONTENT_PROVIDER_VARIABLE_NAME, contentProvider);
-
-        DataSetContentProvider contentProviderUnfiltered =
-                new DataSetContentProvider(context.getHierarchicalContentProviderUnfiltered());
-        evaluator.set(CONTENT_PROVIDER_UNFILTERED_VARIABLE_NAME, contentProviderUnfiltered);
-
-        return evaluator;
-    }
-
     protected IJythonEvaluator createEvaluator(String scriptString, String[] pythonPath, DataSetProcessingContext context)
     {
         final IJythonEvaluator evaluator = Evaluator.getFactory().create("", pythonPath, null, null, scriptString, false);