diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/impl/kim/KimObservableImpl.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/impl/kim/KimObservableImpl.java index eada76e16..36e09e1f9 100644 --- a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/impl/kim/KimObservableImpl.java +++ b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/impl/kim/KimObservableImpl.java @@ -83,11 +83,11 @@ public Collection getResolutionExceptions() { public List> getValueOperators() { return this.valueOperators; } - - @Override - public String getAttributeIdentifier() { - return this.attributeIdentifier; - } +// +// @Override +// public String getAttributeIdentifier() { +// return this.attributeIdentifier; +// } @Override public boolean isOptional() { diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kim/KimObservable.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kim/KimObservable.java index fa68394bf..c3f0598e7 100644 --- a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kim/KimObservable.java +++ b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kim/KimObservable.java @@ -68,16 +68,16 @@ public interface KimObservable extends KimStatement, KlabAsset { */ List> getValueOperators(); - /** - * If the observable specification had an identifier (rather than a literal value) before an - * 'as' clause introducing the semantics, this will return it and the {@link #getValue()} method - * will return null. The interpretation of the identifier is context-dependent as it may refer - * to a value previously defined in a 'define' statement, or to an attribute to be looked up in - * a referenced resource. - * - * @return true if identified by an attribute to be resolved - */ - String getAttributeIdentifier(); +// /** +// * If the observable specification had an identifier (rather than a literal value) before an +// * 'as' clause introducing the semantics, this will return it and the {@link #getValue()} method +// * will return null. The interpretation of the identifier is context-dependent as it may refer +// * to a value previously defined in a 'define' statement, or to an attribute to be looked up in +// * a referenced resource. +// * +// * @return true if identified by an attribute to be resolved +// */ +// String getAttributeIdentifier(); /** * True if the 'optional' clause has been passed. diff --git a/klab.services.core/pom.xml b/klab.services.core/pom.xml index f348ddd8c..08144bfc5 100644 --- a/klab.services.core/pom.xml +++ b/klab.services.core/pom.xml @@ -206,7 +206,7 @@ org.eclipse.jgit org.eclipse.jgit - 6.4.0.202211300538-r + 6.5.0.202303070854-r diff --git a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/ResourcesProvider.java b/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/ResourcesProvider.java index 2abd28eb7..d90deb118 100644 --- a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/ResourcesProvider.java +++ b/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/ResourcesProvider.java @@ -153,6 +153,7 @@ public ResourcesProvider(Authentication authenticationService, ServiceScope scop @Override public void initializeService() { + scope().send(Message.MessageClass.ServiceLifecycle, Message.MessageType.ServiceInitializing, capabilities()); this.kbox = ModelKbox.create(localName, this.scope); diff --git a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java b/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java index 1887ae826..6547ea248 100644 --- a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java +++ b/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java @@ -12,13 +12,20 @@ */ public class LanguageAdapter { + + public KimObservable adaptObservable(ObservableSyntax observableSyntax) { KimObservableImpl ret = new KimObservableImpl(); ret.setUrn(observableSyntax.encode()); ret.setSemantics(adaptSemantics(observableSyntax.getSemantics())); + ret.setUnit(observableSyntax.getUnit()); + ret.setCurrency(observableSyntax.getCurrency()); + + for (var valueOperator : observableSyntax.getValueOperators()) { + } return ret; }