kscience/dataforge-core
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

Api dump and import fixes

Browse Source
This commit is contained in:
Alexander Nozik 2020-12-04 17:56:33 +03:00
parent 2ba4121a36
commit e317b67a48
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dataforge-context/api/dataforge-context.api
View File

@ -10,7 +10,6 @@ public abstract class hep/dataforge/context/AbstractPlugin : hep/dataforge/conte
public fun getContext ()Lhep/dataforge/context/Context; public fun getContext ()Lhep/dataforge/context/Context;
public fun getDefaultChainTarget ()Ljava/lang/String; public fun getDefaultChainTarget ()Ljava/lang/String;
public fun getDefaultTarget ()Ljava/lang/String; public fun getDefaultTarget ()Ljava/lang/String;
public fun getLogger ()Lmu/KLogger;
public fun getMeta ()Lhep/dataforge/meta/Meta; public fun getMeta ()Lhep/dataforge/meta/Meta;
public fun getName ()Lhep/dataforge/names/Name; public fun getName ()Lhep/dataforge/names/Name;
protected final fun require (Lhep/dataforge/context/PluginFactory;)Lkotlin/properties/ReadOnlyProperty; protected final fun require (Lhep/dataforge/context/PluginFactory;)Lkotlin/properties/ReadOnlyProperty;
@ -47,7 +46,6 @@ public class hep/dataforge/context/Context : hep/dataforge/context/Named, hep/da
public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public fun getDefaultChainTarget ()Ljava/lang/String; public fun getDefaultChainTarget ()Ljava/lang/String;
public fun getDefaultTarget ()Ljava/lang/String; public fun getDefaultTarget ()Ljava/lang/String;
public final fun getLogger ()Lmu/KLogger;
public final fun getName ()Lhep/dataforge/names/Name; public final fun getName ()Lhep/dataforge/names/Name;
public final fun getParent ()Lhep/dataforge/context/Context; public final fun getParent ()Lhep/dataforge/context/Context;
public final fun getPlugins ()Lhep/dataforge/context/PluginManager; public final fun getPlugins ()Lhep/dataforge/context/PluginManager;
@ -59,11 +57,6 @@ public final class hep/dataforge/context/Context$Companion {
public abstract interface class hep/dataforge/context/ContextAware { public abstract interface class hep/dataforge/context/ContextAware {
public abstract fun getContext ()Lhep/dataforge/context/Context; public abstract fun getContext ()Lhep/dataforge/context/Context;
public abstract fun getLogger ()Lmu/KLogger;
}
public final class hep/dataforge/context/ContextAware$DefaultImpls {
public static fun getLogger (Lhep/dataforge/context/ContextAware;)Lmu/KLogger;
} }
public final class hep/dataforge/context/ContextBuilder { public final class hep/dataforge/context/ContextBuilder {
@ -100,6 +93,11 @@ public final class hep/dataforge/context/Global : hep/dataforge/context/Context
public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
} }
public final class hep/dataforge/context/LoggingKt {
public static final fun getLogger (Lhep/dataforge/context/Context;)Lmu/KLogger;
public static final fun getLogger (Lhep/dataforge/context/ContextAware;)Lmu/KLogger;
}
public abstract interface class hep/dataforge/context/Named { public abstract interface class hep/dataforge/context/Named {
public static final field Companion Lhep/dataforge/context/Named$Companion; public static final field Companion Lhep/dataforge/context/Named$Companion;
public abstract fun getName ()Lhep/dataforge/names/Name; public abstract fun getName ()Lhep/dataforge/names/Name;
@ -133,7 +131,6 @@ public final class hep/dataforge/context/Plugin$DefaultImpls {
public static fun content (Lhep/dataforge/context/Plugin;Ljava/lang/String;)Ljava/util/Map; public static fun content (Lhep/dataforge/context/Plugin;Ljava/lang/String;)Ljava/util/Map;
public static fun getDefaultChainTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String; public static fun getDefaultChainTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String;
public static fun getDefaultTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String; public static fun getDefaultTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String;
public static fun getLogger (Lhep/dataforge/context/Plugin;)Lmu/KLogger;
public static fun getName (Lhep/dataforge/context/Plugin;)Lhep/dataforge/names/Name; public static fun getName (Lhep/dataforge/context/Plugin;)Lhep/dataforge/names/Name;
public static fun toMeta (Lhep/dataforge/context/Plugin;)Lhep/dataforge/meta/Meta; public static fun toMeta (Lhep/dataforge/context/Plugin;)Lhep/dataforge/meta/Meta;
} }
@ -162,7 +159,6 @@ public final class hep/dataforge/context/PluginManager : hep/dataforge/context/C
public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Lhep/dataforge/context/Plugin; public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Lhep/dataforge/context/Plugin;
public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lkotlin/reflect/KClass;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Ljava/lang/Object; public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lkotlin/reflect/KClass;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Ljava/lang/Object;
public fun getContext ()Lhep/dataforge/context/Context; public fun getContext ()Lhep/dataforge/context/Context;
public fun getLogger ()Lmu/KLogger;
public fun iterator ()Ljava/util/Iterator; public fun iterator ()Ljava/util/Iterator;
public final fun list (Z)Ljava/util/Collection; public final fun list (Z)Ljava/util/Collection;
public final fun load (Lhep/dataforge/context/Plugin;)Lhep/dataforge/context/Plugin; public final fun load (Lhep/dataforge/context/Plugin;)Lhep/dataforge/context/Plugin;
@ -286,8 +282,12 @@ public final class hep/dataforge/provider/Path$Companion {
} }
public final class hep/dataforge/provider/PathKt { public final class hep/dataforge/provider/PathKt {
public static final fun Path ([Lhep/dataforge/names/Name;)Ljava/util/List;
public static final fun Path ([Lkotlin/Pair;)Ljava/util/List;
public static final fun asPath (Lhep/dataforge/names/Name;Ljava/lang/String;)Ljava/util/List;
public static final fun asPath (Lhep/dataforge/provider/PathToken;)Ljava/util/List;
public static synthetic fun asPath$default (Lhep/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List;
public static final fun plus-MQiGgVU (Ljava/util/List;Ljava/util/List;)Ljava/util/List; public static final fun plus-MQiGgVU (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
public static final fun toPath (Lhep/dataforge/provider/PathToken;)Ljava/util/List;
} }
public final class hep/dataforge/provider/PathToken { public final class hep/dataforge/provider/PathToken {

1
dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt
View File

@ -2,6 +2,7 @@ package hep.dataforge.scripting
import hep.dataforge.context.Context import hep.dataforge.context.Context
import hep.dataforge.context.Global import hep.dataforge.context.Global
import hep.dataforge.context.logger
import hep.dataforge.workspace.SimpleWorkspaceBuilder import hep.dataforge.workspace.SimpleWorkspaceBuilder
import hep.dataforge.workspace.Workspace import hep.dataforge.workspace.Workspace
import hep.dataforge.workspace.WorkspaceBuilder import hep.dataforge.workspace.WorkspaceBuilder

2
dataforge-workspace/api/dataforge-workspace.api
View File

@ -65,7 +65,6 @@ public final class hep/dataforge/workspace/SimpleWorkspace : hep/dataforge/works
public fun getData ()Lhep/dataforge/data/DataNode; public fun getData ()Lhep/dataforge/data/DataNode;
public fun getDefaultChainTarget ()Ljava/lang/String; public fun getDefaultChainTarget ()Ljava/lang/String;
public fun getDefaultTarget ()Ljava/lang/String; public fun getDefaultTarget ()Ljava/lang/String;
public fun getLogger ()Lmu/KLogger;
public fun getTargets ()Ljava/util/Map; public fun getTargets ()Ljava/util/Map;
public fun getTasks ()Ljava/util/Map; public fun getTasks ()Ljava/util/Map;
public fun run (Lhep/dataforge/workspace/Task;Lhep/dataforge/meta/Meta;)Lhep/dataforge/data/DataNode; public fun run (Lhep/dataforge/workspace/Task;Lhep/dataforge/meta/Meta;)Lhep/dataforge/data/DataNode;
@ -219,7 +218,6 @@ public final class hep/dataforge/workspace/Workspace$DefaultImpls {
public static fun content (Lhep/dataforge/workspace/Workspace;Ljava/lang/String;)Ljava/util/Map; public static fun content (Lhep/dataforge/workspace/Workspace;Ljava/lang/String;)Ljava/util/Map;
public static fun getDefaultChainTarget (Lhep/dataforge/workspace/Workspace;)Ljava/lang/String; public static fun getDefaultChainTarget (Lhep/dataforge/workspace/Workspace;)Ljava/lang/String;
public static fun getDefaultTarget (Lhep/dataforge/workspace/Workspace;)Ljava/lang/String; public static fun getDefaultTarget (Lhep/dataforge/workspace/Workspace;)Ljava/lang/String;
public static fun getLogger (Lhep/dataforge/workspace/Workspace;)Lmu/KLogger;
public static fun run (Lhep/dataforge/workspace/Workspace;Lhep/dataforge/workspace/Task;Lhep/dataforge/meta/Meta;)Lhep/dataforge/data/DataNode; public static fun run (Lhep/dataforge/workspace/Workspace;Lhep/dataforge/workspace/Task;Lhep/dataforge/meta/Meta;)Lhep/dataforge/data/DataNode;
} }

3
dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/GenericTask.kt
View File

@ -1,5 +1,6 @@
package hep.dataforge.workspace package hep.dataforge.workspace
import hep.dataforge.context.logger
import hep.dataforge.data.DataNode import hep.dataforge.data.DataNode
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.descriptors.NodeDescriptor
@ -27,7 +28,7 @@ public class GenericTask<R : Any>(
val input = model.buildInput(workspace)// gather(workspace, model) val input = model.buildInput(workspace)// gather(workspace, model)
//execute //execute
workspace.context.logger.info{"Starting task '$name' on ${model.target} with meta: \n${model.meta}"} workspace.logger.info{"Starting task '$name' on ${model.target} with meta: \n${model.meta}"}
val output = dataTransform(workspace).invoke(model, input) val output = dataTransform(workspace).invoke(model, input)
//handle result //handle result

1
dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt
View File

@ -1,6 +1,7 @@
package hep.dataforge.workspace package hep.dataforge.workspace
import hep.dataforge.context.Context import hep.dataforge.context.Context
import hep.dataforge.context.logger
import hep.dataforge.data.* import hep.dataforge.data.*
import hep.dataforge.meta.DFBuilder import hep.dataforge.meta.DFBuilder
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta

1
dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt
View File

@ -1,6 +1,7 @@
package hep.dataforge.workspace package hep.dataforge.workspace
import hep.dataforge.context.PluginTag import hep.dataforge.context.PluginTag
import hep.dataforge.context.logger
import hep.dataforge.data.* import hep.dataforge.data.*
import hep.dataforge.meta.boolean import hep.dataforge.meta.boolean
import hep.dataforge.meta.builder import hep.dataforge.meta.builder