Ready For Review: feature/IKM-2089_plugin-support-komet

jenkins service-account · Carl Dea · commit fb061efcd33c · 2024-07-31T13:49:37.000Z
diff --git a/.gitignore b/.gitignore
@@ -227,3 +227,4 @@ Temporary Items
 # General
 ###################
 **.zip
+htmlReport
diff --git a/application/src/main/java/dev/ikm/komet/app/App.java b/application/src/main/java/dev/ikm/komet/app/App.java
@@ -81,6 +81,7 @@
 import dev.ikm.komet.preferences.Preferences;
 import dev.ikm.komet.progress.CompletionNodeFactory;
 import dev.ikm.komet.progress.ProgressNodeFactory;
+import dev.ikm.komet.reasoner.ReasonerResultsNodeFactory;
 import dev.ikm.komet.search.SearchNodeFactory;
 import dev.ikm.komet.table.TableNodeFactory;
 import dev.ikm.tinkar.common.alert.AlertObject;
@@ -131,6 +132,7 @@
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.prefs.BackingStoreException;
 
@@ -581,7 +583,7 @@ private void launchJournalViewWindow(PrefX journalWindowSettings) {
 
         // Launch windows window pane inside journal view
         journalStageWindow.setOnShown(windowEvent -> {
-            //TODO: Refactor factory constructor calls below to use ServiceLoader (make constructors private)
+            //TODO: Refactor factory constructor calls below to use PluggableService (make constructors private)
             KometNodeFactory navigatorNodeFactory = new GraphNavigatorNodeFactory();
             KometNodeFactory searchNodeFactory = new SearchNodeFactory();
 
diff --git a/application/src/main/resources/dev/ikm/komet/app/mark.png b/application/src/main/resources/dev/ikm/komet/app/mark.png
diff --git a/classification/src/main/java/dev/ikm/komet/reasoner/ReasonerResultsNode.java b/classification/src/main/java/dev/ikm/komet/reasoner/ReasonerResultsNode.java
@@ -26,6 +26,7 @@
 import dev.ikm.komet.reasoner.ui.RunElkOwlReasonerIncrementalTask;
 import dev.ikm.komet.reasoner.ui.RunElkOwlReasonerTask;
 import dev.ikm.tinkar.common.alert.AlertStreams;
+import dev.ikm.tinkar.common.service.PluggableService;
 import dev.ikm.tinkar.common.service.TinkExecutor;
 import dev.ikm.tinkar.reasoner.service.ReasonerService;
 import dev.ikm.tinkar.terms.EntityFacade;
@@ -79,7 +80,7 @@ public ReasonerResultsNode(ViewProperties viewProperties, KometPreferences nodeP
 				ArrayList<MenuItem> collectionMenuItems = new ArrayList<>();
 				collectionMenuItems.add(new SeparatorMenuItem());
 
-				List<ReasonerService> rss = ServiceLoader.load(ReasonerService.class).stream().map(Provider::get)
+				List<ReasonerService> rss = PluggableService.load(ReasonerService.class).stream().map(Provider::get)
 						.sorted(Comparator.comparing(ReasonerService::getName)).toList();
 				for (ReasonerService rs : rss) {
 					LOG.info("Reasoner service add: " + rs);
diff --git a/framework/src/main/java/dev/ikm/komet/framework/KometNodeFactory.java b/framework/src/main/java/dev/ikm/komet/framework/KometNodeFactory.java
@@ -24,6 +24,7 @@
 import dev.ikm.tinkar.common.alert.AlertObject;
 import dev.ikm.tinkar.common.alert.AlertReportingService;
 import dev.ikm.tinkar.common.id.PublicIdStringKey;
+import dev.ikm.tinkar.common.service.PluggableService;
 import dev.ikm.tinkar.common.util.broadcast.Broadcaster;
 import javafx.scene.control.Label;
 import org.eclipse.collections.api.list.ImmutableList;
@@ -69,7 +70,7 @@ default KometNode create(ObservableViewNoOverride windowView,
         }catch(UnsupportedOperationException e){
             AlertObject alertObject = new AlertObject(UNSUPPORTED_OPERATION, e.getMessage(),
                     INFORMATION, TAXONOMY);
-            ServiceLoader<AlertReportingService> loader = ServiceLoader.load(AlertReportingService.class);
+            ServiceLoader<AlertReportingService> loader = PluggableService.load(AlertReportingService.class);
             StreamSupport.stream(loader.spliterator(), false).forEach(alertReportingService -> alertReportingService.onNext(alertObject));
         }
         return null;
@@ -117,10 +118,10 @@ default Label getMenuIconGraphic() {
     String getStyleId();
 
     /**
-     * Getting available service providers using <code>java.tools.ServiceLoader</code> utility class.
+     * Getting available service providers using <code>dev.ikm.tinkar.common.service.PluggableService</code> utility class.
      * @return Iterable list of KometNodeFactory classes
      */
     static ServiceLoader<KometNodeFactory> getKometNodeFactories() {
-        return ServiceLoader.load(KometNodeFactory.class);
+        return PluggableService.load(KometNodeFactory.class);
     }
 }
diff --git a/framework/src/main/java/dev/ikm/komet/framework/concurrent/TaskListsProviderFinder.java b/framework/src/main/java/dev/ikm/komet/framework/concurrent/TaskListsProviderFinder.java
@@ -19,20 +19,22 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 
+import dev.ikm.tinkar.common.service.PluggableService;
+
 public enum TaskListsProviderFinder {
     INSTANCE;
 
     TaskListsService service;
 
     TaskListsProviderFinder() {
         Class serviceClass = TaskListsService.class;
-        ServiceLoader<TaskListsService> serviceLoader = ServiceLoader.load(serviceClass);
+        ServiceLoader<TaskListsService> serviceLoader = PluggableService.load(serviceClass);
         Optional<TaskListsService> optionalService = serviceLoader.findFirst();
         if (optionalService.isPresent()) {
             this.service = optionalService.get();
         } else {
             throw new NoSuchElementException("No " + serviceClass.getName() +
-                    " found by ServiceLoader...");
+                    " found by PluggableService...");
         }
     }
 
diff --git a/framework/src/main/java/dev/ikm/komet/framework/events/EvtBusFactory.java b/framework/src/main/java/dev/ikm/komet/framework/events/EvtBusFactory.java
@@ -20,6 +20,8 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 
+import dev.ikm.tinkar.common.service.PluggableService;
+
 /**
  * Factory class to create and return an Event Bus implementation
  */
@@ -53,7 +55,7 @@ public static EvtBus getInstance(Class clazz) {
      */
     public static EvtBus getInstance(String name) {
         if (null == evtBusMap.get(name)) {
-            Optional<EvtBus> optBus = ServiceLoader.load(EvtBus.class)
+            Optional<EvtBus> optBus = PluggableService.load(EvtBus.class)
                     .stream()
                     .filter(evtBusProvider ->
                             evtBusProvider.type().isAnnotationPresent(EvtBusName.class)
diff --git a/framework/src/main/java/dev/ikm/komet/framework/panel/axiom/LogicalOperatorsForVertex.java b/framework/src/main/java/dev/ikm/komet/framework/panel/axiom/LogicalOperatorsForVertex.java
@@ -23,6 +23,7 @@
 
 import java.util.Optional;
 
+// TODO: can this class be replaced with LogicalAxiomSemantic?
 public enum LogicalOperatorsForVertex {
     /**
      * The necessary set.
@@ -55,7 +56,7 @@ public enum LogicalOperatorsForVertex {
     DEFINITION_ROOT(TinkarTerm.DEFINITION_ROOT),
 
     /**
-     * The role all.
+     * A role
      */
     ROLE(TinkarTerm.ROLE),
 
@@ -71,7 +72,9 @@ public enum LogicalOperatorsForVertex {
 
     PROPERTY_SET(TinkarTerm.PROPERTY_SET),
 
-    PROPERTY_PATTERN_IMPLICATION(TinkarTerm.PROPERTY_PATTERN_IMPLICATION);
+    PROPERTY_PATTERN_IMPLICATION(TinkarTerm.PROPERTY_PATTERN_IMPLICATION),
+
+    IMPLICATION_SET(TinkarTerm.IMPLICATION_SET);
 
     final ConceptFacade logicalMeaning;
 
diff --git a/framework/src/main/java/dev/ikm/komet/framework/preferences/PreferencesTreeItem.java b/framework/src/main/java/dev/ikm/komet/framework/preferences/PreferencesTreeItem.java
@@ -16,6 +16,7 @@
 package dev.ikm.komet.framework.preferences;
 
 
+import dev.ikm.tinkar.common.service.PluggableService;
 import javafx.scene.control.TreeItem;
 import dev.ikm.komet.framework.view.ViewProperties;
 import dev.ikm.komet.preferences.KometPreferences;
@@ -61,7 +62,7 @@ static public Optional<PreferencesTreeItem> from(KometPreferences preferences,
             try {
                 String propertySheetClassName = optionalPropertySheetClass.get();
 
-                Class preferencesSheetClass = Class.forName(propertySheetClassName);
+                Class preferencesSheetClass = PluggableService.forName(propertySheetClassName);
                 Constructor<PreferenceGroup> c = preferencesSheetClass.getConstructor(
                         KometPreferences.class,
                         ViewProperties.class,
diff --git a/framework/src/main/java/dev/ikm/komet/framework/rulebase/RuleServiceFinder.java b/framework/src/main/java/dev/ikm/komet/framework/rulebase/RuleServiceFinder.java
@@ -19,20 +19,20 @@
 import java.nio.file.Path;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import java.util.ServiceLoader;
+
+import dev.ikm.tinkar.common.service.PluggableService;
 
 public enum RuleServiceFinder {
     INSTANCE;
     RuleService service;
 
     RuleServiceFinder() {
-        ServiceLoader<RuleService> serviceLoader = ServiceLoader.load(RuleService.class);
-        Optional<RuleService> optionalService = serviceLoader.findFirst();
+        Optional<RuleService> optionalService = PluggableService.load(RuleService.class).findFirst();
         if (optionalService.isPresent()) {
             this.service = optionalService.get();
         } else {
             throw new NoSuchElementException("No " + RuleService.class.getName() +
-                    " found by ServiceLoader...");
+                    " found by PluggableService...");
         }
     }
 
diff --git a/framework/src/main/java/dev/ikm/komet/framework/tabs/TabGroup.java b/framework/src/main/java/dev/ikm/komet/framework/tabs/TabGroup.java
@@ -30,6 +30,7 @@
 import dev.ikm.tinkar.common.alert.AlertStreams;
 import dev.ikm.tinkar.common.binary.Encodable;
 import dev.ikm.tinkar.common.id.PublicIdStringKey;
+import dev.ikm.tinkar.common.service.PluggableService;
 import dev.ikm.tinkar.common.util.text.NaturalOrder;
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
@@ -88,7 +89,7 @@ public static TabGroup create(ObservableViewNoOverride windowView, KometPreferen
             KometPreferences childPreferences = nodePreferences.node(KOMET_NODES + preferencesNode);
             childPreferences.get(WindowComponentKeys.FACTORY_CLASS).ifPresent(factoryClassName -> {
                 try {
-                    Class<?> objectClass = Class.forName(factoryClassName);
+                    Class<?> objectClass = PluggableService.forName(factoryClassName);
                     Class<? extends Annotation> annotationClass = Reconstructor.class;
                     Object[] parameters = new Object[]{windowView, childPreferences};
                     KometNode kometNode = (KometNode) Encodable.decode(objectClass, annotationClass, parameters);
@@ -99,6 +100,9 @@ public static TabGroup create(ObservableViewNoOverride windowView, KometPreferen
                 }
             });
         }
+        if (detachableTabPane.getTabs().isEmpty()) {
+            selectedIndex = -1;
+        }
         detachableTabPane.getSelectionModel().select(selectedIndex);
         return make(detachableTabPane, allowRemoval, windowView, nodePreferences);
     }
diff --git a/framework/src/main/java/dev/ikm/komet/framework/window/KometStageController.java b/framework/src/main/java/dev/ikm/komet/framework/window/KometStageController.java
@@ -269,12 +269,19 @@ public void setup(KometPreferences nodePreferences) {
         this.nodePreferences = nodePreferences;
         this.window = topGridPane.getScene().getWindow();
         this.windowSettings = new WindowSettings(nodePreferences);
+        boolean windowInitialized = nodePreferences.getBoolean(WindowKeys.WINDOW_INITIALIZED, false);
 
         ViewCalculatorWithCache viewCalculator = ViewCalculatorWithCache.getCalculator(windowSettings.getView().toViewCoordinateRecord());
 
-        this.leftDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
-        this.centerDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
-        this.rightDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
+        if (windowInitialized) {
+            this.leftDetachableTabPane = TabGroup.create(windowSettings.getView(), nodePreferences.node(nodePreferences.get(WindowSettings.Keys.LEFT_TAB_PREFERENCES).get()));
+            this.centerDetachableTabPane = TabGroup.create(windowSettings.getView(), nodePreferences.node(nodePreferences.get(WindowSettings.Keys.CENTER_TAB_PREFERENCES).get()));
+            this.rightDetachableTabPane = TabGroup.create(windowSettings.getView(), nodePreferences.node(nodePreferences.get(WindowSettings.Keys.RIGHT_TAB_PREFERENCES).get()));
+        } else {
+            this.leftDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
+            this.centerDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
+            this.rightDetachableTabPane = TabGroup.create(windowSettings.getView(), TabGroup.REMOVAL.DISALLOW);
+        }
 
         leftBorderPane.setCenter(this.leftDetachableTabPane);
         centerBorderPane.setCenter(this.centerDetachableTabPane);
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tinkar-core.groupId>dev.ikm.tinkar</tinkar-core.groupId>
-        <tinkar-core.version>1.53.0</tinkar-core.version>
+        <tinkar-core.version>1.57.0</tinkar-core.version>
         <owlapi.groupId>dev.ikm.owlapi</owlapi.groupId>
         <owlapi.version>4.7.0</owlapi.version>
         <ikm-evrete.groupId>org.evrete</ikm-evrete.groupId>
@@ -84,7 +84,7 @@
         <log4j.version>3.0.0-alpha1</log4j.version>
         <!-- Utilize for Binding to SLF4J -->
         <bind-to-slf4j.version>2.0.13</bind-to-slf4j.version>
-        <mockito.version>5.6.0</mockito.version>
+        <mockito.version>5.7.0</mockito.version>
         <common-java5.version>3.0.0-M9</common-java5.version>
         <maven.assembly-plugin.version>3.6.0</maven.assembly-plugin.version>
     </properties>
diff --git a/preferences/src/main/java/dev/ikm/komet/preferences/PreferencesServiceFinder.java b/preferences/src/main/java/dev/ikm/komet/preferences/PreferencesServiceFinder.java
@@ -19,20 +19,22 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 
+import dev.ikm.tinkar.common.service.PluggableService;
+
 public enum PreferencesServiceFinder {
     INSTANCE;
 
     PreferencesService service;
 
     PreferencesServiceFinder() {
         Class serviceClass = PreferencesService.class;
-        ServiceLoader<PreferencesService> serviceLoader = ServiceLoader.load(serviceClass);
+        ServiceLoader<PreferencesService> serviceLoader = PluggableService.load(serviceClass);
         Optional<PreferencesService> optionalService = serviceLoader.findFirst();
         if (optionalService.isPresent()) {
             this.service = optionalService.get();
         } else {
             throw new NoSuchElementException("No " + serviceClass.getName() +
-                    " found by ServiceLoader...");
+                    " found by PluggableService...");
         }
     }
 
diff --git a/progress/src/main/java/dev/ikm/komet/progress/CompletionNode.java b/progress/src/main/java/dev/ikm/komet/progress/CompletionNode.java
@@ -48,6 +48,10 @@ public class CompletionNode extends ExplorationNodeAbstract {
         Bindings.bindContent(progressView.getTasks(), taskLists.completedTasks());
     }
 
+    public CompletionNode() {
+        super();
+    }
+
     public CompletionNode(ViewProperties viewProperties, KometPreferences nodePreferences) {
         super(viewProperties, nodePreferences);
         revertPreferences();
diff --git a/progress/src/main/java/dev/ikm/komet/progress/CompletionNodeFactory.java b/progress/src/main/java/dev/ikm/komet/progress/CompletionNodeFactory.java
@@ -76,4 +76,9 @@ public String getMenuText() {
     public String getStyleId() {
         return CompletionNode.STYLE_ID;
     }
+
+    public KometNode create() {
+        return new CompletionNode();
+    }
+
 }
diff --git a/rules/src/main/java/dev/ikm/komet/rules/annotated/AxiomFocusedRules.java b/rules/src/main/java/dev/ikm/komet/rules/annotated/AxiomFocusedRules.java
@@ -75,7 +75,8 @@ public void axiomIsNotDefinitionRoot(ObservationRecord $observation) {
             "$observation.isAxiomFocused",
             "$observation.isDefinitionRoot"
     })
-    public void axiomIsDefinitionRoot(ObservationRecord $observation) {
+    public void axiomIsDefinitionRoot(ObservationRecord $observation,
+                                      RhsContext ctx) {
         if ($observation.subject() instanceof AxiomSubjectRecord axiomSubjectRecord) {
             if (!axiomSubjectRecord.axiomTree().containsVertexWithMeaning(TinkarTerm.NECESSARY_SET)) {
                 // allow addition of necessary set
diff --git a/rules/src/main/java/dev/ikm/komet/rules/annotated/RulesBase.java b/rules/src/main/java/dev/ikm/komet/rules/annotated/RulesBase.java
@@ -79,15 +79,15 @@ public void onViewProperties(ViewProperties viewProperties) {
         this.viewProperties = viewProperties;
     }
 
-    protected EditCoordinate editCoordinate() {
+    public EditCoordinate editCoordinate() {
         return Objects.requireNonNull(editCoordinate);
     }
 
-    protected ViewProperties viewProperties() {
+    public ViewProperties viewProperties() {
         return Objects.requireNonNull(viewProperties);
     }
 
-    protected ViewCalculator calculator() {
+    public ViewCalculator calculator() {
         return viewProperties().calculator();
     }
 
diff --git a/rules/src/main/java/module-info.java b/rules/src/main/java/module-info.java
@@ -24,8 +24,8 @@
     // TODO remove requires classification after moving LogicalExpressionAdaptorFactory to tinkar-core.
     requires dev.ikm.komet.classification;
 
-    //exports dev.ikm.komet.rules.evrete;
-    exports dev.ikm.komet.rules.annotated;
+    exports dev.ikm.komet.rules.evrete;
+    exports dev.ikm.komet.rules.annotated to dev.ikm.komet.rules.test;
 
     provides RuleService with EvreteRulesService;
 
diff --git a/rules/src/test/java/module-info.java b/rules/src/test/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2015 Integrated Knowledge Management (support@ikm.dev)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+open module dev.ikm.komet.rules.test {
+    requires dev.ikm.komet.framework;
+    requires dev.ikm.tinkar.coordinate;
+    requires dev.ikm.tinkar.entity;
+    requires dev.ikm.tinkar.terms;
+    requires javafx.graphics;
+    requires org.evrete.core;
+    requires org.junit.jupiter.api;
+    requires dev.ikm.komet.rules;
+}
