diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUI.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUI.java index 078231dd6..6ec5209ec 100644 --- a/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUI.java +++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUI.java @@ -1,85 +1,35 @@ package eu.knowledge.engine.admin; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.HashSet; import java.util.Set; import java.util.UUID; +import java.util.concurrent.Phaser; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.Resource; -import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.sparql.graph.PrefixMappingMem; -import org.apache.jena.sparql.lang.arq.ParseException; -import org.apache.jena.update.UpdateAction; -import org.apache.jena.update.UpdateFactory; -import org.apache.jena.update.UpdateRequest; -import org.apache.jena.vocabulary.RDF; -import org.eclipse.microprofile.config.ConfigProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.knowledge.engine.smartconnector.api.AskKnowledgeInteraction; import eu.knowledge.engine.smartconnector.api.BindingSet; -import eu.knowledge.engine.smartconnector.api.CommunicativeAct; -import eu.knowledge.engine.smartconnector.api.GraphPattern; -import eu.knowledge.engine.smartconnector.api.KnowledgeBase; import eu.knowledge.engine.smartconnector.api.ReactExchangeInfo; -import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; -import eu.knowledge.engine.smartconnector.api.SmartConnector; -import eu.knowledge.engine.smartconnector.api.Vocab; -import eu.knowledge.engine.smartconnector.impl.SmartConnectorBuilder; /** * Knowledge Base that regularly prints an overview of the currently available - * Knowledge Bases within the network. - * - * We use Apache Jena's API extensively to work with the results of our ask. - * + * Knowledge Bases within the network and also provides REST APIs to access the + * same information including relations between knowledge bases. */ -public class AdminUI implements KnowledgeBase { +public class AdminUI extends MetadataKB { private static final Logger LOG = LoggerFactory.getLogger(AdminUI.class); - private static final String META_GRAPH_PATTERN_STR = "?kb rdf:type ke:KnowledgeBase . ?kb ke:hasName ?name . ?kb ke:hasDescription ?description . ?kb ke:hasKnowledgeInteraction ?ki . ?ki rdf:type ?kiType . ?ki ke:isMeta ?isMeta . ?ki ke:hasCommunicativeAct ?act . ?act rdf:type ke:CommunicativeAct . ?act ke:hasRequirement ?req . ?act ke:hasSatisfaction ?sat . ?req rdf:type ?reqType . ?sat rdf:type ?satType . ?ki ke:hasGraphPattern ?gp . ?gp rdf:type ?patternType . ?gp ke:hasPattern ?pattern ."; - - private SmartConnector sc; - private final PrefixMapping prefixes; - - // used for getting initial knowledge about other KBs - private AskKnowledgeInteraction aKI; - // used triggered when new knowledge about other KBs is available - private ReactKnowledgeInteraction rKINew; - // used triggered when knowledge about other KBs changed - private ReactKnowledgeInteraction rKIChanged; - // used triggered when knowledge about other KBs is deleted - private ReactKnowledgeInteraction rKIRemoved; - private static AdminUI instance; private static boolean continuousLog = true; - private static String knowledgeBaseId = "https://knowledge-engine.eu/adminui-" + UUID.randomUUID(); - private Model model; - - private GraphPattern metaGraphPattern; + private static String knowledgeBaseId = "https://knowledge-engine.eu/adminui-" + UUID.randomUUID(); + private static String knowledgeBaseName = "Admin UI"; + private static String knowledgeBaseDescription = "Publishes an overview of all the available Knowledge Bases via a REST API."; - /** - * Intialize a AdminUI that regularly retrieves and prints metadata about the - * available knowledge bases. - */ private AdminUI() { - // store some predefined prefixes - this.prefixes = new PrefixMappingMem(); - this.prefixes.setNsPrefixes(PrefixMapping.Standard); - this.prefixes.setNsPrefix("ke", Vocab.ONTO_URI); - - this.metaGraphPattern = new GraphPattern(this.prefixes, META_GRAPH_PATTERN_STR); - // create a new Smart Connector for this Admin UI - SmartConnectorBuilder.newSmartConnector(this).create(); - - // we wait for the Smart Connector to be ready, before registering our Knowledge - // Interactions and starting the Ask job. + super(knowledgeBaseId, knowledgeBaseName, knowledgeBaseDescription); } public static AdminUI newInstance(boolean useLog) { @@ -87,247 +37,98 @@ public static AdminUI newInstance(boolean useLog) { continuousLog = useLog; instance = new AdminUI(); } - return instance; - } - - @Override - public URI getKnowledgeBaseId() { - try { - return new URI(knowledgeBaseId); - } catch (URISyntaxException e) { - LOG.error("{}", e); - return null; - } - } - @Override - public String getKnowledgeBaseName() { - return "Admin UI"; - } + instance.setPhaser(new Phaser(1)); + instance.start(); + instance.syncKIs(); - @Override - public String getKnowledgeBaseDescription() { - return "Publishes an overview of all the available Knowledge Bases via a REST API."; + return instance; } @Override - public void smartConnectorReady(SmartConnector aSC) { - this.sc = aSC; - - LOG.info("Smart connector ready, now registering Knowledge Interactions."); - - // create the correct Knowledge Interactions - this.aKI = new AskKnowledgeInteraction(new CommunicativeAct(), this.metaGraphPattern, true); - this.rKINew = new ReactKnowledgeInteraction( - new CommunicativeAct(new HashSet(Arrays.asList(Vocab.NEW_KNOWLEDGE_PURPOSE)), - new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), - this.metaGraphPattern, null); - this.rKIChanged = new ReactKnowledgeInteraction( - new CommunicativeAct(new HashSet(Arrays.asList(Vocab.CHANGED_KNOWLEDGE_PURPOSE)), - new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), - this.metaGraphPattern, null); - this.rKIRemoved = new ReactKnowledgeInteraction( - new CommunicativeAct(new HashSet(Arrays.asList(Vocab.REMOVED_KNOWLEDGE_PURPOSE)), - new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), - this.metaGraphPattern, null); - - // register the knowledge interactions with the smart connector. - this.sc.register(this.aKI); - this.sc.register(this.rKINew, (rki, ei) -> this.handleNewKnowledgeBaseKnowledge(ei)); - this.sc.register(this.rKIChanged, (rki, ei) -> this.handleChangedKnowledgeBaseKnowledge(ei)); - this.sc.register(this.rKIRemoved, (rki, ei) -> this.handleRemovedKnowledgeBaseKnowledge(ei)); - - // to receive the initial state, we do a single Ask (after sleeping for a - // specific amount of time) - try { - Thread.sleep( - ConfigProvider.getConfig().getValue(AdminUIConfig.CONF_KEY_INITIAL_ADMIN_UI_DELAY, Integer.class)); - } catch (InterruptedException e) { - LOG.info("{}", e); - } - this.fetchInitialData(); - } + public BindingSet handleNewKnowledgeBase(ReactExchangeInfo ei) { + BindingSet bs = super.handleNewKnowledgeBase(ei); - public BindingSet handleNewKnowledgeBaseKnowledge(ReactExchangeInfo ei) { - if (!this.canReceiveUpdates()) - return new BindingSet(); - - try { - Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), - ei.getArgumentBindings()); - - // this we can simply add to our model - this.model.add(model); - - // when result available (and the config is enabled), we print the - // knowledge bases to the console. - if (continuousLog) { - this.printKnowledgeBases(this.model); - } - } catch (ParseException e) { - e.printStackTrace(); - } - return new BindingSet(); + // when result available (and the config is enabled), we print the + // knowledge bases to the console. + this.printKnowledgeBases(this.getMetadata()); + return bs; } - public BindingSet handleChangedKnowledgeBaseKnowledge(ReactExchangeInfo ei) { - if (!this.canReceiveUpdates()) - return new BindingSet(); - - try { - Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), - ei.getArgumentBindings()); - - // this is a little more complex... we have to: - // - extract the knowledge base that this message is about - // - delete all old data about that knowledge base - // - insert the *new* data about that knowledge base - - Resource kb = model.listSubjectsWithProperty(RDF.type, Vocab.KNOWLEDGE_BASE).next(); - String query = String.format("DELETE { %s } WHERE { %s FILTER (?kb = <%s>) } ", - this.metaGraphPattern.getPattern(), this.metaGraphPattern.getPattern(), kb.toString()); - - UpdateRequest updateRequest = UpdateFactory.create(query); - UpdateAction.execute(updateRequest, this.model); - - this.model.add(model); + @Override + public BindingSet handleChangedKnowledgeBase(ReactExchangeInfo ei) { + BindingSet bs = super.handleChangedKnowledgeBase(ei); - // when result available (and the config is enabled), we print the - // knowledge bases to the console. - if (continuousLog) { - this.printKnowledgeBases(this.model); - } - } catch (ParseException e) { - e.printStackTrace(); - } - return new BindingSet(); + // when result available (and the config is enabled), we print the + // knowledge bases to the console. + this.printKnowledgeBases(this.getMetadata()); + return bs; } - public BindingSet handleRemovedKnowledgeBaseKnowledge(ReactExchangeInfo ei) { - if (!this.canReceiveUpdates()) - return new BindingSet(); - - try { - Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), - ei.getArgumentBindings()); - - // this is also a little complex... we have to: - // - extract the knowledge base that this message is about - // - delete all old data about that knowledge base - - Resource kb = model.listSubjectsWithProperty(RDF.type, Vocab.KNOWLEDGE_BASE).next(); - String query = String.format("DELETE { %s } WHERE { %s FILTER (?kb = <%s>) } ", - this.metaGraphPattern.getPattern(), this.metaGraphPattern.getPattern(), kb.toString()); + @Override + public BindingSet handleRemovedKnowledgeBase(ReactExchangeInfo ei) { + BindingSet bs = super.handleRemovedKnowledgeBase(ei); - UpdateRequest updateRequest = UpdateFactory.create(query); - UpdateAction.execute(updateRequest, this.model); + // when result available (and the config is enabled), we print the + // knowledge bases to the console. + this.printKnowledgeBases(this.getMetadata()); - // when result available (and the config is enabled), we print the - // knowledge bases to the console. - if (continuousLog) { - this.printKnowledgeBases(this.model); - } - } catch (ParseException e) { - e.printStackTrace(); - } - return new BindingSet(); + return bs; } + @Override public void fetchInitialData() { - LOG.info("Retrieving initial other Knowledge Base info..."); + super.fetchInitialData(); - // execute actual *ask* and use previously defined Knowledge Interaction. - this.sc.ask(this.aKI, new BindingSet()).thenAccept(askResult -> { - try { - // using the BindingSet#generateModel() helper method, we can combine the graph - // pattern and the bindings for its variables into a valid RDF Model. - this.model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), - askResult.getBindings()); - this.model.setNsPrefixes(this.prefixes); - // when result available (and the config is enabled), we print the - // knowledge bases to the console. - if (continuousLog) - this.printKnowledgeBases(this.model); - } catch (ParseException e) { - LOG.error("{}", e); - } - }).handle((r, e) -> { - if (r == null && e != null) { - LOG.error("An exception has occured while retrieving other Knowledge Bases info", e); - return null; - } else { - return r; - } - }); - } + // when result available (and the config is enabled), we print the + // knowledge bases to the console. - private boolean canReceiveUpdates() { - return this.model != null; + this.printKnowledgeBases(this.getMetadata()); } - private void printKnowledgeBases(Model model) throws ParseException { + private void printKnowledgeBases(Model model) { - // LOG.info("{}", this.getRDF(model)); + if (continuousLog) { + // LOG.info("{}", this.getRDF(model)); - LOG.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - LOG.info("-=-=-=-=-=-=-= Admin UI -=-=-=-=-=-=-=-"); - LOG.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - if (!model.isEmpty()) { - Set kbs = Util.getKnowledgeBaseURIs(model); + LOG.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); + LOG.info("-=-=-=-=-=-=-= Admin UI -=-=-=-=-=-=-=-"); + LOG.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); + if (!model.isEmpty()) { + Set kbs = Util.getKnowledgeBaseURIs(model); - int i = 0; - for (Resource kbRes : kbs) { - i++; + int i = 0; + for (Resource kbRes : kbs) { + i++; - if (i > 1) { - LOG.info(""); - } + if (i > 1) { + LOG.info(""); + } - LOG.info("Knowledge Base <{}>", kbRes); + LOG.info("Knowledge Base <{}>", kbRes); - LOG.info("\t* Name: {}", Util.getName(model, kbRes)); - LOG.info("\t* Description: {}", Util.getDescription(model, kbRes)); + LOG.info("\t* Name: {}", Util.getName(model, kbRes)); + LOG.info("\t* Description: {}", Util.getDescription(model, kbRes)); - Set kiResources = Util.getKnowledgeInteractionURIs(model, kbRes); + Set kiResources = Util.getKnowledgeInteractionURIs(model, kbRes); - for (Resource kiRes : kiResources) { - String knowledgeInteractionType = Util.getKnowledgeInteractionType(model, kiRes); - LOG.info("\t* {}{}", knowledgeInteractionType, (Util.isMeta(model, kiRes) ? " (meta)" : "")); - if (knowledgeInteractionType.equals("AskKnowledgeInteraction") - || knowledgeInteractionType.equals("AnswerKnowledgeInteraction")) { - LOG.info("\t\t- GraphPattern: {}", Util.getGraphPattern(model, kiRes)); - } else if (knowledgeInteractionType.equals("PostKnowledgeInteraction") - || knowledgeInteractionType.equals("ReactKnowledgeInteraction")) { - LOG.info("\t\t- Argument GP: {}", Util.getArgument(model, kiRes)); - LOG.info("\t\t- Result GP: {}", Util.getResult(model, kiRes)); + for (Resource kiRes : kiResources) { + String knowledgeInteractionType = Util.getKnowledgeInteractionType(model, kiRes); + LOG.info("\t* {}{}", knowledgeInteractionType, (Util.isMeta(model, kiRes) ? " (meta)" : "")); + if (knowledgeInteractionType.equals("AskKnowledgeInteraction") + || knowledgeInteractionType.equals("AnswerKnowledgeInteraction")) { + LOG.info("\t\t- GraphPattern: {}", Util.getGraphPattern(model, kiRes)); + } else if (knowledgeInteractionType.equals("PostKnowledgeInteraction") + || knowledgeInteractionType.equals("ReactKnowledgeInteraction")) { + LOG.info("\t\t- Argument GP: {}", Util.getArgument(model, kiRes)); + LOG.info("\t\t- Result GP: {}", Util.getResult(model, kiRes)); + } } } + } else { + LOG.info("No other knowledge bases found."); } - } else { - LOG.info("No other knowledge bases found."); } } - @Override - public void smartConnectorConnectionLost(SmartConnector aSC) { - LOG.info("Our Smart Connector lost its connection with the Knowledge Network."); - } - - @Override - public void smartConnectorConnectionRestored(SmartConnector aSC) { - LOG.info("Our Smart Connector restored its connection with the Knowledge Network."); - } - - @Override - public void smartConnectorStopped(SmartConnector aSC) { - LOG.info("Our Smart Connector has been succesfully stopped."); - } - - public void close() { - this.sc.stop(); - } - - public Model getModel() { - return model; - } } diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java new file mode 100644 index 000000000..dd0946e00 --- /dev/null +++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java @@ -0,0 +1,233 @@ +package eu.knowledge.engine.admin; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.concurrent.ExecutionException; + +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.sparql.graph.PrefixMappingMem; +import org.apache.jena.sparql.lang.arq.ParseException; +import org.apache.jena.update.UpdateAction; +import org.apache.jena.update.UpdateFactory; +import org.apache.jena.update.UpdateRequest; +import org.apache.jena.vocabulary.RDF; +import org.eclipse.microprofile.config.ConfigProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import eu.knowledge.engine.smartconnector.api.AskKnowledgeInteraction; +import eu.knowledge.engine.smartconnector.api.BindingSet; +import eu.knowledge.engine.smartconnector.api.CommunicativeAct; +import eu.knowledge.engine.smartconnector.api.GraphPattern; +import eu.knowledge.engine.smartconnector.api.ReactExchangeInfo; +import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; +import eu.knowledge.engine.smartconnector.api.Vocab; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; + +/** + * Knowledge Base that keeps track of all other KBs in the network. It does this + * by subscribing to meta knowledge interactions and updating its state + * accordingly. + * + * We use Apache Jena's API extensively to work with the results of our + * interactions. + * + */ +public class MetadataKB extends KnowledgeBaseImpl { + + private static final Logger LOG = LoggerFactory.getLogger(MetadataKB.class); + + private static final String META_GRAPH_PATTERN_STR = "?kb rdf:type ke:KnowledgeBase . ?kb ke:hasName ?name . ?kb ke:hasDescription ?description . ?kb ke:hasKnowledgeInteraction ?ki . ?ki rdf:type ?kiType . ?ki ke:isMeta ?isMeta . ?ki ke:hasCommunicativeAct ?act . ?act rdf:type ke:CommunicativeAct . ?act ke:hasRequirement ?req . ?act ke:hasSatisfaction ?sat . ?req rdf:type ?reqType . ?sat rdf:type ?satType . ?ki ke:hasGraphPattern ?gp . ?gp rdf:type ?patternType . ?gp ke:hasPattern ?pattern ."; + + private final PrefixMapping prefixes; + + // used for getting initial knowledge about other KBs + private AskKnowledgeInteraction aKI; + // used triggered when new knowledge about other KBs is available + private ReactKnowledgeInteraction rKINew; + // used triggered when knowledge about other KBs changed + private ReactKnowledgeInteraction rKIChanged; + // used triggered when knowledge about other KBs is deleted + private ReactKnowledgeInteraction rKIRemoved; + + private Model metadata; + + private GraphPattern metaGraphPattern; + + private boolean timeToSleepAndFetch = true; + + /** + * Intialize a MetadataKB that collects metadata about the available knowledge + * bases. + */ + public MetadataKB(String id, String name, String description) { + super(id, name, description); + + // store some predefined prefixes + this.prefixes = new PrefixMappingMem(); + this.prefixes.setNsPrefixes(PrefixMapping.Standard); + this.prefixes.setNsPrefix("ke", Vocab.ONTO_URI); + + this.metaGraphPattern = new GraphPattern(this.prefixes, META_GRAPH_PATTERN_STR); + + // create the correct Knowledge Interactions + this.aKI = new AskKnowledgeInteraction(new CommunicativeAct(), this.metaGraphPattern, true); + this.rKINew = new ReactKnowledgeInteraction( + new CommunicativeAct(new HashSet(Arrays.asList(Vocab.NEW_KNOWLEDGE_PURPOSE)), + new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), + this.metaGraphPattern, null); + this.rKIChanged = new ReactKnowledgeInteraction( + new CommunicativeAct(new HashSet(Arrays.asList(Vocab.CHANGED_KNOWLEDGE_PURPOSE)), + new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), + this.metaGraphPattern, null); + this.rKIRemoved = new ReactKnowledgeInteraction( + new CommunicativeAct(new HashSet(Arrays.asList(Vocab.REMOVED_KNOWLEDGE_PURPOSE)), + new HashSet(Arrays.asList(Vocab.INFORM_PURPOSE))), + this.metaGraphPattern, null); + + // register the knowledge interactions with the smart connector. + this.register(this.aKI); + this.register(this.rKINew, (rki, ei) -> this.handleNewKnowledgeBase(ei)); + this.register(this.rKIChanged, (rki, ei) -> this.handleChangedKnowledgeBase(ei)); + this.register(this.rKIRemoved, (rki, ei) -> this.handleRemovedKnowledgeBase(ei)); + + } + + @Override + public void syncKIs() { + super.syncKIs(); + + if (timeToSleepAndFetch) { + // to receive the initial state, we do a single Ask (after sleeping for a + // specific amount of time) + try { + Thread.sleep(ConfigProvider.getConfig().getValue(AdminUIConfig.CONF_KEY_INITIAL_ADMIN_UI_DELAY, + Integer.class)); + } catch (InterruptedException e) { + LOG.error("Initial metadata KB delay should not fail.", e); + } + this.fetchInitialData(); + this.timeToSleepAndFetch = false; + } + } + + public BindingSet handleNewKnowledgeBase(ReactExchangeInfo ei) { + if (!this.canReceiveUpdates()) + return new BindingSet(); + + try { + Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), + ei.getArgumentBindings()); + + Resource kb = model.listSubjectsWithProperty(RDF.type, Vocab.KNOWLEDGE_BASE).next(); + this.metadata.add(model); + LOG.debug("Modified metadata with new KB '{}'.", kb); + } catch (ParseException e) { + LOG.error("{}", e); + } + return new BindingSet(); + } + + public BindingSet handleChangedKnowledgeBase(ReactExchangeInfo ei) { + + if (!this.canReceiveUpdates()) + return new BindingSet(); + + try { + Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), + ei.getArgumentBindings()); + + // this is a little more complex... we have to: + // - extract the knowledge base that this message is about + // - delete all old data about that knowledge base + // - insert the *new* data about that knowledge base + + Resource kb = model.listSubjectsWithProperty(RDF.type, Vocab.KNOWLEDGE_BASE).next(); + String query = String.format("DELETE { %s } WHERE { %s FILTER (?kb = <%s>) } ", + this.metaGraphPattern.getPattern(), this.metaGraphPattern.getPattern(), kb.toString()); + + UpdateRequest updateRequest = UpdateFactory.create(query); + UpdateAction.execute(updateRequest, this.metadata); + + this.metadata.add(model); + + LOG.debug("Modified metadata with changed KB '{}'.", kb); + + } catch (ParseException e) { + LOG.error("{}", e); + } + return new BindingSet(); + } + + public BindingSet handleRemovedKnowledgeBase(ReactExchangeInfo ei) { + if (!this.canReceiveUpdates()) + return new BindingSet(); + + try { + Model model = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), + ei.getArgumentBindings()); + + // this is also a little complex... we have to: + // - extract the knowledge base that this message is about + // - delete all old data about that knowledge base + + Resource kb = model.listSubjectsWithProperty(RDF.type, Vocab.KNOWLEDGE_BASE).next(); + String query = String.format("DELETE { %s } WHERE { %s FILTER (?kb = <%s>) } ", + this.metaGraphPattern.getPattern(), this.metaGraphPattern.getPattern(), kb.toString()); + + UpdateRequest updateRequest = UpdateFactory.create(query); + UpdateAction.execute(updateRequest, this.metadata); + + LOG.debug("Modified metadata with deleted KB '{}'.", kb); + + } catch (ParseException e) { + LOG.error("{}", e); + } + return new BindingSet(); + } + + public void fetchInitialData() { + LOG.info("Retrieving initial other Knowledge Base info..."); + + try { + + // execute actual *ask* and use previously defined Knowledge Interaction. + this.getSC().ask(this.aKI, new BindingSet()).thenAccept(askResult -> { + try { + // using the BindingSet#generateModel() helper method, we can combine the graph + // pattern and the bindings for its variables into a valid RDF Model. + this.metadata = eu.knowledge.engine.smartconnector.impl.Util.generateModel(this.aKI.getPattern(), + askResult.getBindings()); + this.metadata.setNsPrefixes(this.prefixes); + + } catch (ParseException e) { + LOG.error("{}", e); + } + }).handle((r, e) -> { + if (r == null && e != null) { + LOG.error("An exception has occured while retrieving other Knowledge Bases info", e); + return null; + } else { + return r; + } + }).get(); + } catch (ExecutionException | InterruptedException ee) { + LOG.error("{}", ee); + } + + } + + protected boolean canReceiveUpdates() { + return this.metadata != null; + } + + public void close() { + this.stop(); + } + + public Model getMetadata() { + return metadata; + } +} diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/api/RestServer.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/api/RestServer.java index 5845fa550..1335080c9 100644 --- a/admin-ui/src/main/java/eu/knowledge/engine/admin/api/RestServer.java +++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/api/RestServer.java @@ -1,8 +1,5 @@ package eu.knowledge.engine.admin.api; -import eu.knowledge.engine.admin.AdminUI; -import eu.knowledge.engine.rest.api.CORSFilter; - import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -12,6 +9,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import eu.knowledge.engine.admin.AdminUI; +import eu.knowledge.engine.rest.api.CORSFilter; + public class RestServer { private static final Logger LOG = LoggerFactory.getLogger(RestServer.class); @@ -45,7 +45,7 @@ public static void main(String[] args) { ServletContainer scRuntime = new ServletContainer(rcRuntime); ServletHolder jerseyRuntimeServlet = new ServletHolder(scRuntime); ctx.addServlet(jerseyRuntimeServlet, "/runtime/*"); - + ResourceConfig rcAdmin = new ResourceConfig(); rcAdmin.property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true); rcAdmin.property(ServerProperties.WADL_FEATURE_DISABLE, true); diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/api/impl/AdminApiServiceImpl.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/api/impl/AdminApiServiceImpl.java index c04ee69ad..fcafa67e5 100644 --- a/admin-ui/src/main/java/eu/knowledge/engine/admin/api/impl/AdminApiServiceImpl.java +++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/api/impl/AdminApiServiceImpl.java @@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.admin.AdminUI; +import eu.knowledge.engine.admin.MetadataKB; import eu.knowledge.engine.admin.Util; import eu.knowledge.engine.admin.model.AnswerKnowledgeInteraction; import eu.knowledge.engine.admin.model.AskKnowledgeInteraction; @@ -91,7 +92,7 @@ public void getSCOverview( @Suspended final AsyncResponse asyncResponse, @Context SecurityContext securityContext) throws NotFoundException { admin = AdminUI.newInstance(false); - model = this.admin.getModel(); // todo: needs locking for multi-threading? Read while write is busy. + model = this.admin.getMetadata(); // todo: needs locking for multi-threading? Read while write is busy. if (model != null && !model.isEmpty()) { Set kbs = Util.getKnowledgeBaseURIs(model); SmartConnector[] responses = findAndAddConnections(convertToModel(kbs, model, includeMeta)); diff --git a/admin-ui/src/test/java/eu/knowledge/engine/admin/api/TestApiRoutes.java b/admin-ui/src/test/java/eu/knowledge/engine/admin/api/TestApiRoutes.java index 290029cd5..8e5ea27b9 100644 --- a/admin-ui/src/test/java/eu/knowledge/engine/admin/api/TestApiRoutes.java +++ b/admin-ui/src/test/java/eu/knowledge/engine/admin/api/TestApiRoutes.java @@ -1,19 +1,9 @@ package eu.knowledge.engine.admin.api; -import com.fasterxml.jackson.databind.ObjectMapper; - -import eu.knowledge.engine.admin.AdminUI; -import eu.knowledge.engine.smartconnector.api.*; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; - -import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.sparql.graph.PrefixMappingMem; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.io.OutputStream; @@ -29,15 +19,35 @@ import java.util.Collections; import java.util.concurrent.CountDownLatch; -import static org.junit.jupiter.api.Assertions.*; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.sparql.graph.PrefixMappingMem; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import eu.knowledge.engine.admin.AdminUI; +import eu.knowledge.engine.smartconnector.api.AnswerHandler; +import eu.knowledge.engine.smartconnector.api.AnswerKnowledgeInteraction; +import eu.knowledge.engine.smartconnector.api.AskKnowledgeInteraction; +import eu.knowledge.engine.smartconnector.api.Binding; +import eu.knowledge.engine.smartconnector.api.BindingSet; +import eu.knowledge.engine.smartconnector.api.CommunicativeAct; +import eu.knowledge.engine.smartconnector.api.GraphPattern; +import eu.knowledge.engine.smartconnector.api.SmartConnector; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class TestApiRoutes { private Thread thread; private static final Logger LOG = LoggerFactory.getLogger(TestApiRoutes.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; private static AdminUI admin; private HttpClient httpClient; @@ -242,7 +252,7 @@ public void startKbs() throws InterruptedException { int wait = 2; final CountDownLatch kb2ReceivedData = new CountDownLatch(1); - kb1 = new MockedKnowledgeBase("kb1") { + kb1 = new KnowledgeBaseImpl("kb1") { @Override public void smartConnectorReady(SmartConnector aSC) { LOG.info("smartConnector of {} ready.", this.name); @@ -269,7 +279,7 @@ public void smartConnectorReady(SmartConnector aSC) { // todo: ask/poll if ready instead of waiting Thread.sleep(5000); kb2 = null; - kb2 = new MockedKnowledgeBase("kb2") { + kb2 = new KnowledgeBaseImpl("kb2") { @Override public void smartConnectorReady(SmartConnector aSC) { LOG.info("smartConnector of {} ready.", this.name); @@ -294,7 +304,7 @@ public void stopKbs() { stopKb(kb2); } - public void stopKb(MockedKnowledgeBase aKb) { + public void stopKb(KnowledgeBaseImpl aKb) { if (aKb != null) { aKb.stop(); } diff --git a/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/MockedKnowledgeBase.java b/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeBaseImpl.java similarity index 95% rename from smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/MockedKnowledgeBase.java rename to smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeBaseImpl.java index eb96b4733..91501f03b 100644 --- a/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/MockedKnowledgeBase.java +++ b/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeBaseImpl.java @@ -46,9 +46,9 @@ import eu.knowledge.engine.smartconnector.impl.SmartConnectorBuilder; import eu.knowledge.engine.smartconnector.impl.Util; -public class MockedKnowledgeBase implements KnowledgeBase { +public class KnowledgeBaseImpl implements KnowledgeBase { - private static final Logger LOG = LoggerFactory.getLogger(MockedKnowledgeBase.class); + private static final Logger LOG = LoggerFactory.getLogger(KnowledgeBaseImpl.class); private final Set registeredAskKIs; private final Map registeredAnswerKIs; @@ -68,7 +68,10 @@ public class MockedKnowledgeBase implements KnowledgeBase { private Set domainKnowledge = new HashSet<>(); private SmartConnector sc; + + protected URI id; protected String name; + protected String description; private Phaser readyPhaser; private CompletableFuture stoppedFuture = new CompletableFuture(); @@ -83,7 +86,13 @@ public class MockedKnowledgeBase implements KnowledgeBase { */ private boolean isThreadSafe = false; - public MockedKnowledgeBase(String aName) { + public KnowledgeBaseImpl(String aName) { + this(null, aName, null); + } + + public KnowledgeBaseImpl(String anId, String aName, String aDescription) { + + assert aName != null; this.registeredAskKIs = ConcurrentHashMap.newKeySet(); this.registeredAnswerKIs = new ConcurrentHashMap<>(); @@ -100,7 +109,28 @@ public MockedKnowledgeBase(String aName) { this.unregisteredPostKIs = ConcurrentHashMap.newKeySet(); this.unregisteredReactKIs = ConcurrentHashMap.newKeySet(); + // name this.name = aName; + + // id + var someId = anId; + if (someId == null) + someId = "https://www.tno.nl/" + this.name; + + URI uri = null; + try { + uri = new URI(someId); + } catch (URISyntaxException e) { + LOG.error("Could not parse the uri.", e); + } + this.id = uri; + + // description + var someDescr = aDescription; + if (someDescr == null) + someDescr = "Description of " + this.name; + + this.description = someDescr; } /** @@ -119,18 +149,12 @@ public void setPhaser(Phaser aReadyPhaser) { @Override public URI getKnowledgeBaseId() { - URI uri = null; - try { - uri = new URI("https://www.tno.nl/" + this.name); - } catch (URISyntaxException e) { - LOG.error("Could not parse the uri.", e); - } - return uri; + return this.id; } @Override public String getKnowledgeBaseDescription() { - return "description of " + this.name; + return this.description; } @Override @@ -161,7 +185,7 @@ public String getKnowledgeBaseName() { return this.name; } - private SmartConnector getSC() { + protected SmartConnector getSC() { return this.sc; } @@ -267,7 +291,7 @@ public Map getReactKnowledgeInteraction } public boolean isUpToDate(AskKnowledgeInteraction askKnowledgeInteraction, - Set someKnowledgeBases) { + Set someKnowledgeBases) { boolean isUpToDate = true; @@ -282,7 +306,7 @@ public boolean isUpToDate(AskKnowledgeInteraction askKnowledgeInteraction, // m.write(System.out, "turtle"); // System.out.println("-----------------------"); - for (MockedKnowledgeBase aKnowledgeBase : someKnowledgeBases) { + for (KnowledgeBaseImpl aKnowledgeBase : someKnowledgeBases) { if (!this.getKnowledgeBaseId().toString().equals(aKnowledgeBase.getKnowledgeBaseId().toString())) { isUpToDate &= isKnowledgeBaseUpToDate(aKnowledgeBase, m); } @@ -296,7 +320,7 @@ public boolean isUpToDate(AskKnowledgeInteraction askKnowledgeInteraction, } - private boolean isKnowledgeBaseUpToDate(MockedKnowledgeBase aMockedKB, Model aModel) { + private boolean isKnowledgeBaseUpToDate(KnowledgeBaseImpl aMockedKB, Model aModel) { boolean isSame = true; Resource kb = ResourceFactory.createResource(aMockedKB.getKnowledgeBaseId().toString()); diff --git a/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeNetwork.java b/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeNetwork.java index 810dd1bd3..699fbfdd4 100644 --- a/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeNetwork.java +++ b/smart-connector/src/main/java/eu/knowledge/engine/smartconnector/util/KnowledgeNetwork.java @@ -30,8 +30,8 @@ public class KnowledgeNetwork { * ready, Phase 2 = everybody is aware of everybody. */ private Phaser readyPhaser; - private Set knowledgeBases; - private Map knowledgeInteractionMetadata; + private Set knowledgeBases; + private Map knowledgeInteractionMetadata; private PrefixMapping prefixMapping; public KnowledgeNetwork() { @@ -43,7 +43,7 @@ public KnowledgeNetwork() { this.prefixMapping.setNsPrefix("kb", Vocab.ONTO_URI); } - public void addKB(MockedKnowledgeBase aKB) { + public void addKB(KnowledgeBaseImpl aKB) { aKB.setPhaser(this.readyPhaser); knowledgeBases.add(aKB); } @@ -59,9 +59,9 @@ public void sync() { */ private void startAndWaitForReady() { - Set justStartedKBs = new HashSet<>(); + Set justStartedKBs = new HashSet<>(); - for (MockedKnowledgeBase kb : this.knowledgeBases) { + for (KnowledgeBaseImpl kb : this.knowledgeBases) { if (!kb.isStarted()) { kb.start(); justStartedKBs.add(kb); @@ -87,14 +87,14 @@ private void startAndWaitForReady() { // @formatter:on ); - for (MockedKnowledgeBase kb : justStartedKBs) { + for (KnowledgeBaseImpl kb : justStartedKBs) { AskKnowledgeInteraction anAskKI = new AskKnowledgeInteraction(new CommunicativeAct(), gp, null, false, true, false, MatchStrategy.ENTRY_LEVEL); this.knowledgeInteractionMetadata.put(kb, anAskKI); kb.register(anAskKI); } - for (MockedKnowledgeBase kb : this.knowledgeBases) { + for (KnowledgeBaseImpl kb : this.knowledgeBases) { kb.syncKIs(); } } @@ -110,9 +110,9 @@ private void waitForUpToDate() { count++; LOG.info("Checking up to date knowledge bases."); allUpToDate = true; - Map upToDate = new HashMap<>(); + Map upToDate = new HashMap<>(); boolean kbUpToDate; - for (MockedKnowledgeBase kb : this.knowledgeBases) { + for (KnowledgeBaseImpl kb : this.knowledgeBases) { kbUpToDate = kb.isUpToDate(this.knowledgeInteractionMetadata.get(kb), this.knowledgeBases); allUpToDate &= kbUpToDate; upToDate.put(kb, kbUpToDate); @@ -130,11 +130,11 @@ private void waitForUpToDate() { LOG.info("Everyone is up to date after {} rounds!", count); } - private String getUpToDateInfo(Map upToDate) { + private String getUpToDateInfo(Map upToDate) { StringBuilder sb = new StringBuilder(); sb.append("("); - for (Map.Entry entry : upToDate.entrySet()) { + for (Map.Entry entry : upToDate.entrySet()) { sb.append(entry.getKey().getKnowledgeBaseName()).append("=").append(entry.getValue()); sb.append(","); } diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/AdditionForAudienceTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/AdditionForAudienceTest.java index ca0192c2c..cccb7d2a3 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/AdditionForAudienceTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/AdditionForAudienceTest.java @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @Tag("Long") public class AdditionForAudienceTest { @@ -72,12 +72,12 @@ public BindingSet react(ReactKnowledgeInteraction anRKI, ReactExchangeInfo aReac } }; - MockedKnowledgeBase kb1; - MockedKnowledgeBase kb10; - MockedKnowledgeBase kb100; - MockedKnowledgeBase kbSum; - MockedKnowledgeBase kbNum; - MockedKnowledgeBase kbRule; + KnowledgeBaseImpl kb1; + KnowledgeBaseImpl kb10; + KnowledgeBaseImpl kb100; + KnowledgeBaseImpl kbSum; + KnowledgeBaseImpl kbNum; + KnowledgeBaseImpl kbRule; private AskKnowledgeInteraction askKI; private static KnowledgeNetwork kn; @@ -86,7 +86,7 @@ public void beforeAll() { kn = new KnowledgeNetwork(); // kb1 - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); @@ -97,7 +97,7 @@ public void beforeAll() { kb1.register(reactKI, new MyReactHandler(1)); // kb10 - kb10 = new MockedKnowledgeBase("kb10"); + kb10 = new KnowledgeBaseImpl("kb10"); kb10.setReasonerEnabled(true); kn.addKB(kb10); reactKI = new ReactKnowledgeInteraction(new CommunicativeAct(), new GraphPattern( @@ -106,7 +106,7 @@ public void beforeAll() { "?e ?n3 . ?n3 . ?n3 ?d3 . ?d3 \"2\" . ?d3 ?ad3 . ?d3 ?o .")); kb10.register(reactKI, new MyReactHandler(2)); - kb100 = new MockedKnowledgeBase("kb100"); + kb100 = new KnowledgeBaseImpl("kb100"); kb100.setReasonerEnabled(true); kn.addKB(kb100); reactKI = new ReactKnowledgeInteraction(new CommunicativeAct(), new GraphPattern( @@ -115,7 +115,7 @@ public void beforeAll() { "?e ?n3 . ?n3 . ?n3 ?d3 . ?d3 \"3\" . ?d3 ?ad3 . ?d3 ?o .")); kb100.register(reactKI, new MyReactHandler(3)); - kbSum = new MockedKnowledgeBase("kbSum"); + kbSum = new KnowledgeBaseImpl("kbSum"); kbSum.setReasonerEnabled(true); kn.addKB(kbSum); @@ -187,7 +187,7 @@ public void beforeAll() { return bs; }); - kbNum = new MockedKnowledgeBase("kbNum"); + kbNum = new KnowledgeBaseImpl("kbNum"); kbNum.setReasonerEnabled(true); kn.addKB(kbNum); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/GeneralizeIfNecessaryTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/GeneralizeIfNecessaryTest.java index a899e9e8d..38ea10f85 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/GeneralizeIfNecessaryTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/GeneralizeIfNecessaryTest.java @@ -16,7 +16,7 @@ import eu.knowledge.engine.reasoner.Rule; import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; /** * This test tries to illustrate generalize if necessary. We instantiate @@ -36,10 +36,10 @@ public class GeneralizeIfNecessaryTest { private static final Logger LOG = LoggerFactory.getLogger(GeneralizeIfNecessaryTest.class); private static KnowledgeNetwork kn = new KnowledgeNetwork(); - private MockedKnowledgeBase appKb = new MockedKnowledgeBase("AppKB"); - private MockedKnowledgeBase sensor1Kb = new MockedKnowledgeBase("Sensor1KB"); - private MockedKnowledgeBase sensor2Kb = new MockedKnowledgeBase("Sensor2KB"); - private MockedKnowledgeBase floorplanKb = new MockedKnowledgeBase("FloorplanKB"); + private KnowledgeBaseImpl appKb = new KnowledgeBaseImpl("AppKB"); + private KnowledgeBaseImpl sensor1Kb = new KnowledgeBaseImpl("Sensor1KB"); + private KnowledgeBaseImpl sensor2Kb = new KnowledgeBaseImpl("Sensor2KB"); + private KnowledgeBaseImpl floorplanKb = new KnowledgeBaseImpl("FloorplanKB"); private PrefixMapping prefixes = new PrefixMappingMem().setNsPrefix("ex", "http://example.org/").setNsPrefix("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/MultiThreadingPerformanceTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/MultiThreadingPerformanceTest.java index 338a9e76a..474d42728 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/MultiThreadingPerformanceTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/MultiThreadingPerformanceTest.java @@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; /** * This test tries to balance the number of threads posting to a single KB to @@ -82,8 +82,8 @@ public void run() { private Queue timings = new ConcurrentLinkedQueue(); private KnowledgeNetwork kn = null; - private MockedKnowledgeBase poster = null; - private MockedKnowledgeBase reacter = null; + private KnowledgeBaseImpl poster = null; + private KnowledgeBaseImpl reacter = null; private PostKnowledgeInteraction postKI = null; private ReactKnowledgeInteraction reactKI = null; @@ -151,10 +151,10 @@ public void run() { public void test() throws InterruptedException { kn = new KnowledgeNetwork(); - poster = new MockedKnowledgeBase("poster"); + poster = new KnowledgeBaseImpl("poster"); poster.setIsThreadSafe(true); kn.addKB(poster); - reacter = new MockedKnowledgeBase("reacter"); + reacter = new KnowledgeBaseImpl("reacter"); reacter.setIsThreadSafe(true); kn.addKB(reacter); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/NotDesignedToWorkTogetherTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/NotDesignedToWorkTogetherTest.java index c26a27381..b12bc52be 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/NotDesignedToWorkTogetherTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/NotDesignedToWorkTogetherTest.java @@ -19,7 +19,7 @@ import eu.knowledge.engine.reasoner.Rule; import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; /** * This test tries to illustrate forward compatibility. We instantiate an @@ -37,9 +37,9 @@ public class NotDesignedToWorkTogetherTest { private static final Logger LOG = LoggerFactory.getLogger(NotDesignedToWorkTogetherTest.class); private static KnowledgeNetwork kn = new KnowledgeNetwork(); - private MockedKnowledgeBase appKb = new MockedKnowledgeBase("AppKB"); - private MockedKnowledgeBase lamp1Kb = new MockedKnowledgeBase("Lamp1KB"); - private MockedKnowledgeBase lamp2Kb = new MockedKnowledgeBase("Lamp2KB"); + private KnowledgeBaseImpl appKb = new KnowledgeBaseImpl("AppKB"); + private KnowledgeBaseImpl lamp1Kb = new KnowledgeBaseImpl("Lamp1KB"); + private KnowledgeBaseImpl lamp2Kb = new KnowledgeBaseImpl("Lamp2KB"); private PrefixMapping prefixes = new PrefixMappingMem().setNsPrefix("ex", "http://example.org/") .setNsPrefix("time", "https://www.w3.org/TR/owl-time/") .setNsPrefix("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/SingleLargeVsMultipleSmallGraphPatternTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/SingleLargeVsMultipleSmallGraphPatternTest.java index ee705c476..029e31c6d 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/SingleLargeVsMultipleSmallGraphPatternTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/SingleLargeVsMultipleSmallGraphPatternTest.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; /** * What is faster: @@ -37,10 +37,10 @@ public class SingleLargeVsMultipleSmallGraphPatternTest { public void testSingleLargeGP() throws InterruptedException, ExecutionException { // creating SCs - MockedKnowledgeBase kb1 = new MockedKnowledgeBase("KB1"); + KnowledgeBaseImpl kb1 = new KnowledgeBaseImpl("KB1"); kn1.addKB(kb1); kb1.setReasonerEnabled(true); - MockedKnowledgeBase kb2 = new MockedKnowledgeBase("KB2"); + KnowledgeBaseImpl kb2 = new KnowledgeBaseImpl("KB2"); kn1.addKB(kb2); kb2.setReasonerEnabled(true); @@ -95,10 +95,10 @@ public void testSingleLargeGP() throws InterruptedException, ExecutionException public void testMultipleSmallGPs() throws InterruptedException, ExecutionException { // creating SCs - MockedKnowledgeBase kb1 = new MockedKnowledgeBase("KB1"); + KnowledgeBaseImpl kb1 = new KnowledgeBaseImpl("KB1"); kn2.addKB(kb1); kb1.setReasonerEnabled(true); - MockedKnowledgeBase kb2 = new MockedKnowledgeBase("KB2"); + KnowledgeBaseImpl kb2 = new KnowledgeBaseImpl("KB2"); kn2.addKB(kb2); kb2.setReasonerEnabled(true); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer.java index a04a1ffee..f36a4de27 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer.java @@ -24,14 +24,14 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswer { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswer.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -45,9 +45,9 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); LOG.info("Waiting for ready..."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer2.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer2.java index 810ae36f9..ac16d322f 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer2.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer2.java @@ -19,14 +19,14 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswer2 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswer2.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -40,9 +40,9 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); LOG.info("Waiting for ready..."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer3.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer3.java index 0e31fc454..8bab526d2 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer3.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer3.java @@ -31,16 +31,16 @@ import eu.knowledge.engine.smartconnector.api.CommunicativeAct; import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswer3 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswer3.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; - private static MockedKnowledgeBase kb4; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; + private static KnowledgeBaseImpl kb4; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -54,13 +54,13 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); - kb4 = new MockedKnowledgeBase("kb4"); + kb4 = new KnowledgeBaseImpl("kb4"); kn.addKB(kb4); GraphPattern gp1 = new GraphPattern(prefixes, "?a ?c."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer4.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer4.java index 36cdd3ca6..1642d88b2 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer4.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer4.java @@ -19,14 +19,14 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswer4 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswer4.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -40,10 +40,10 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kb1.setReasonerEnabled(true); kn.addKB(kb2); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer5.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer5.java index 50fc0d9da..c091bee5d 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer5.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswer5.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswer5 { @@ -42,16 +42,16 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); this.kn = new KnowledgeNetwork(); - MockedKnowledgeBase kb1 = new MockedKnowledgeBase("kb1"); + KnowledgeBaseImpl kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); - MockedKnowledgeBase kb2 = new MockedKnowledgeBase("kb2"); + KnowledgeBaseImpl kb2 = new KnowledgeBaseImpl("kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); - MockedKnowledgeBase kb3 = new MockedKnowledgeBase("kb3"); + KnowledgeBaseImpl kb3 = new KnowledgeBaseImpl("kb3"); kb3.setReasonerEnabled(true); kn.addKB(kb3); - MockedKnowledgeBase kb4 = new MockedKnowledgeBase("kb4"); + KnowledgeBaseImpl kb4 = new KnowledgeBaseImpl("kb4"); kb4.setReasonerEnabled(true); kn.addKB(kb4); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerBindingValidity.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerBindingValidity.java index f50ddc287..f2eb1e887 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerBindingValidity.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerBindingValidity.java @@ -18,14 +18,14 @@ import eu.knowledge.engine.smartconnector.api.ExchangeInfo.Status; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerBindingValidity { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerBindingValidity.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @Test public void testAskAnswerInvalidOutgoingBindings() throws InterruptedException { @@ -35,9 +35,9 @@ public void testAskAnswerInvalidOutgoingBindings() throws InterruptedException { prefixes.setNsPrefix("ex", "https://example.org/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); final AtomicBoolean wasInAnswerHandler = new AtomicBoolean(false); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerManyKIs.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerManyKIs.java index 669fe004a..af2218479 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerManyKIs.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerManyKIs.java @@ -24,17 +24,17 @@ import org.slf4j.helpers.MessageFormatter; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @Tag("Long") public class TestAskAnswerManyKIs { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerManyKIs.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; - private static MockedKnowledgeBase kb4; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; + private static KnowledgeBaseImpl kb4; private String pattern = "?{} ?{}."; @@ -50,13 +50,13 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); - kb4 = new MockedKnowledgeBase("kb4"); + kb4 = new KnowledgeBaseImpl("kb4"); kn.addKB(kb4); int count = 50; diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerRealistic.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerRealistic.java index 735fe3866..33a9b9585 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerRealistic.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerRealistic.java @@ -23,23 +23,23 @@ import eu.knowledge.engine.reasoner.Rule; import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @Disabled public class TestAskAnswerRealistic { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerRealistic.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; - private static MockedKnowledgeBase kb4; - private static MockedKnowledgeBase kb5; - private static MockedKnowledgeBase kb6; - private static MockedKnowledgeBase kb7; - private static MockedKnowledgeBase kb8; - private static MockedKnowledgeBase kb9; - private static MockedKnowledgeBase kb10; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; + private static KnowledgeBaseImpl kb4; + private static KnowledgeBaseImpl kb5; + private static KnowledgeBaseImpl kb6; + private static KnowledgeBaseImpl kb7; + private static KnowledgeBaseImpl kb8; + private static KnowledgeBaseImpl kb9; + private static KnowledgeBaseImpl kb10; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -51,25 +51,25 @@ public void testAskAnswer() throws InterruptedException { var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kb2.setReasonerEnabled(true); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kb3.setReasonerEnabled(true); - kb4 = new MockedKnowledgeBase("kb4"); + kb4 = new KnowledgeBaseImpl("kb4"); kb4.setReasonerEnabled(true); - kb5 = new MockedKnowledgeBase("kb5"); + kb5 = new KnowledgeBaseImpl("kb5"); kb5.setReasonerEnabled(true); - kb6 = new MockedKnowledgeBase("kb6"); + kb6 = new KnowledgeBaseImpl("kb6"); kb6.setReasonerEnabled(true); - kb7 = new MockedKnowledgeBase("kb7"); + kb7 = new KnowledgeBaseImpl("kb7"); kb7.setReasonerEnabled(true); - kb8 = new MockedKnowledgeBase("kb8"); + kb8 = new KnowledgeBaseImpl("kb8"); kb8.setReasonerEnabled(true); - kb9 = new MockedKnowledgeBase("kb9"); + kb9 = new KnowledgeBaseImpl("kb9"); kb9.setReasonerEnabled(true); - kb10 = new MockedKnowledgeBase("kb10"); + kb10 = new KnowledgeBaseImpl("kb10"); kb10.setReasonerEnabled(true); var rules = new HashSet(); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerSingleKBMultipleMatchingKIs.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerSingleKBMultipleMatchingKIs.java index 5c3ccae4a..f6513d8b2 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerSingleKBMultipleMatchingKIs.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerSingleKBMultipleMatchingKIs.java @@ -32,14 +32,14 @@ import eu.knowledge.engine.smartconnector.api.CommunicativeAct; import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerSingleKBMultipleMatchingKIs { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerSingleKBMultipleMatchingKIs.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -53,10 +53,10 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerUnregister.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerUnregister.java index 6203a18b9..769b25c97 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerUnregister.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerUnregister.java @@ -27,14 +27,14 @@ import eu.knowledge.engine.smartconnector.api.CommunicativeAct; import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerUnregister { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerUnregister.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -48,9 +48,9 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); GraphPattern gp1 = new GraphPattern(prefixes, "?a ?c."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled1.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled1.java index 4d850acac..f49501bfd 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled1.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled1.java @@ -21,13 +21,13 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerWithGapsEnabled1 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerWithGapsEnabled1.class); - private static MockedKnowledgeBase kbRelationAsker; + private static KnowledgeBaseImpl kbRelationAsker; private static KnowledgeNetwork kn; @@ -89,7 +89,7 @@ private void setupNetwork() { public void instantiateAskRelationsKB() { // start a knowledge base with the behavior "I am interested in related people" - kbRelationAsker = new MockedKnowledgeBase("RelationAsker"); + kbRelationAsker = new KnowledgeBaseImpl("RelationAsker"); kbRelationAsker.setReasonerEnabled(true); // Register an Ask pattern for relations with knowledge gaps enabled diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled2.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled2.java index 9321ee1b3..56b18acfb 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled2.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled2.java @@ -24,14 +24,14 @@ import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerWithGapsEnabled2 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerWithGapsEnabled2.class); - private static MockedKnowledgeBase kbRelationAsker; - private static MockedKnowledgeBase kbRelationProvider; + private static KnowledgeBaseImpl kbRelationAsker; + private static KnowledgeBaseImpl kbRelationProvider; private static KnowledgeNetwork kn; @@ -106,7 +106,7 @@ private void setupNetwork() { public void instantiateAskRelationsKB() { // start a knowledge base with the behavior "I am interested in related people" - kbRelationAsker = new MockedKnowledgeBase("RelationAsker"); + kbRelationAsker = new KnowledgeBaseImpl("RelationAsker"); kbRelationAsker.setReasonerEnabled(true); // Register an Ask pattern for relations with knowledge gaps enabled @@ -119,7 +119,7 @@ public void instantiateAskRelationsKB() { public void instantiateAnswerRelationsKB() { // start a knowledge base with the behavior "I can supply related people" - kbRelationProvider = new MockedKnowledgeBase("RelationProvider"); + kbRelationProvider = new KnowledgeBaseImpl("RelationProvider"); kbRelationProvider.setReasonerEnabled(true); // Patterns for the RelationProvider: an Answer pattern for relations diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled3.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled3.java index 17bc5c989..c32e4d717 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled3.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsEnabled3.java @@ -24,15 +24,15 @@ import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerWithGapsEnabled3 { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerWithGapsEnabled3.class); - private static MockedKnowledgeBase kbRelationAsker; - private static MockedKnowledgeBase kbRelationProvider; - private static MockedKnowledgeBase kbRelationReactor; + private static KnowledgeBaseImpl kbRelationAsker; + private static KnowledgeBaseImpl kbRelationProvider; + private static KnowledgeBaseImpl kbRelationReactor; private static KnowledgeNetwork kn; @@ -105,7 +105,7 @@ private void setupNetwork() { public void instantiateAskRelationsKB() { // start a knowledge base with the behavior "I am interested in related people" - kbRelationAsker = new MockedKnowledgeBase("RelationAsker"); + kbRelationAsker = new KnowledgeBaseImpl("RelationAsker"); kbRelationAsker.setReasonerEnabled(true); // Register an Ask pattern for relations with knowledge gaps enabled @@ -117,7 +117,7 @@ public void instantiateAskRelationsKB() { public void instantiateAnswerRelationsKB() { // start a knowledge base with the behavior "I can supply related people" - kbRelationProvider = new MockedKnowledgeBase("RelationProvider"); + kbRelationProvider = new KnowledgeBaseImpl("RelationProvider"); kbRelationProvider.setReasonerEnabled(true); // Patterns for the RelationProvider: an Answer pattern for relations @@ -144,7 +144,7 @@ public void instantiateReactRelationsKB() { // start a knowledge base with the behavior "I can react to supply related people" // when I get couples of "people that live in the same house". - kbRelationReactor = new MockedKnowledgeBase("relationReactor"); + kbRelationReactor = new KnowledgeBaseImpl("relationReactor"); kbRelationReactor.setReasonerEnabled(true); // Patterns for the relationReactor: an React pattern to supply relations diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsNotEnabled.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsNotEnabled.java index 2e2a334f8..ca3efae0c 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsNotEnabled.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithGapsNotEnabled.java @@ -19,13 +19,13 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerWithGapsNotEnabled { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerWithGapsNotEnabled.class); - private static MockedKnowledgeBase kbRelationAsker; + private static KnowledgeBaseImpl kbRelationAsker; private static KnowledgeNetwork kn; @@ -81,7 +81,7 @@ private void setupNetwork() { public void instantiateAskRelationsKB() { // start a knowledge base with the behavior "I am interested in related people" - kbRelationAsker = new MockedKnowledgeBase("RelationAsker"); + kbRelationAsker = new KnowledgeBaseImpl("RelationAsker"); kbRelationAsker.setReasonerEnabled(true); // Register an Ask pattern for relations without knowledge gaps enabled diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithPartialBindings.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithPartialBindings.java index b8b0478e0..163863916 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithPartialBindings.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskAnswerWithPartialBindings.java @@ -24,14 +24,14 @@ import eu.knowledge.engine.smartconnector.api.CommunicativeAct; import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskAnswerWithPartialBindings { private static final Logger LOG = LoggerFactory.getLogger(TestAskAnswerWithPartialBindings.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; @Test public void testAskAnswer() throws InterruptedException { @@ -41,9 +41,9 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); GraphPattern gp1 = new GraphPattern(prefixes, "?a ?c."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskPartialMetadata.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskPartialMetadata.java index e9e105195..261fd2883 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskPartialMetadata.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskPartialMetadata.java @@ -29,15 +29,15 @@ import eu.knowledge.engine.smartconnector.api.CommunicativeAct; import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskPartialMetadata { private static final Logger LOG = LoggerFactory.getLogger(TestAskPartialMetadata.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -51,13 +51,13 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kb3.setReasonerEnabled(true); kn.addKB(kb3); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskRecipientSelector.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskRecipientSelector.java index 4961fa9cc..36bd316fb 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskRecipientSelector.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestAskRecipientSelector.java @@ -33,16 +33,16 @@ import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.api.RecipientSelector; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestAskRecipientSelector { private static final Logger LOG = LoggerFactory.getLogger(TestAskRecipientSelector.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; - private static MockedKnowledgeBase kb4; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; + private static KnowledgeBaseImpl kb4; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -56,13 +56,13 @@ public void testAskAnswer() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); - kb4 = new MockedKnowledgeBase("kb4"); + kb4 = new KnowledgeBaseImpl("kb4"); kn.addKB(kb4); GraphPattern gp1 = new GraphPattern(prefixes, "?a ?c."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestComplexGraphPatternMatching.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestComplexGraphPatternMatching.java index 0fc0bf69f..6987e243a 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestComplexGraphPatternMatching.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestComplexGraphPatternMatching.java @@ -35,15 +35,15 @@ import eu.knowledge.engine.reasoner.api.TripleVarBindingSet; import eu.knowledge.engine.smartconnector.impl.Util; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestComplexGraphPatternMatching { private static final Logger LOG = LoggerFactory.getLogger(TestComplexGraphPatternMatching.class); - private static MockedKnowledgeBase devicesKB; - private static MockedKnowledgeBase dashboardKB; - private static MockedKnowledgeBase observationsKB; + private static KnowledgeBaseImpl devicesKB; + private static KnowledgeBaseImpl dashboardKB; + private static KnowledgeBaseImpl observationsKB; @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { @@ -133,7 +133,7 @@ public void findMissingVars(Set gp, TripleVarBinding tvb) { private AskKnowledgeInteraction createDashboardKB(PrefixMappingMem prefixes, KnowledgeNetwork kn) { - dashboardKB = new MockedKnowledgeBase("dashboardKB"); + dashboardKB = new KnowledgeBaseImpl("dashboardKB"); dashboardKB.setReasonerEnabled(true); kn.addKB(dashboardKB); @@ -269,7 +269,7 @@ public float convert(float fahrenheit) { } private void createDevicesKB(PrefixMappingMem prefixes, KnowledgeNetwork kn) { - devicesKB = new MockedKnowledgeBase("devicesKB"); + devicesKB = new KnowledgeBaseImpl("devicesKB"); devicesKB.setReasonerEnabled(true); kn.addKB(devicesKB); GraphPattern gp1 = new GraphPattern(prefixes, TestUtils.convertGP(""" @@ -383,7 +383,7 @@ private void createDevicesKB(PrefixMappingMem prefixes, KnowledgeNetwork kn) { } private void createObservationsKB(PrefixMappingMem prefixes, KnowledgeNetwork kn) { - observationsKB = new MockedKnowledgeBase("observationsKB"); + observationsKB = new KnowledgeBaseImpl("observationsKB"); observationsKB.setReasonerEnabled(true); kn.addKB(observationsKB); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDuplicateBindings.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDuplicateBindings.java index 07f43169b..8cf82aebf 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDuplicateBindings.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDuplicateBindings.java @@ -37,15 +37,15 @@ import eu.knowledge.engine.smartconnector.api.ReactHandler; import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestDuplicateBindings { private static final Logger LOG = LoggerFactory.getLogger(TestDuplicateBindings.class); - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; private static KnowledgeNetwork kn; private static AnswerKnowledgeInteraction answerKI1; @@ -61,11 +61,11 @@ public class TestDuplicateBindings { @BeforeAll public static void setup() throws InterruptedException, BrokenBarrierException, TimeoutException { kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); PrefixMappingMem prefixes = new PrefixMappingMem(); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDynamicSemanticComposition.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDynamicSemanticComposition.java index 40384a0b6..6783f3837 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDynamicSemanticComposition.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestDynamicSemanticComposition.java @@ -33,17 +33,17 @@ import eu.knowledge.engine.reasoner.Rule; import eu.knowledge.engine.reasoner.api.TriplePattern; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestDynamicSemanticComposition { private static final Logger LOG = LoggerFactory.getLogger(TestDynamicSemanticComposition.class); - private MockedKnowledgeBase kbTargetObserver; - private MockedKnowledgeBase kbHVTSearcher; - private MockedKnowledgeBase kbTargetCountrySupplier; - private MockedKnowledgeBase kbTargetLanguageSupplier; - private MockedKnowledgeBase kbTargetAgeSupplier; + private KnowledgeBaseImpl kbTargetObserver; + private KnowledgeBaseImpl kbHVTSearcher; + private KnowledgeBaseImpl kbTargetCountrySupplier; + private KnowledgeBaseImpl kbTargetLanguageSupplier; + private KnowledgeBaseImpl kbTargetAgeSupplier; private KnowledgeNetwork kn; @@ -186,13 +186,13 @@ private void updateNetwork(Set gaps) { instantiateTargetLanguageSupplierKB(); instantiateTargetAgeSupplierKB(); - List availableKBs = new ArrayList<>(); + List availableKBs = new ArrayList<>(); availableKBs.add(kbTargetAgeSupplier); availableKBs.add(kbTargetCountrySupplier); availableKBs.add(kbTargetLanguageSupplier); // add the first KB that fulfills the gap - kbs: for (MockedKnowledgeBase kb : availableKBs) { + kbs: for (KnowledgeBaseImpl kb : availableKBs) { for (ReactKnowledgeInteraction ki : kb.getReactKnowledgeInteractions().keySet()) { @@ -244,7 +244,7 @@ private Set translateGraphPatternTo(GraphPattern pattern) { public void instantiateHVTSearcherKB() { // start a knowledge base with the behaviour "I am interested in high-value // targets" - kbHVTSearcher = new MockedKnowledgeBase("HVTSearcher"); + kbHVTSearcher = new KnowledgeBaseImpl("HVTSearcher"); kbHVTSearcher.setReasonerEnabled(true); // Patterns for the HVTSearcher @@ -272,7 +272,7 @@ public void instantiateHVTSearcherKB() { public void instantiateObserverKB() { // start a knowledge base with the behaviour "I can supply observations of // targets" - kbTargetObserver = new MockedKnowledgeBase("TargetObserver"); + kbTargetObserver = new KnowledgeBaseImpl("TargetObserver"); kbTargetObserver.setReasonerEnabled(true); // Patterns for the TargetObserver @@ -306,7 +306,7 @@ public void instantiateObserverKB() { } public void instantiateTargetLanguageSupplierKB() { - kbTargetLanguageSupplier = new MockedKnowledgeBase("TargetLanguageSupplier"); + kbTargetLanguageSupplier = new KnowledgeBaseImpl("TargetLanguageSupplier"); kbTargetLanguageSupplier.setReasonerEnabled(true); // Patterns for the TargetLanguageSupplier @@ -348,14 +348,14 @@ public void instantiateTargetLanguageSupplierKB() { } public void instantiateTargetAgeSupplierKB() { - kbTargetAgeSupplier = new MockedKnowledgeBase("TargetAgeSupplier"); + kbTargetAgeSupplier = new KnowledgeBaseImpl("TargetAgeSupplier"); kbTargetAgeSupplier.setReasonerEnabled(true); } public void instantiateTargetCountrySupplierKB() { // start a knowledge base with the behaviour "Give me a target and I can supply // its basic attributes" - kbTargetCountrySupplier = new MockedKnowledgeBase("TargetCountrySupplier"); + kbTargetCountrySupplier = new KnowledgeBaseImpl("TargetCountrySupplier"); kbTargetCountrySupplier.setReasonerEnabled(true); // Patterns for the TargetCountrySupplier diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataFromNormalKnowledgeInteraction.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataFromNormalKnowledgeInteraction.java index de8ef3253..cdfa4d2ca 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataFromNormalKnowledgeInteraction.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataFromNormalKnowledgeInteraction.java @@ -18,12 +18,12 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @Tag("Long") public class TestMetadataFromNormalKnowledgeInteraction { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; private static final Logger LOG = LoggerFactory.getLogger(TestMetadataFromNormalKnowledgeInteraction.class); @@ -33,9 +33,9 @@ public class TestMetadataFromNormalKnowledgeInteraction { public void testPostReact() throws InterruptedException { KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); LOG.info("Before everyone is ready!"); kn.sync(); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataKnowledgeInteractionMatching.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataKnowledgeInteractionMatching.java index 05f3bab84..5193f1184 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataKnowledgeInteractionMatching.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestMetadataKnowledgeInteractionMatching.java @@ -1,7 +1,7 @@ package eu.knowledge.engine.smartconnector.api; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; import org.apache.jena.shared.PrefixMapping; import org.apache.jena.sparql.graph.PrefixMappingMem; import org.junit.jupiter.api.AfterEach; @@ -27,14 +27,14 @@ public class TestMetadataKnowledgeInteractionMatching { private static final Logger LOG = LoggerFactory.getLogger(TestDynamicSemanticComposition.class); private static KnowledgeNetwork kn; - private static MockedKnowledgeBase kb1, kb2; + private static KnowledgeBaseImpl kb1, kb2; private static PrefixMappingMem prefixes; @BeforeEach public void setup() { kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("Kb1"); + kb1 = new KnowledgeBaseImpl("Kb1"); kb1.setReasonerEnabled(true); prefixes = new PrefixMappingMem(); @@ -57,7 +57,7 @@ public void testNewKB() { kn.addKB(kb1); kn.sync(); - kb2 = new MockedKnowledgeBase("Kb2"); + kb2 = new KnowledgeBaseImpl("Kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); kn.sync(); @@ -78,7 +78,7 @@ public void testChangedKB() { kn.addKB(kb1); kn.sync(); - kb2 = new MockedKnowledgeBase("Kb2"); + kb2 = new KnowledgeBaseImpl("Kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); kn.sync(); @@ -101,7 +101,7 @@ public void testRemovedKB() { return new BindingSet(); })); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("Kb2"); + kb2 = new KnowledgeBaseImpl("Kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); kn.sync(); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact.java index 502a940e7..c6e13f054 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact.java @@ -16,11 +16,11 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestPostReact { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; public boolean kb2Received = false; @@ -33,9 +33,9 @@ public void testPostReact() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); GraphPattern gp1 = new GraphPattern(prefixes, "?a ?c."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact2.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact2.java index 3d6f881ec..0922d71fc 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact2.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact2.java @@ -24,12 +24,12 @@ import eu.knowledge.engine.smartconnector.api.PostResult; import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestPostReact2 { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; private static final Logger LOG = LoggerFactory.getLogger(TestPostReact2.class); @@ -42,11 +42,11 @@ public void testPostReact() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); // start registering diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact3.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact3.java index 17b6345f7..f752257ee 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact3.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReact3.java @@ -17,12 +17,12 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestPostReact3 { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; private static final Logger LOG = LoggerFactory.getLogger(TestPostReact3.class); @@ -35,13 +35,13 @@ public void testPostReact() throws InterruptedException { prefixes.setNsPrefix("ex", "https://example.org/"); KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kb1.setReasonerEnabled(true); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kb2.setReasonerEnabled(true); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kb3.setReasonerEnabled(true); kn.addKB(kb3); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReactPerformance.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReactPerformance.java index decf36c79..d33645b8a 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReactPerformance.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostReactPerformance.java @@ -23,11 +23,11 @@ import eu.knowledge.engine.smartconnector.api.ReactHandler; import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestPostReactPerformance { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; private static final Logger LOG = LoggerFactory.getLogger(TestPostReactPerformance.class); @@ -39,9 +39,9 @@ public void testPostReact() throws InterruptedException { // create the network KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); // register capabilities diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostRecipientSelector.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostRecipientSelector.java index f9ce7e0bb..ac59b3d0d 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostRecipientSelector.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestPostRecipientSelector.java @@ -25,12 +25,12 @@ import eu.knowledge.engine.smartconnector.api.ReactKnowledgeInteraction; import eu.knowledge.engine.smartconnector.api.RecipientSelector; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestPostRecipientSelector { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; - private static MockedKnowledgeBase kb3; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; + private static KnowledgeBaseImpl kb3; private static final Logger LOG = LoggerFactory.getLogger(TestPostRecipientSelector.class); @@ -41,11 +41,11 @@ public void testPostReact() throws InterruptedException { prefixes.setNsPrefix("ex", "https://www.tno.nl/example/"); KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); - kb3 = new MockedKnowledgeBase("kb3"); + kb3 = new KnowledgeBaseImpl("kb3"); kn.addKB(kb3); // start registering diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestReactMetadata.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestReactMetadata.java index b0a19ef32..8329cb631 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestReactMetadata.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestReactMetadata.java @@ -14,11 +14,11 @@ import eu.knowledge.engine.smartconnector.impl.Util; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestReactMetadata { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; private static final Logger LOG = LoggerFactory.getLogger(TestReactMetadata.class); @@ -31,9 +31,9 @@ public void testRequestMetadata() throws InterruptedException { prefixes.setNsPrefix("saref", "https://saref.etsi.org/core/"); var kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); kn.sync(); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestRequestMetadata.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestRequestMetadata.java index 01fc5a2d3..9aa46f338 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestRequestMetadata.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TestRequestMetadata.java @@ -21,11 +21,11 @@ import eu.knowledge.engine.smartconnector.impl.Util; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestRequestMetadata { - private static MockedKnowledgeBase kb1; - private static MockedKnowledgeBase kb2; + private static KnowledgeBaseImpl kb1; + private static KnowledgeBaseImpl kb2; private static final Logger LOG = LoggerFactory.getLogger(TestRequestMetadata.class); @@ -39,10 +39,10 @@ public void testRequestMetadata() throws InterruptedException, ExecutionExceptio KnowledgeNetwork kn = new KnowledgeNetwork(); - kb1 = new MockedKnowledgeBase("kb1"); + kb1 = new KnowledgeBaseImpl("kb1"); kn.addKB(kb1); - kb2 = new MockedKnowledgeBase("kb2"); + kb2 = new KnowledgeBaseImpl("kb2"); kn.addKB(kb2); GraphPattern gp = new GraphPattern(prefixes, "?obs rdf:type saref:Measurement .", "?obs saref:hasTemp ?temp ."); diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/Thermostat.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/Thermostat.java index adbeb8d2b..980517335 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/Thermostat.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/Thermostat.java @@ -15,15 +15,15 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class Thermostat { private static final Logger LOG = LoggerFactory.getLogger(Thermostat.class); - private MockedKnowledgeBase sensor; - private MockedKnowledgeBase thermostat; - private MockedKnowledgeBase heating; + private KnowledgeBaseImpl sensor; + private KnowledgeBaseImpl thermostat; + private KnowledgeBaseImpl heating; private Room r; ExecutorService es = Executors.newFixedThreadPool(4); @@ -60,11 +60,11 @@ public void run() { // first add the relevant knowledge bases var kn = new KnowledgeNetwork(); - sensor = new MockedKnowledgeBase("temperatureSensor"); + sensor = new KnowledgeBaseImpl("temperatureSensor"); kn.addKB(sensor); - thermostat = new MockedKnowledgeBase("thermostat"); + thermostat = new KnowledgeBaseImpl("thermostat"); kn.addKB(thermostat); - heating = new MockedKnowledgeBase("heatingSource"); + heating = new KnowledgeBaseImpl("heatingSource"); kn.addKB(heating); // then register the relevant knowledge interactions diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TimeOntologyTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TimeOntologyTest.java index 974486c27..4bbb4944b 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TimeOntologyTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/TimeOntologyTest.java @@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TimeOntologyTest { @@ -29,9 +29,9 @@ public class TimeOntologyTest { private KnowledgeNetwork kn = new KnowledgeNetwork(); - private MockedKnowledgeBase calendar = new MockedKnowledgeBase("Calendar"); - private MockedKnowledgeBase app = new MockedKnowledgeBase("App"); - private MockedKnowledgeBase time = new MockedKnowledgeBase("Time"); + private KnowledgeBaseImpl calendar = new KnowledgeBaseImpl("Calendar"); + private KnowledgeBaseImpl app = new KnowledgeBaseImpl("App"); + private KnowledgeBaseImpl time = new KnowledgeBaseImpl("Time"); @Test public void test() throws InterruptedException, ExecutionException { diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/VariableBindingNameTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/VariableBindingNameTest.java index bce7d769b..80fd311a4 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/VariableBindingNameTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/api/VariableBindingNameTest.java @@ -17,14 +17,14 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; class VariableBindingNameTest { private static final Logger LOG = LoggerFactory.getLogger(VariableBindingNameTest.class); - private static MockedKnowledgeBase sensor; - private static MockedKnowledgeBase thermostat; + private static KnowledgeBaseImpl sensor; + private static KnowledgeBaseImpl thermostat; @Test void test() { @@ -36,9 +36,9 @@ void test() { // first add the relevant knowledge bases var kn = new KnowledgeNetwork(); - sensor = new MockedKnowledgeBase("temperatureSensor"); + sensor = new KnowledgeBaseImpl("temperatureSensor"); kn.addKB(sensor); - thermostat = new MockedKnowledgeBase("thermostat"); + thermostat = new KnowledgeBaseImpl("thermostat"); kn.addKB(thermostat); // then register the relevant knowledge interactions diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/ConfigurationTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/ConfigurationTest.java index 1d197b442..2735eb4dc 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/ConfigurationTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/ConfigurationTest.java @@ -23,16 +23,16 @@ import eu.knowledge.engine.smartconnector.api.GraphPattern; import eu.knowledge.engine.smartconnector.impl.SmartConnectorConfig; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class ConfigurationTest { private static final Logger LOG = LoggerFactory.getLogger(ConfigurationTest.class); private KnowledgeNetwork kn; - private MockedKnowledgeBase kb1; + private KnowledgeBaseImpl kb1; private AskKnowledgeInteraction askKI; - private MockedKnowledgeBase kb2; + private KnowledgeBaseImpl kb2; private AnswerKnowledgeInteraction answerKI; private int waitTimeout = 0; @@ -176,7 +176,7 @@ public void afterTest() { } private void intializeKB1() { - this.kb1 = new MockedKnowledgeBase("kb1"); + this.kb1 = new KnowledgeBaseImpl("kb1"); GraphPattern gp1 = new GraphPattern(""" ?s a . ?s ?n . @@ -186,7 +186,7 @@ private void intializeKB1() { } private void intializeKB2() { - this.kb2 = new MockedKnowledgeBase("kb2"); + this.kb2 = new KnowledgeBaseImpl("kb2"); GraphPattern gp1 = new GraphPattern(""" ?p a . ?p ?name . diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/SmartConnectorRegistrationStressTest.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/SmartConnectorRegistrationStressTest.java index d4bcef6d5..79a34c199 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/SmartConnectorRegistrationStressTest.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/misc/SmartConnectorRegistrationStressTest.java @@ -21,7 +21,7 @@ import eu.knowledge.engine.smartconnector.api.SmartConnector; import eu.knowledge.engine.smartconnector.impl.SmartConnectorBuilder; import eu.knowledge.engine.smartconnector.util.KnowledgeNetwork; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; @Tag("Long") @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -38,7 +38,7 @@ void seedKnowledgeNetwork() { kn = new KnowledgeNetwork(); for (var i = 0; i < NUM_KBS; i++) { LOG.info("Starting KB{}", i); - kn.addKB(new MockedKnowledgeBase("INITIAL-KB" + i)); + kn.addKB(new KnowledgeBaseImpl("INITIAL-KB" + i)); } kn.sync(); } diff --git a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/runtime/messaging/TestRegisterSmartConnectorWithSameId.java b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/runtime/messaging/TestRegisterSmartConnectorWithSameId.java index 3d5f336a7..02c2799c3 100644 --- a/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/runtime/messaging/TestRegisterSmartConnectorWithSameId.java +++ b/smart-connector/src/test/java/eu/knowledge/engine/smartconnector/runtime/messaging/TestRegisterSmartConnectorWithSameId.java @@ -11,18 +11,18 @@ import org.slf4j.LoggerFactory; import eu.knowledge.engine.knowledgedirectory.KnowledgeDirectory; -import eu.knowledge.engine.smartconnector.util.MockedKnowledgeBase; +import eu.knowledge.engine.smartconnector.util.KnowledgeBaseImpl; public class TestRegisterSmartConnectorWithSameId { private static final Logger LOG = LoggerFactory.getLogger(TestRegisterSmartConnectorWithSameId.class); private Phaser readyPhaser = new Phaser(1); @Test public void testRegisterSmartConnectorWithSameIdInSameRuntimeThrows() { - var kb1 = new MockedKnowledgeBase("http://example.org/kb1"); + var kb1 = new KnowledgeBaseImpl("http://example.org/kb1"); kb1.setPhaser(this.readyPhaser); kb1.start(); - var kb1AsWell = new MockedKnowledgeBase("http://example.org/kb1"); + var kb1AsWell = new KnowledgeBaseImpl("http://example.org/kb1"); assertThrows(IllegalArgumentException.class, () -> { kb1AsWell.start();