From 99b7d048cfd447b5e13450bc3f19a8ced9fb42b4 Mon Sep 17 00:00:00 2001
From: Emanuela Epure <67077116+emanuelaepure10@users.noreply.github.com>
Date: Sat, 27 Apr 2024 22:36:14 +0200
Subject: [PATCH] feat: add binding to service provider for use in Groovy
 script

Add an additional binding for the Service Provider to Groovy scripts.

ING-4265
---
 .../META-INF/MANIFEST.MF                                    | 1 -
 .../esdihumboldt/cst/functions/groovy/GroovyConstants.java  | 4 ++--
 .../cst/functions/groovy/internal/GroovyUtil.java           | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
index eaa78a475a..8357112684 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Import-Package: com.google.common.base;version="9.0.0",
  eu.esdihumboldt.hale.common.instance.model,
  eu.esdihumboldt.hale.common.instance.model.impl,
  eu.esdihumboldt.hale.common.instance.orient;resolution:=optional,
- eu.esdihumboldt.hale.common.lookup,
  eu.esdihumboldt.hale.common.schema.geometry,
  eu.esdihumboldt.hale.common.schema.model,
  eu.esdihumboldt.hale.common.schema.model.constraint,
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java
index 563adf5915..4f0200bb57 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java
@@ -70,9 +70,9 @@ public interface GroovyConstants {
 	public static final String BINDING_INSTANCE_INDEX = "_instanceIndex";
 
 	/**
-	 * Name of the lookup service in the binding.
+	 * Name of the service provider in the binding.
 	 */
-	public static final String BINDING_LOOKUP_SERVICE = "_lookup";
+	public static final String BINDING_SERVICE_PROVIDER = "_serviceProvider";
 
 	/**
 	 * Name of the helper functions accessor.
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java
index dd42caeade..baa726cc34 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java
@@ -43,11 +43,11 @@
 import eu.esdihumboldt.hale.common.core.io.Text;
 import eu.esdihumboldt.hale.common.core.io.project.ProjectInfoService;
 import eu.esdihumboldt.hale.common.core.report.SimpleLog;
+import eu.esdihumboldt.hale.common.core.service.ServiceProvider;
 import eu.esdihumboldt.hale.common.instance.groovy.InstanceBuilder;
 import eu.esdihumboldt.hale.common.instance.index.InstanceIndexService;
 import eu.esdihumboldt.hale.common.instance.index.spatial.SpatialIndexService;
 import eu.esdihumboldt.hale.common.instance.model.MutableInstance;
-import eu.esdihumboldt.hale.common.lookup.LookupService;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
 import eu.esdihumboldt.hale.io.groovy.snippets.GroovySnippets;
 import eu.esdihumboldt.util.groovy.sandbox.GroovyService;
@@ -306,8 +306,8 @@ public static Binding createBinding(InstanceBuilder builder, Cell cell, Cell typ
 		binding.setVariable(BINDING_INSTANCE_INDEX,
 				executionContext.getService(InstanceIndexService.class));
 
-		binding.setVariable(BINDING_LOOKUP_SERVICE,
-				executionContext.getService(LookupService.class));
+		binding.setVariable(BINDING_SERVICE_PROVIDER,
+				executionContext.getService(ServiceProvider.class));
 
 		return binding;
 	}