-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* repackaging + adding REST api endpoints * adding verification for object version and an About button * bugfix: multiple DOR occurence in object creation list + better PropertyView + buttons to download xml/json files * bugfix at object creation + raw xml editor + bugfiw in console event handler * using bootstrap 5
- Loading branch information
1 parent
b2f1c52
commit 6558b86
Showing
85 changed files
with
3,504 additions
and
1,547 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
204 changes: 204 additions & 0 deletions
204
src/main/java/com/geosiris/webstudio/etp/ETPWorkspace.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| /* | ||
| Copyright 2019 GEOSIRIS | ||
| 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. | ||
| */ | ||
| package com.geosiris.webstudio.etp; | ||
|
|
||
| import Energistics.Etp.v12.Datatypes.DataArrayTypes.DataArray; | ||
| import Energistics.Etp.v12.Datatypes.Object.ContextScopeKind; | ||
| import Energistics.Etp.v12.Protocol.DataArray.GetDataArraysResponse; | ||
| import com.geosiris.energyml.exception.ObjectNotFoundNotError; | ||
| import com.geosiris.energyml.pkg.EPCFile; | ||
| import com.geosiris.energyml.pkg.EPCPackage; | ||
| import com.geosiris.energyml.utils.EnergymlWorkspace; | ||
| import com.geosiris.energyml.utils.ObjectController; | ||
| import com.geosiris.etp.utils.ETPHelper; | ||
| import com.geosiris.etp.utils.ETPHelperREST; | ||
| import com.geosiris.etp.utils.ETPUri; | ||
| import com.geosiris.etp.websocket.ETPClient; | ||
| import com.geosiris.webstudio.servlet.Editor; | ||
| import jakarta.xml.bind.JAXBElement; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static com.geosiris.energyml.utils.EnergymlWorkspaceHelper.getHdfReference; | ||
|
|
||
| public class ETPWorkspace implements EnergymlWorkspace { | ||
| private static final Logger logger = LoggerFactory.getLogger(ETPWorkspace.class); | ||
|
|
||
| private ETPClient client; | ||
| private String dataspace; | ||
|
|
||
| private HashMap<String, CacheData<String>> uuidUri_cache = new HashMap<>(); | ||
|
|
||
| private static HashMap<String, CacheData<String>> xml_cache = new HashMap<>(); | ||
|
|
||
| public class CacheData<T>{ | ||
|
|
||
| public static final long TIMEOUT = 1000*60*10; // 10 min | ||
| public T data; | ||
| public long epoch; | ||
|
|
||
| public CacheData(T data){ | ||
| this.data = data; | ||
| this.epoch = System.currentTimeMillis(); | ||
| } | ||
|
|
||
| public boolean outDated(){ | ||
| return System.currentTimeMillis() - this.epoch > TIMEOUT; | ||
| } | ||
| } | ||
|
|
||
| public ETPWorkspace(String dataspace, ETPClient client) { | ||
| this.dataspace = dataspace; | ||
| this.client = client; | ||
| this.uuidUri_cache = new HashMap<>(); | ||
| } | ||
|
|
||
| public String getDataspace() { | ||
| return dataspace; | ||
| } | ||
|
|
||
| @Override | ||
| public Object getObject(String uuid, String objectVersion) { | ||
| return getObjectByIdentifier(EPCFile.getIdentifier(uuid, objectVersion)); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getObjectByIdentifier(String identifier) { | ||
| if(identifier.startsWith("eml:///")){ | ||
| return getEnergisticsObject(identifier); | ||
| }else{ | ||
| String uuid = EPCFile.getUuidFromIdentifier(identifier); | ||
| return getObjectByUUID(uuid); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Object getObjectByUUID(String uuid) { | ||
| return getEnergisticsObject(getObjectUriFromUuid(uuid)); | ||
| } | ||
|
|
||
| @Override | ||
| public List<?> readExternalArray(Object energymlArray, Object rootObj, String pathInRoot) throws ObjectNotFoundNotError { | ||
| String pathInExternal = getHdfReference(energymlArray).get(0); | ||
| String uri = getUriFromObject(rootObj, dataspace).toString(); | ||
| try { | ||
| GetDataArraysResponse resp = ETPHelperREST.getMultipleDataArrays(client, uri, List.of(pathInExternal)); | ||
| List<?> res = dataArraysToNumbers(resp.getDataArrays().entrySet().stream() | ||
| .sorted(Comparator.comparing(a -> a.getKey().toString())) | ||
| // .sorted(Comparator.comparingInt(e -> Integer.getInteger(e.getKey().toString()))) | ||
| .map(Map.Entry::getValue) | ||
| .collect(Collectors.toList())); | ||
| // logger.info("@readExternalArray values {} ", res.subList(0,9)); | ||
| return res; | ||
| } catch (Exception _ignore) {_ignore.printStackTrace();} | ||
| return null; | ||
| } | ||
|
|
||
| public String getEnergisticsXML(String uri) { | ||
| if(xml_cache.containsKey(uri) && !xml_cache.get(uri).outDated()){ | ||
| logger.info("using cache for {}", uri); | ||
| return xml_cache.get(uri).data; | ||
| }else { | ||
| ETPUri etpUri = ETPUri.parse(uri); | ||
| etpUri.setDataspace(dataspace); | ||
| logger.info("@getEnergisticsXML > {}", uri); | ||
| List<String> m = ETPHelper.sendGetDataObjects_pretty(client, Collections.singletonList(etpUri.toString()), "xml", 50000); | ||
| if (!m.isEmpty()) { | ||
| xml_cache.put(uri, new CacheData<>(m.get(0))); | ||
| return m.get(0); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| public Object getEnergisticsObject(String uri) { | ||
| String xml = getEnergisticsXML(uri); | ||
| if(xml != null){ | ||
| JAXBElement<?> elt = Editor.pkgManager.unmarshal(xml); | ||
| return elt.getValue(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public String getObjectUriFromUuid(String uuid){ | ||
| if(uuidUri_cache.containsKey(uuid)) { | ||
| return uuidUri_cache.get(uuid).data; | ||
| }else{ | ||
| logger.info("@getObjectUriFromUuid {} {}", uuid); | ||
| List<String> uris = ETPHelper.sendGetRessources_pretty(client, new ETPUri(dataspace).toString(), 1, ContextScopeKind.self, 5000); | ||
| for (String uri : uris) { | ||
| if (uri.contains(uuid)) { | ||
| uuidUri_cache.put(uuid, new CacheData<>(uri)); | ||
| return uri; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static ETPUri getUriFromObject(Object obj, String dataspace){ | ||
| EPCPackage epc_pkg = Editor.pkgManager.getMatchingPackage(obj.getClass()); | ||
| ETPUri uri = new ETPUri(); | ||
| uri.setDataspace(dataspace); | ||
| uri.setUuid((String) ObjectController.getObjectAttributeValue(obj, "uuid")); | ||
| uri.setDomain(epc_pkg.getDomain()); | ||
| uri.setDomainVersion(epc_pkg.getVersionNum().replace(".", "").substring(0,2)); | ||
| uri.setObjectType(obj.getClass().getSimpleName()); | ||
| uri.setVersion((String) ObjectController.getObjectAttributeValue(obj, "version")); | ||
| return uri; | ||
| } | ||
|
|
||
|
|
||
| public static List<?> dataArraysToNumbers(List<DataArray> das){ | ||
| return das.stream() | ||
| .map(da -> { | ||
| try { | ||
| List<?> values = ((List<?>) ObjectController.getObjectAttributeValue(da.getData().getItem(), "values")); | ||
| if(values == null){ | ||
| // cas of object filled by json from http and deserialized by Gson : | ||
| // [Energistics.Etp.v12.Datatypes.ArrayOfInt, {values=[48.0, ...] } ] | ||
| // this is translated by Gson as : [String = "Energistics.Etp.v12.Datatypes.ArrayOfInt", com.google.gson.internal.LinkedTreeMap = {'values': [[48.0, ...]]}] | ||
| values = (List<?>) ((com.google.gson.internal.LinkedTreeMap) ((List)da.getData().getItem()).get(1)).get("values"); | ||
| } | ||
| // logger.info("@dataArraysToNumbers values {} ", values.subList(0,9)); | ||
| return values; | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException(ex); | ||
| } | ||
| }) | ||
| .flatMap(List::stream).collect(Collectors.toList()); | ||
| /* | ||
| return das.stream() | ||
| .map(da -> { | ||
| try { | ||
| List<?> values = ((List<?>) ObjectController.getObjectAttributeValue(da.getData().getItem(), "values")); | ||
| if(values == null){ | ||
| // cas of object filled by json from http and deserialized by Gson : | ||
| // [Energistics.Etp.v12.Datatypes.ArrayOfInt, {values=[48.0, ...] } ] | ||
| // this is translated by Gson as : [String = "Energistics.Etp.v12.Datatypes.ArrayOfInt", com.google.gson.internal.LinkedTreeMap = {'values': [[48.0, ...]]}] | ||
| values = (List<?>) ((com.google.gson.internal.LinkedTreeMap) ((List)da.getData().getItem()).get(1)).get("values"); | ||
| } | ||
| return values.stream().map(v-> v instanceof String ? Double.parseDouble((String) v) : ((Number)v).doubleValue()).collect(Collectors.toList()); | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException(ex); | ||
| } | ||
| }) | ||
| .flatMap(List::stream).collect(Collectors.toList());*/ | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/main/java/com/geosiris/webstudio/exeptions/ETPUploadFailed.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.geosiris.webstudio.exeptions; | ||
|
|
||
| public class ETPUploadFailed extends Exception{ | ||
| public ETPUploadFailed(String msg){ | ||
| super("ETPUploadFailed : " + msg); | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/main/java/com/geosiris/webstudio/exeptions/NotValidInputException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.geosiris.webstudio.exeptions; | ||
|
|
||
| public class NotValidInputException extends Exception{ | ||
| public NotValidInputException(String msg){ | ||
| super("NotValidInputException : " + msg); | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/main/java/com/geosiris/webstudio/exeptions/NotValidRequestException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.geosiris.webstudio.exeptions; | ||
|
|
||
| public class NotValidRequestException extends Exception{ | ||
|
|
||
| public NotValidRequestException(String msg){ | ||
| super("NotValidRequestException : " + msg); | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.