[unomi] branch json-schema-extensions updated: try to Fix tests

[jkevan]

This is an automated email from the ASF dual-hosted git repository.

jkevan pushed a commit to branch json-schema-extensions
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/json-schema-extensions by this 
push:
     new 8d3d69474 try to Fix tests
8d3d69474 is described below

commit 8d3d69474cfa0df8a7d229d3811b8dc404788c4d
Author: Kevan <ke...@jahia.com>
AuthorDate: Mon May 23 11:02:39 2022 +0200

    try to Fix tests
---
 .../unomi/schema/impl/SchemaServiceImpl.java       | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git 
a/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/impl/SchemaServiceImpl.java
 
b/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/impl/SchemaServiceImpl.java
index cdbbc6dab..8dd3507a4 100644
--- 
a/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/impl/SchemaServiceImpl.java
+++ 
b/extensions/json-schema/services/src/main/java/org/apache/unomi/schema/impl/SchemaServiceImpl.java
@@ -24,11 +24,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.MissingNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.networknt.schema.*;
-import com.networknt.schema.uri.URIFetcher;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.unomi.api.Item;
-import org.apache.unomi.api.services.SchedulerService;
 import org.apache.unomi.persistence.spi.PersistenceService;
 import org.apache.unomi.schema.api.JsonSchemaWrapper;
 import org.apache.unomi.schema.api.SchemaService;
@@ -39,10 +37,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 public class SchemaServiceImpl implements SchemaService {
@@ -70,9 +65,13 @@ public class SchemaServiceImpl implements SchemaService {
     private ScheduledFuture<?> scheduledFuture;
 
     private PersistenceService persistenceService;
-    private SchedulerService schedulerService;
     private JsonSchemaFactory jsonSchemaFactory;
 
+    // TODO UNOMI-572: when fixing UNOMI-572 please remove the usage of the 
custom ScheduledExecutorService and re-introduce the Unomi Scheduler Service
+    private ScheduledExecutorService scheduler;
+    //private SchedulerService schedulerService;
+
+
     @Override
     public boolean isValid(String data, String schemaId) {
         JsonSchema jsonSchema;
@@ -288,8 +287,7 @@ public class SchemaServiceImpl implements SchemaService {
                 }
             }
         };
-        scheduledFuture = schedulerService.getScheduleExecutorService()
-                .scheduleWithFixedDelay(task, 0, jsonSchemaRefreshInterval, 
TimeUnit.MILLISECONDS);
+        scheduledFuture = scheduler.scheduleWithFixedDelay(task, 0, 
jsonSchemaRefreshInterval, TimeUnit.MILLISECONDS);
     }
 
     private void initJsonSchemaFactory() {
@@ -317,6 +315,7 @@ public class SchemaServiceImpl implements SchemaService {
     }
 
     public void init() {
+        scheduler = Executors.newSingleThreadScheduledExecutor();
         initPersistenceIndex();
         initJsonSchemaFactory();
         initTimers();
@@ -325,6 +324,9 @@ public class SchemaServiceImpl implements SchemaService {
 
     public void destroy() {
         scheduledFuture.cancel(true);
+        if (scheduler != null) {
+            scheduler.shutdown();
+        }
         logger.info("Schema service shutdown.");
     }
 
@@ -332,10 +334,6 @@ public class SchemaServiceImpl implements SchemaService {
         this.persistenceService = persistenceService;
     }
 
-    public void setSchedulerService(SchedulerService schedulerService) {
-        this.schedulerService = schedulerService;
-    }
-
     public void setJsonSchemaRefreshInterval(Integer 
jsonSchemaRefreshInterval) {
         this.jsonSchemaRefreshInterval = jsonSchemaRefreshInterval;
     }