From b0fd1a0b67801197f8089648b2f66ca025714ef2 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 3 Mar 2018 23:37:21 +0100 Subject: [PATCH 01/15] Upgrade to Jena 3.6.0 Closes #22 Signed-off-by: Andrew Berezovskyi --- src/pom.xml | 21 +++++------- src/store-core/pom.xml | 33 ++----------------- .../lyo/store/internals/JenaTdbStoreImpl.java | 23 ++++++++++--- .../SparqlQueryExecutorBasicAuthImpl.java | 26 +++++++++++---- 4 files changed, 48 insertions(+), 55 deletions(-) diff --git a/src/pom.xml b/src/pom.xml index ddaa307..2f64859 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -24,20 +24,12 @@ + org.apache.jena - jena-core - 3.0.1 - - - org.apache.jena - jena-arq - 3.0.1 - - - org.apache.jena - jena-tdb - 3.0.1 + apache-jena-libs + 3.6.0 + pom @@ -51,6 +43,11 @@ guava 21.0 + + org.apache.httpcomponents + httpclient + 4.5.5 + xml-apis diff --git a/src/store-core/pom.xml b/src/store-core/pom.xml index 8d1657b..7baeef7 100644 --- a/src/store-core/pom.xml +++ b/src/store-core/pom.xml @@ -48,37 +48,8 @@ org.apache.jena - jena-core - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.jena - jena-arq - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - jcl-over-slf4j - - - - - org.apache.jena - jena-tdb - - - org.slf4j - slf4j-log4j12 - - + apache-jena-libs + pom diff --git a/src/store-core/src/main/java/org/eclipse/lyo/store/internals/JenaTdbStoreImpl.java b/src/store-core/src/main/java/org/eclipse/lyo/store/internals/JenaTdbStoreImpl.java index 6a9d45e..18fa258 100644 --- a/src/store-core/src/main/java/org/eclipse/lyo/store/internals/JenaTdbStoreImpl.java +++ b/src/store-core/src/main/java/org/eclipse/lyo/store/internals/JenaTdbStoreImpl.java @@ -5,7 +5,7 @@ * Contributors: * Andrew Berezovskyi - initial implementation * %% - * Copyright (C) 2016 KTH Royal Institute of Technology + * Copyright (C) 2016 - 2018 KTH Royal Institute of Technology * %% * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,6 +15,7 @@ */ import com.google.common.collect.Sets; +import java.util.HashSet; import org.apache.jena.query.Dataset; import org.apache.jena.query.ReadWrite; import org.apache.jena.rdf.model.Model; @@ -74,6 +75,7 @@ public boolean namedGraphExists(final URI namedGraph) { dataset.begin(ReadWrite.READ); try { contains = dataset.containsNamedModel(namedGraph.toString()); + dataset.commit(); } finally { dataset.end(); } @@ -86,9 +88,9 @@ public List getResources(final URI namedGraph, if (namedGraphExists(namedGraph)) { dataset.begin(ReadWrite.READ); final Model model = dataset.getNamedModel(namedGraph.toString()); - dataset.end(); try { final Object[] obj = JenaModelHelper.fromJenaModel(model, clazz); + dataset.commit(); @SuppressWarnings("unchecked") final T[] castObjects = (T[]) Array.newInstance( clazz, obj.length); for (int i = 0; i < obj.length; i++) { @@ -100,6 +102,8 @@ public List getResources(final URI namedGraph, InvocationTargetException | NoSuchMethodException | URISyntaxException e) { throw new ModelUnmarshallingException( "Failed to buildPersistent an " + "object from Jena model", e); + } finally { + dataset.end(); } } else { throw new StoreAccessException( @@ -163,7 +167,9 @@ public Set keySet() { dataset.begin(ReadWrite.READ); try { final Iterator namedGraphNames = dataset.listNames(); - return Sets.newHashSet(namedGraphNames); + final HashSet strings = Sets.newHashSet(namedGraphNames); + dataset.commit(); + return strings; } finally { dataset.end(); } @@ -172,7 +178,14 @@ public Set keySet() { @Override public void removeAll() { // TODO Andrew@2017-04-04: do we need a transaction here? - dataset.asDatasetGraph().clear(); + dataset.begin(ReadWrite.WRITE); + try { + dataset.asDatasetGraph().clear(); + dataset.commit(); + } + finally { + dataset.end(); + } } @Override @@ -198,7 +211,7 @@ public void insertJenaModel(final URI name, final Model model) { } finally { dataset.end(); } - TDB.sync(dataset); +// TDB.sync(dataset); } public void putJenaModel(final URI name, final Model model) { diff --git a/src/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java b/src/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java index d3f6cca..481630f 100644 --- a/src/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java +++ b/src/store-core/src/main/java/org/eclipse/lyo/store/internals/query/SparqlQueryExecutorBasicAuthImpl.java @@ -5,7 +5,7 @@ * Contributors: * Andrew Berezovskyi - initial implementation * %% - * Copyright (C) 2016 KTH Royal Institute of Technology + * Copyright (C) 2016 - 2018 KTH Royal Institute of Technology * %% * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -14,12 +14,17 @@ * #L% */ +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.jena.query.QueryExecution; import org.apache.jena.query.QueryExecutionFactory; import org.apache.jena.update.UpdateExecutionFactory; import org.apache.jena.update.UpdateFactory; import org.apache.jena.update.UpdateProcessor; -import org.apache.jena.atlas.web.auth.SimpleAuthenticator; /** * SparqlQueryExecutorImpl is a SPARQL endpoint-based implementation of {@link JenaQueryExecutor}. @@ -32,23 +37,30 @@ public class SparqlQueryExecutorBasicAuthImpl implements JenaQueryExecutor { private final String queryEndpoint; private final String updateEndpoint; - private final SimpleAuthenticator authenticator; + private final CloseableHttpClient client; public SparqlQueryExecutorBasicAuthImpl(final String sparqlEndpoint, final String updateEndpoint, final String login, final String password) { this.queryEndpoint = sparqlEndpoint; this.updateEndpoint = updateEndpoint; - authenticator = new SimpleAuthenticator(login, password.toCharArray()); + CredentialsProvider provider = new BasicCredentialsProvider(); + UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(login, password); + provider.setCredentials(AuthScope.ANY, credentials); + + client = HttpClientBuilder.create().setDefaultCredentialsProvider(provider).build(); } @Override public QueryExecution prepareSparqlQuery(final String query) { - return QueryExecutionFactory.sparqlService(queryEndpoint, query, authenticator); + return QueryExecutionFactory.sparqlService(queryEndpoint, query, client); } @Override public UpdateProcessor prepareSparqlUpdate(final String query) { - return UpdateExecutionFactory.createRemote(UpdateFactory.create(query), updateEndpoint, - authenticator); + return UpdateExecutionFactory.createRemote( + UpdateFactory.create(query), + updateEndpoint, + client + ); } } From 99fcf9f7d284b20f8fd3bfcc450c1e17737625b8 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 4 Mar 2018 05:23:53 +0100 Subject: [PATCH 02/15] Update git ignores --- src/.gitignore | 4 +++- src/store-core/.gitignore | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/.gitignore b/src/.gitignore index a6f89c2..39d5443 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1 +1,3 @@ -/target/ \ No newline at end of file +/.settings/ +/.project +/.classpath diff --git a/src/store-core/.gitignore b/src/store-core/.gitignore index 7d56db3..afa7537 100644 --- a/src/store-core/.gitignore +++ b/src/store-core/.gitignore @@ -13,9 +13,9 @@ hs_err_pid* # Eclipse +.project +.classpath .metadata -**/bin/ -**/tmp/ *.tmp *.bak *.swp From 6fdd5d0712c0cb4fbd5ec1b3ab6c21d1df9a0498 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 2 Sep 2017 22:08:48 +0200 Subject: [PATCH 03/15] Add Store Update This patch is moved from Gerrit Change 95016. Signed-off-by: Andrew Berezovskyi --- src/store-update/.gitignore | 87 ++++++ src/store-update/LICENSE.txt | 203 +++++++++++++ src/store-update/README.md | 76 +++++ src/store-update/doc/architecture.png | Bin 0 -> 165023 bytes src/store-update/pom.xml | 267 ++++++++++++++++++ .../src/license/eplv1/description.txt.ftl | 13 + .../src/license/eplv1/header.txt.ftl | 16 ++ .../src/license/eplv1/license.txt | 203 +++++++++++++ .../src/license/licenses.properties | 13 + .../lyo/tools/store/update/Handler.java | 16 ++ .../lyo/tools/store/update/OSLCMessage.java | 31 ++ .../store/update/ServiceProviderMessage.java | 14 + .../store/update/StoreUpdateManager.java | 99 +++++++ .../store/update/StoreUpdateRunnable.java | 94 ++++++ .../lyo/tools/store/update/change/Change.java | 34 +++ .../store/update/change/ChangeHelper.java | 37 +++ .../tools/store/update/change/ChangeKind.java | 45 +++ .../store/update/change/ChangeProvider.java | 15 + .../store/update/change/HistoryResource.java | 87 ++++++ .../store/update/change/package-info.java | 9 + .../lyo/tools/store/update/package-info.java | 10 + .../store/update/TestHistoryResource.java | 86 ++++++ .../src/test/resources/log4j.properties | 26 ++ 23 files changed, 1481 insertions(+) create mode 100644 src/store-update/.gitignore create mode 100644 src/store-update/LICENSE.txt create mode 100644 src/store-update/README.md create mode 100644 src/store-update/doc/architecture.png create mode 100644 src/store-update/pom.xml create mode 100644 src/store-update/src/license/eplv1/description.txt.ftl create mode 100644 src/store-update/src/license/eplv1/header.txt.ftl create mode 100644 src/store-update/src/license/eplv1/license.txt create mode 100644 src/store-update/src/license/licenses.properties create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java create mode 100644 src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java create mode 100644 src/store-update/src/test/resources/log4j.properties diff --git a/src/store-update/.gitignore b/src/store-update/.gitignore new file mode 100644 index 0000000..2b917aa --- /dev/null +++ b/src/store-update/.gitignore @@ -0,0 +1,87 @@ +######################### +# PROJECT +######################### + +/*.iml +/.idea/ + +######################### +# JAVA +######################### + +# Mobile Tools for Java (J2ME) +**/.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +############################### +# Eclipse +# exceptions: .project, .launch +############################### + +.metadata +**/bin/ +**/tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +**/.settings/ +.loadpath +.recommenders + +# External tool builders +**/.externalToolBuilders/ + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +**/.recommenders/ + + +######################### +# MAVEN +######################### + +**/overlays/ +**/target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +**/.mvn/timing.properties diff --git a/src/store-update/LICENSE.txt b/src/store-update/LICENSE.txt new file mode 100644 index 0000000..f735bee --- /dev/null +++ b/src/store-update/LICENSE.txt @@ -0,0 +1,203 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and +b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' + from a Contributor if it was added to the Program by such Contributor + itself or anyone acting on such Contributor's behalf. Contributions do not + include additions to the Program which: (i) are separate modules of + software distributed in conjunction with the Program under their own + license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly + perform, distribute and sublicense the Contribution of such Contributor, + if any, and such derivative works, in source code and object code form. + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of + the Contribution and the Program if, at the time the Contribution is + added by the Contributor, such addition of the Contribution causes such + combination to be covered by the Licensed Patents. The patent license + shall not apply to any other combinations which include the Contribution. + No hardware per se is licensed hereunder. + c) Recipient understands that although each Contributor grants the licenses + to its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor + disclaims any liability to Recipient for claims brought by any other + entity based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to secure + any other intellectual property rights needed, if any. For example, if a + third party patent license is required to allow Recipient to distribute + the Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties or + conditions of merchantability and fitness for a particular purpose; + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + b) a copy of this Agreement must be included with each copy of the Program. + Contributors may not remove or alter any copyright notices contained + within the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim at +its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to the +risks and costs of program errors, compliance with applicable laws, damage to +or loss of data, programs or equipment, and unavailability or interruption of +operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in the +Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. diff --git a/src/store-update/README.md b/src/store-update/README.md new file mode 100644 index 0000000..d29beec --- /dev/null +++ b/src/store-update/README.md @@ -0,0 +1,76 @@ +# Lyo Store + +*Lyo Store* is a library that provides a simple interface for working with a triplestore via Java objects representing OSLC Resources. Lyo Store and Jena Models in the triple stores. + +**[Lyo Store Javadoc](http://assume.gitlab.io/jena-cache/apidocs/)** + +## Prerequisites + +* For an in-memory option: JVM heap should be set to 1G or above (see [Jena documentation][1] for more information on this). +* For an on-disk option: an empty writable folder on disk, around 200MB of space is pre-allocated. +* For a SPARQL option: a pair of SPARQL Query and SPARQL Update URLs, optionally with basic authentication. + +## Maven dependency + + + org.eclipse.lyo.tools + lyo-store + 0.24.0-SNAPSHOT + + +More build systems are covered here: http://assume.gitlab.io/jena-cache/dependency-info.html + + +## Initialisation + +### SPARQL + + String sparqlQueryEndpoint = properties.getProperty("sparqlQueryEndpoint"); + String sparqlUpdateEndpoint = properties.getProperty("sparqlUpdateEndpoint"); + Store store = StoreFactory.sparql(sparqlQueryEndpoint, sparqlUpdateEndpoint); + +### On-disk + + String storeDirProp = properties.getProperty("storeDir"); + Path storeDir = Paths.get(storeDirProp); + Store store = StoreFactory.onDisk(storeDir); + +### In-memory + + Store store = StoreFactory.inMemory(); + +## Basic usage + +### Add the new resources and overwrite the existing ones + +```java +try { + store.updateResources(GRAPH_NAME, // URI of the named graph + resourceArray); // an array of OSLC Resources +} catch (StoreAccessException e) { + logger.error("Error executing a query on a triplestore"); +} +``` + +### Retrieving the resources from the triplestore + +```java +if (store.namedGraphExists(GRAPH_NAME)) { + try { + final int limit = 10; // fetch 10 resources + final int offset = 0; // start with the first page + // 'limit+1' is a technique that allows you to determine if there are + // more results on the next page + List requirements = store.getResources(GRAPH_NAME, + Requirement.class, // resources of this class will be fetched and unmarshalled + limit + 1, // resource limit + offset)); // how many resources to skip, use for paging + } catch (StoreAccessException e) { + logger.error("Error executing a query on a triplestore"); + } catch ( ModelUnmarshallingException e) { + logger.error("Error unmarshalling the RDF from triplestore into Requirement class instances"); + } +} +``` + +[1]: https://jena.apache.org/documentation/tdb/architecture.html#caching-on-32-and-64-bit-java-systems diff --git a/src/store-update/doc/architecture.png b/src/store-update/doc/architecture.png new file mode 100644 index 0000000000000000000000000000000000000000..398cd67ee901276c4355abf80b397d215c9fb121 GIT binary patch literal 165023 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%0D)uNVt{qpmdPQik`HXf9e{%XzR<>M3Br94b#pUO% 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 + + 4.0.0 + + + org.eclipse.lyo.store + store-parent + 2.3.0-SNAPSHOT + ../pom.xml + + + store-update + 2.3.0-SNAPSHOT + + + UTF-8 + UTF-8 + 1.8 + 1.8 + 2.1.2 + + + + + org.eclipse.lyo.store + store-core + 2.3.0-SNAPSHOT + + + + junit + junit + 4.10 + test + + + org.assertj + assertj-core + 3.5.2 + test + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-test + verify + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + true + + + + + + org.codehaus.mojo + license-maven-plugin + 1.10 + + eplv1 + ${project.baseUri}src/license + + KTH Royal Institute of Technology + + 2016 + + ${basedir}/src/license//eplv1/description.txt.ftl + + true + + + + + com.qulice + qulice-maven-plugin + 0.17 + + file:${basedir}/LICENSE.txt + + checkstyle:.* + findbugs:~* + cobertura:.* + dependencies:net.sourceforge.cobertura:cobertura + duplicatefinder:.* + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + org.tendiwa + git-version-insert-maven-plugin + 0.1 + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + public + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + + cobertura + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + + + + + + + Eclipse Public License 1.0 + https://www.eclipse.org/legal/epl-v10.html + + + + + + lyo-releases + lyo-releases repository + https://repo.eclipse.org/content/repositories/lyo-releases/ + + + + lyo-snapshots + lyo-snapshots repository + https://repo.eclipse.org/content/repositories/lyo-snapshots/ + + + + diff --git a/src/store-update/src/license/eplv1/description.txt.ftl b/src/store-update/src/license/eplv1/description.txt.ftl new file mode 100644 index 0000000..ab33804 --- /dev/null +++ b/src/store-update/src/license/eplv1/description.txt.ftl @@ -0,0 +1,13 @@ +<#-- + #%L + Contributors: + %% + Copyright (C) 2016 KTH Royal Institute of Technology + %% + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + #L% +--> +Contributors: diff --git a/src/store-update/src/license/eplv1/header.txt.ftl b/src/store-update/src/license/eplv1/header.txt.ftl new file mode 100644 index 0000000..6521ed8 --- /dev/null +++ b/src/store-update/src/license/eplv1/header.txt.ftl @@ -0,0 +1,16 @@ +<#-- + #%L + Contributors: + %% + Copyright (C) 2016 KTH Royal Institute of Technology + %% + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + #L% +--> +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v1.0 +which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html diff --git a/src/store-update/src/license/eplv1/license.txt b/src/store-update/src/license/eplv1/license.txt new file mode 100644 index 0000000..f735bee --- /dev/null +++ b/src/store-update/src/license/eplv1/license.txt @@ -0,0 +1,203 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation + distributed under this Agreement, and +b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' + from a Contributor if it was added to the Program by such Contributor + itself or anyone acting on such Contributor's behalf. Contributions do not + include additions to the Program which: (i) are separate modules of + software distributed in conjunction with the Program under their own + license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly + perform, distribute and sublicense the Contribution of such Contributor, + if any, and such derivative works, in source code and object code form. + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of + the Contribution and the Program if, at the time the Contribution is + added by the Contributor, such addition of the Contribution causes such + combination to be covered by the Licensed Patents. The patent license + shall not apply to any other combinations which include the Contribution. + No hardware per se is licensed hereunder. + c) Recipient understands that although each Contributor grants the licenses + to its Contributions set forth herein, no assurances are provided by any + Contributor that the Program does not infringe the patent or other + intellectual property rights of any other entity. Each Contributor + disclaims any liability to Recipient for claims brought by any other + entity based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to secure + any other intellectual property rights needed, if any. For example, if a + third party patent license is required to allow Recipient to distribute + the Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all warranties + and conditions, express and implied, including warranties or + conditions of title and non-infringement, and implied warranties or + conditions of merchantability and fitness for a particular purpose; + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + b) a copy of this Agreement must be included with each copy of the Program. + Contributors may not remove or alter any copyright notices contained + within the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim at +its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to the +risks and costs of program errors, compliance with applicable laws, damage to +or loss of data, programs or equipment, and unavailability or interruption of +operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in the +Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. diff --git a/src/store-update/src/license/licenses.properties b/src/store-update/src/license/licenses.properties new file mode 100644 index 0000000..23021d4 --- /dev/null +++ b/src/store-update/src/license/licenses.properties @@ -0,0 +1,13 @@ +### +# #%L +# jena-cache +# %% +# Copyright (C) 2016 Andrew Berezovskyi +# %% +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# #L% +### +eplv1=Eclipse Public License 1.0 diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java new file mode 100644 index 0000000..85dabc4 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java @@ -0,0 +1,16 @@ +package org.eclipse.lyo.tools.store.update; + +import java.util.Collection; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.Change; + +/** + * Handler is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface Handler { + void handle(Store store, Collection> changes); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java new file mode 100644 index 0000000..8d9a592 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java @@ -0,0 +1,31 @@ +package org.eclipse.lyo.tools.store.update; + +import java.net.URI; + +/** + * OSLCMessage is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class OSLCMessage implements ServiceProviderMessage { + private final URI serviceProviderId; + + public OSLCMessage(URI serviceProviderId) { + this.serviceProviderId = serviceProviderId; + } + + @Override + public URI getServiceProviderId() { + return serviceProviderId; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("OSLCMessage{"); + sb.append("serviceProviderId='").append(serviceProviderId).append('\''); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java new file mode 100644 index 0000000..3de8f8d --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java @@ -0,0 +1,14 @@ +package org.eclipse.lyo.tools.store.update; + +import java.net.URI; + +/** + * Created on 06.03.17 + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.1 + */ +public interface ServiceProviderMessage { + URI getServiceProviderId(); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java new file mode 100644 index 0000000..5351d63 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java @@ -0,0 +1,99 @@ +package org.eclipse.lyo.tools.store.update; + +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a + * predefined delay or on-demand. Operates on a generic message (which must extend + * {@link OSLCMessage}) that is passed to handlers. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class StoreUpdateManager { + private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); + private static final int NODELAY = 0; + private static final int SINGLE_THREAD_POOL = 1; + private final ScheduledExecutorService executor; + private final ChangeProvider changeProvider; + private final Store store; + private final List> handlers = new ArrayList<>(); + + /** + * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a + * predefined delay or on-demand. + * + * @param store Instance of an initialised Store + * @param changeProvider Provider of the changes in the underlying tool. + */ + public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { + executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); + this.store = store; + this.changeProvider = changeProvider; + } + + /** + * Polling update on a given {@link ChangeProvider} followed by a notification to all + * previously registered + * {@link Handler} objects. + * + * @param lastUpdate Time of last store update, changes before this moment might be dropped. + * @param delaySeconds Seconds between polling checks. + */ + public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, + lastUpdate, null, handlers); + executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, + TimeUnit.SECONDS); + + StoreUpdateManager.LOGGER.trace( + "ProRManager.contextInitializeServletListener() body ran successfully"); + } + + /** + * Submit a single update request. Typically done from the HTTP handler. + * + * @param lastUpdate + * @param message Specific details for the {@link ChangeProvider} + * @return {@link Future} that allows to block until the runnable is finished executing + * (strongly discouraged). + */ + public Future submit(final ZonedDateTime lastUpdate, final M message) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, + lastUpdate, message, handlers); + return executor.submit(updateRunnable); + } + + /** + * Add a {@link Handler} that will process the collection of + * {@link org.eclipse.lyo.tools.store.update.change.Change} generated by the + * {@link ChangeProvider}. Handler is not guaranteed to be called if added after the update + * has been scheduled. + * + * @param handler Handler that should be called whenever {@link ChangeProvider} returns any + * changes. + */ + public void addHandler(final Handler handler) { + handlers.add(handler); + } + + /** + * Method can be overridden in case a more sophisticated Runnable has to be constructed. + */ + protected StoreUpdateRunnable buildRunnable(final Store store, + final ChangeProvider changeProvider, final ZonedDateTime lastUpdate, final M message, + final List> handlers) { + return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java new file mode 100644 index 0000000..df16f7b --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java @@ -0,0 +1,94 @@ +package org.eclipse.lyo.tools.store.update; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.Change; +import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Requests latest {@link Change} collection from {@link ChangeProvider} and triggers each + * handler afterwards. Stores the timestamp of the newest change to request new updates starting + * from that point in time. + *

+ *

Handlers will be notified with different message per service provider as accessible via + * {@link OSLCMessage#getServiceProviderId()}.

+ * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +class StoreUpdateRunnable implements Runnable { + + private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, + 1, ZoneId.of("UTC")); + private final Logger log = LoggerFactory.getLogger(StoreUpdateRunnable.class); + private final ChangeProvider changeProvider; + private final M message; + private final Store store; + private final List> handlers; + private ZonedDateTime lastUpdate; + + /** + * @param store Initialised Store + * @param changeProvider Change provider + * @param lastUpdate Initial timestamp. If null, will be set to {@link + * StoreUpdateRunnable#LAST_UPDATE_DEFAULT} + * @param message Initial message to the {@link ChangeProvider} + * @param handlers List of handlers to be notified. + */ + StoreUpdateRunnable(final Store store, final ChangeProvider changeProvider, + final ZonedDateTime lastUpdate, final M message, final List> handlers) { + this.store = store; + this.changeProvider = changeProvider; + this.message = message; + this.handlers = handlers; + if (lastUpdate != null) { + this.lastUpdate = lastUpdate; + } else { + this.lastUpdate = StoreUpdateRunnable.LAST_UPDATE_DEFAULT; + } + } + + @Override + public void run() { + try { + log.trace("Running background update"); + Collection> changes = null; + try { + changes = changeProvider.getChangesSince(lastUpdate, message); + } catch (final Exception e) { + log.error("ChangeProvider threw an exception", e); + } + if (changes != null && !changes.isEmpty()) { + for (final Handler handler : handlers) { + log.trace("Notifying {}", handler); + try { + handler.handle(store, changes); + } catch (final Exception e) { + log.warn("Handler {} threw an exception", handler, e); + } + } + for (final Change change : changes) { + if (change != null) { + final Date date = change.getHistoryResource().getTimestamp(); + final ZonedDateTime dateTime = date.toInstant() + .atZone(ZoneId.systemDefault()); + if (lastUpdate.isBefore(dateTime)) { + lastUpdate = dateTime; + } + } + } + log.trace("Setting previous revision to {}", lastUpdate); + } + } catch (final Exception e) { + // ExecutorService will terminate the whole schedule if a Runnable throws an exception + log.error("A handler threw an exception!", e); + } + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java new file mode 100644 index 0000000..cb9e3d9 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java @@ -0,0 +1,34 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +/** + * Change is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class Change { + private final AbstractResource resource; + private final HistoryResource historyResource; + private final M message; + + public Change(AbstractResource resource, HistoryResource historyResource, M message) { + this.resource = resource; + this.historyResource = historyResource; + this.message = message; + } + + public AbstractResource getResource() { + return resource; + } + + public HistoryResource getHistoryResource() { + return historyResource; + } + + public M getMessage() { + return message; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java new file mode 100644 index 0000000..0bda8b5 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java @@ -0,0 +1,37 @@ +package org.eclipse.lyo.tools.store.update.change; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * ChangeHelper is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class ChangeHelper { + + public static List> changesCreated(Collection> allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) + .collect(Collectors.toList()); + } + + public static List> changesModified(Collection> allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + .collect(Collectors.toList()); + } + + public static List historyFrom(Collection> changes) { + return ChangeHelper.mapFn(changes, Change::getHistoryResource); + } + + public static List mapFn(Collection changes, Function mapper) { + return changes.stream().map(mapper).collect(Collectors.toList()); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java new file mode 100644 index 0000000..5e1391c --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java @@ -0,0 +1,45 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; + +/** + * ChangeKind is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(ChangeKind.NAME) +@OslcResourceShape(title = "Change Kind Resource Shape", describes = HistoryResource.NS_TRS + ChangeKind.NAME) +public enum ChangeKind { + // Strings taken from the TRS provider implementation + CREATION("Created"), + MODIFICATION("Modified"), + DELETION("Deleted"); + + public static final String NAME = "ChangeKind"; + private final String created; + + ChangeKind(String created) { + this.created = created; + } + + public static ChangeKind fromString(String text) { + if (text != null) { + for (ChangeKind kind : ChangeKind.values()) { + if (text.equalsIgnoreCase(kind.created)) { + return kind; + } + } + } + throw new IllegalArgumentException("No constant with text " + text + " found"); + } + + @Override + public String toString() { + return created; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java new file mode 100644 index 0000000..0d9ae69 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java @@ -0,0 +1,15 @@ +package org.eclipse.lyo.tools.store.update.change; + +import java.time.ZonedDateTime; +import java.util.Collection; + +/** + * ChangeProvider is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface ChangeProvider { + Collection> getChangesSince(ZonedDateTime lastUpdate, M message); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java new file mode 100644 index 0000000..e55e12a --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java @@ -0,0 +1,87 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +import java.net.URI; +import java.time.ZonedDateTime; +import java.util.Date; + +/** + * HistoryResource is a wrapper OSLC Resource around org.eclipse.lyo.oslc4j.trs.provider.HistoryData. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(HistoryResource.NAME) +@OslcResourceShape(title = "TRS History Resource Shape", describes = HistoryResource.TYPE) +public class HistoryResource extends AbstractResource { + public static final String NS_TRS = "http://open-services.net/ns/core/trs#"; + public static final String NAME = "TrsHistoryResource"; + public static final String TYPE = NS_TRS + NAME; + private ChangeKind changeKind; + private Date timestamp; + private URI resourceURI; + + /** + * Shall be used only by the OSLC Jena Model Helper + */ + @Deprecated + public HistoryResource() { + } + + public HistoryResource(ChangeKind changeKind, Date timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = timestamp; + this.resourceURI = resourceURI; + } + + public HistoryResource(ChangeKind changeKind, ZonedDateTime timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = Date.from(timestamp.toInstant()); + this.resourceURI = resourceURI; + } + + @OslcName("change_kind") + @OslcPropertyDefinition(NS_TRS + "change_kind") + public String getChangeKind() { + return changeKind.toString(); + } + + public void setChangeKind(ChangeKind changeKind) { + this.changeKind = changeKind; + } + + public ChangeKind getChangeKindEnum() { + return changeKind; + } + + public void setChangeKind(String changeKind) { + this.changeKind = ChangeKind.fromString(changeKind); + } + + @OslcName("timestamp") + @OslcPropertyDefinition(NS_TRS + "timestamp") + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + @OslcName("uri") + @OslcPropertyDefinition(NS_TRS + "uri") + public URI getResourceURI() { + return resourceURI; + } + + public void setResourceURI(URI resourceURI) { + this.resourceURI = resourceURI; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java new file mode 100644 index 0000000..36a7641 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java @@ -0,0 +1,9 @@ +/** + * Classes for defining changes for handlers. + * {@link org.eclipse.lyo.tools.store.update.change.HistoryResource} can be persisted in a + * triplestore. + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.tools.store.update.change; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java new file mode 100644 index 0000000..2e5a945 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java @@ -0,0 +1,10 @@ +/** + * Common primitives for updating store. + * {@link org.eclipse.lyo.tools.store.update.StoreUpdateRunnable} is scheduled by + * {@link org.eclipse.lyo.tools.store.update.StoreUpdateManager}. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.tools.store.update; diff --git a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java new file mode 100644 index 0000000..4c2c433 --- /dev/null +++ b/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java @@ -0,0 +1,86 @@ +package org.eclipse.lyo.tools.store.update; + +import com.hp.hpl.jena.rdf.model.Model; +import java.net.URI; +import java.time.Instant; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.StoreFactory; +import org.eclipse.lyo.tools.store.update.change.ChangeKind; +import org.eclipse.lyo.tools.store.update.change.HistoryResource; +import org.junit.Test; + +/** + * TestTrsHistoryResource is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class TestHistoryResource { + public static final URI RESOURCE_URI = URI.create("test:test"); + private final Store store = StoreFactory.inMemory(); + + @Test + public void testResourceIsMarshalled() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(0); + } + + @Test + public void testResourceContainsStatements() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(1); + } + + @Test + public void testResourceIsPersisted() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + assertThat(store.keySet()).hasSize(0); + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + assertThat(store.keySet()).hasSize(1); + } + + @Test + public void testResourceIsRestored() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + assertThat(resources).hasSize(1); + } + + @Test + public void testResourceIsRestoredWithProperties() throws Exception { + String testResourceURI = "lyo:testtest"; + Date timestamp = Date.from(Instant.now()); + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, timestamp, + URI.create(testResourceURI)); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + HistoryResource storeResource = resources.get(0); + + assertThat(storeResource.getChangeKind()).isEqualToIgnoringCase(String.valueOf(ChangeKind.CREATION)); + assertThat(storeResource.getTimestamp()).isEqualTo(timestamp); + assertThat(storeResource.getResourceURI().toASCIIString()).isEqualTo(testResourceURI); + } +} diff --git a/src/store-update/src/test/resources/log4j.properties b/src/store-update/src/test/resources/log4j.properties new file mode 100644 index 0000000..9f4c714 --- /dev/null +++ b/src/store-update/src/test/resources/log4j.properties @@ -0,0 +1,26 @@ +### +# #%L +# Contributors: +# Andrew Berezovskyi - initial template (based on https://logging.apache.org/log4j/1.2/manual.html) +# +# NOTICE: +# Copyright © 2000-2002 The Apache Software Foundation. All rights reserved. This software is published under the terms of the Apache Software License version 2.0, a copy of which has been included in the LICENSE file shipped with the log4j distribution. This document is based on the article "Log4j delivers control over logging" published in November 2000 edition of JavaWorld. However, the present article containsKey more detailed and up to date information. The present short manual also borrows some text from "The complete log4j manual" by the same author (yours truly). +# %% +# Copyright (C) 2016 KTH Royal Institute of Technology +# %% +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# #L% +### +# Set root logger level to DEBUG and its only appender to rootAppender. +log4j.rootLogger=DEBUG, rootAppender + +log4j.appender.rootAppender=org.apache.log4j.ConsoleAppender +log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.rootAppender.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + + +log4j.logger.org.apache.jena=INFO +log4j.logger.com.hp.hpl.jena=INFO From 45227d24241e9c223ace68fcee9909fc2a67191d Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 2 Sep 2017 22:21:49 +0200 Subject: [PATCH 04/15] Add the store-update module to the parent --- src/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pom.xml b/src/pom.xml index 2f64859..94ce337 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -19,6 +19,7 @@ store-core + store-update From 83e8c7c76ab67cf5236f480148bf6fe56df3c523 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 2 Sep 2017 22:44:00 +0200 Subject: [PATCH 05/15] Refactor the code to fit with the new store-core Signed-off-by: Andrew Berezovskyi --- .../eclipse/lyo/{tools => }/store/update/Handler.java | 6 +++--- .../lyo/{tools => }/store/update/OSLCMessage.java | 2 +- .../store/update/ServiceProviderMessage.java | 2 +- .../{tools => }/store/update/StoreUpdateManager.java | 9 +++++---- .../{tools => }/store/update/StoreUpdateRunnable.java | 8 ++++---- .../lyo/{tools => }/store/update/change/Change.java | 2 +- .../{tools => }/store/update/change/ChangeHelper.java | 2 +- .../{tools => }/store/update/change/ChangeKind.java | 2 +- .../store/update/change/ChangeProvider.java | 2 +- .../store/update/change/HistoryResource.java | 2 +- .../{tools => }/store/update/change/package-info.java | 4 ++-- .../org/eclipse/lyo/store/update/package-info.java | 10 ++++++++++ .../eclipse/lyo/tools/store/update/package-info.java | 10 ---------- .../{tools => }/store/update/TestHistoryResource.java | 10 +++++----- 14 files changed, 36 insertions(+), 35 deletions(-) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/Handler.java (62%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/OSLCMessage.java (94%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/ServiceProviderMessage.java (83%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/StoreUpdateManager.java (94%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/StoreUpdateRunnable.java (94%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/Change.java (93%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/ChangeHelper.java (96%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/ChangeKind.java (96%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/ChangeProvider.java (85%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/HistoryResource.java (98%) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/change/package-info.java (53%) create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java rename src/store-update/src/test/java/org/eclipse/lyo/{tools => }/store/update/TestHistoryResource.java (92%) diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java similarity index 62% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java index 85dabc4..07774bb 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java @@ -1,8 +1,8 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.util.Collection; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.Change; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.update.change.Change; /** * Handler is . diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java similarity index 94% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java index 8d9a592..c10466d 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.net.URI; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java similarity index 83% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java index 3de8f8d..78bb667 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.net.URI; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java similarity index 94% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java index 5351d63..252470d 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -7,8 +7,9 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.update.change.Change; +import org.eclipse.lyo.store.update.change.ChangeProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,7 +78,7 @@ public Future submit(final ZonedDateTime lastUpdate, final M message) { /** * Add a {@link Handler} that will process the collection of - * {@link org.eclipse.lyo.tools.store.update.change.Change} generated by the + * {@link Change} generated by the * {@link ChangeProvider}. Handler is not guaranteed to be called if added after the update * has been scheduled. * diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java similarity index 94% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java index df16f7b..b724d9a 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java @@ -1,13 +1,13 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Collection; import java.util.Date; import java.util.List; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.Change; -import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.update.change.Change; +import org.eclipse.lyo.store.update.change.ChangeProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java similarity index 93% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java index cb9e3d9..0dc19f2 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java similarity index 96% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java index 0bda8b5..5dc65c3 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; import java.util.Collection; import java.util.List; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java similarity index 96% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java index 5e1391c..1c8ad1f 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java similarity index 85% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java index 0d9ae69..e135c9d 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; import java.time.ZonedDateTime; import java.util.Collection; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java similarity index 98% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java index e55e12a..188e852 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java similarity index 53% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java index 36a7641..8d8df3b 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java @@ -1,9 +1,9 @@ /** * Classes for defining changes for handlers. - * {@link org.eclipse.lyo.tools.store.update.change.HistoryResource} can be persisted in a + * {@link org.eclipse.lyo.store.update.change.HistoryResource} can be persisted in a * triplestore. * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ * @since 0.18.0 */ -package org.eclipse.lyo.tools.store.update.change; +package org.eclipse.lyo.store.update.change; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java new file mode 100644 index 0000000..dedee4f --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java @@ -0,0 +1,10 @@ +/** + * Common primitives for updating store. + * {@link org.eclipse.lyo.store.update.StoreUpdateRunnable} is scheduled by + * {@link org.eclipse.lyo.store.update.StoreUpdateManager}. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.store.update; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java deleted file mode 100644 index 2e5a945..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Common primitives for updating store. - * {@link org.eclipse.lyo.tools.store.update.StoreUpdateRunnable} is scheduled by - * {@link org.eclipse.lyo.tools.store.update.StoreUpdateManager}. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -package org.eclipse.lyo.tools.store.update; diff --git a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java similarity index 92% rename from src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java rename to src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java index 4c2c433..fd4c32e 100644 --- a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java +++ b/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import com.hp.hpl.jena.rdf.model.Model; import java.net.URI; @@ -8,10 +8,10 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.StoreFactory; -import org.eclipse.lyo.tools.store.update.change.ChangeKind; -import org.eclipse.lyo.tools.store.update.change.HistoryResource; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.StoreFactory; +import org.eclipse.lyo.store.update.change.ChangeKind; +import org.eclipse.lyo.store.update.change.HistoryResource; import org.junit.Test; /** From 9fafb491b678458918a52ea9c7d97ebd552c5f8a Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Mon, 27 Nov 2017 21:56:28 +0100 Subject: [PATCH 06/15] Add TRS and Store handlers Signed-off-by: Andrew Berezovskyi --- .../store/ModelUnmarshallingException.java | 5 + .../lyo/store/StoreAccessException.java | 5 + src/store-update/pom.xml | 457 ++++++++---------- .../org/eclipse/lyo/store/update/Handler.java | 2 +- .../eclipse/lyo/store/update/OSLCMessage.java | 31 -- .../store/update/ServiceProviderMessage.java | 2 +- .../lyo/store/update/StoreUpdateManager.java | 70 +-- .../lyo/store/update/StoreUpdateRunnable.java | 4 +- .../lyo/store/update/UpdateMessage.java | 5 + .../lyo/store/update/change/Change.java | 11 +- .../lyo/store/update/change/ChangeHelper.java | 10 +- .../store/update/change/ChangeProvider.java | 4 +- .../update/handlers/SimpleStoreHandler.java | 105 ++++ .../update/handlers/TrsChangelogHandler.java | 61 +++ .../handlers/TrsMqttChangeLogHandler.java | 91 ++++ .../store/update/handlers/package-info.java | 8 + 16 files changed, 537 insertions(+), 334 deletions(-) delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java diff --git a/src/store-core/src/main/java/org/eclipse/lyo/store/ModelUnmarshallingException.java b/src/store-core/src/main/java/org/eclipse/lyo/store/ModelUnmarshallingException.java index 1e859b9..a5b10ad 100644 --- a/src/store-core/src/main/java/org/eclipse/lyo/store/ModelUnmarshallingException.java +++ b/src/store-core/src/main/java/org/eclipse/lyo/store/ModelUnmarshallingException.java @@ -24,6 +24,11 @@ * @since 0.14.0 */ public class ModelUnmarshallingException extends Exception { + /** + * + */ + private static final long serialVersionUID = 7760792549346636219L; + public ModelUnmarshallingException() { super(); } diff --git a/src/store-core/src/main/java/org/eclipse/lyo/store/StoreAccessException.java b/src/store-core/src/main/java/org/eclipse/lyo/store/StoreAccessException.java index b44e466..8deb6fe 100644 --- a/src/store-core/src/main/java/org/eclipse/lyo/store/StoreAccessException.java +++ b/src/store-core/src/main/java/org/eclipse/lyo/store/StoreAccessException.java @@ -23,6 +23,11 @@ * @since 0.13 */ public class StoreAccessException extends Exception { + /** + * + */ + private static final long serialVersionUID = -7535919324037847033L; + public StoreAccessException() { super(); } diff --git a/src/store-update/pom.xml b/src/store-update/pom.xml index 2bb4f28..12900a2 100644 --- a/src/store-update/pom.xml +++ b/src/store-update/pom.xml @@ -1,267 +1,216 @@ - 4.0.0 + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.eclipse.lyo.store - store-parent - 2.3.0-SNAPSHOT - ../pom.xml - - - store-update + + org.eclipse.lyo.store + store-parent 2.3.0-SNAPSHOT + ../pom.xml + - - UTF-8 - UTF-8 - 1.8 - 1.8 - 2.1.2 - + store-update + + UTF-8 + UTF-8 + 1.8 + 1.8 + 2.3.0-SNAPSHOT + - - - org.eclipse.lyo.store - store-core - 2.3.0-SNAPSHOT - - - - junit - junit - 4.10 - test - - - org.assertj - assertj-core - 3.5.2 - test - - + + + org.eclipse.lyo.store + store-core + 2.2.0 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + org.eclipse.lyo.trs + trs-provider + 2.4.0-SNAPSHOT + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.1.0 + + - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19.1 - - - - integration-test - verify - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - true - - - - - - org.codehaus.mojo - license-maven-plugin - 1.10 - - eplv1 - ${project.baseUri}src/license - - KTH Royal Institute of Technology - - 2016 - - ${basedir}/src/license//eplv1/description.txt.ftl - - true - - - - - com.qulice - qulice-maven-plugin - 0.17 - - file:${basedir}/LICENSE.txt - - checkstyle:.* - findbugs:~* - cobertura:.* - dependencies:net.sourceforge.cobertura:cobertura - duplicatefinder:.* - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar - - - - - - org.tendiwa - git-version-insert-maven-plugin - 0.1 - - - + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-test + verify + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + true + + + + + + org.codehaus.mojo + license-maven-plugin + 1.10 + + eplv1 + ${project.baseUri}src/license + + KTH Royal Institute of Technology + + 2016 + + ${basedir}/src/license//eplv1/description.txt.ftl + + true + + + + + com.qulice + qulice-maven-plugin + 0.17 + + file:${basedir}/LICENSE.txt + + checkstyle:.* + findbugs:~* + cobertura:.* + dependencies:net.sourceforge.cobertura:cobertura + duplicatefinder:.* + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + org.tendiwa + git-version-insert-maven-plugin + 0.1 + + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - public - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - - cobertura - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + public + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + + cobertura + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + + + - - - Eclipse Public License 1.0 - https://www.eclipse.org/legal/epl-v10.html - - + + + Eclipse Public License 1.0 + https://www.eclipse.org/legal/epl-v10.html + + - - - lyo-releases - lyo-releases repository - https://repo.eclipse.org/content/repositories/lyo-releases/ + + + lyo-releases + lyo-releases repository + https://repo.eclipse.org/content/repositories/lyo-releases/ - - - lyo-snapshots - lyo-snapshots repository - https://repo.eclipse.org/content/repositories/lyo-snapshots/ + + + lyo-snapshots + lyo-snapshots repository + https://repo.eclipse.org/content/repositories/lyo-snapshots/ - - + + diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java index 07774bb..f22f08f 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java @@ -12,5 +12,5 @@ * @since 0.0.0 */ public interface Handler { - void handle(Store store, Collection> changes); + Collection> handle(Store store, Collection> changes); } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java deleted file mode 100644 index c10466d..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.net.URI; - -/** - * OSLCMessage is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class OSLCMessage implements ServiceProviderMessage { - private final URI serviceProviderId; - - public OSLCMessage(URI serviceProviderId) { - this.serviceProviderId = serviceProviderId; - } - - @Override - public URI getServiceProviderId() { - return serviceProviderId; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("OSLCMessage{"); - sb.append("serviceProviderId='").append(serviceProviderId).append('\''); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java index 78bb667..607ffab 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java @@ -10,5 +10,5 @@ * @since 0.0.1 */ public interface ServiceProviderMessage { - URI getServiceProviderId(); + URI getServiceProviderUri(); } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java index 252470d..c375791 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java @@ -14,15 +14,15 @@ import org.slf4j.LoggerFactory; /** - * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a - * predefined delay or on-demand. Operates on a generic message (which must extend - * {@link OSLCMessage}) that is passed to handlers. + * Schedules {@link StoreUpdateRunnable} via internal + * {@link ScheduledExecutorService} with a predefined delay or on-demand. + * Operates on a generic message that is passed to handlers. * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ * @since 0.0.0 */ -public class StoreUpdateManager { +public class StoreUpdateManager { private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); private static final int NODELAY = 0; private static final int SINGLE_THREAD_POOL = 1; @@ -32,11 +32,13 @@ public class StoreUpdateManager { private final List> handlers = new ArrayList<>(); /** - * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a - * predefined delay or on-demand. + * Schedules {@link StoreUpdateRunnable} via internal + * {@link ScheduledExecutorService} with a predefined delay or on-demand. * - * @param store Instance of an initialised Store - * @param changeProvider Provider of the changes in the underlying tool. + * @param store + * Instance of an initialised Store + * @param changeProvider + * Provider of the changes in the underlying tool. */ public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); @@ -45,56 +47,56 @@ public StoreUpdateManager(final Store store, final ChangeProvider changeProvi } /** - * Polling update on a given {@link ChangeProvider} followed by a notification to all - * previously registered - * {@link Handler} objects. + * Polling update on a given {@link ChangeProvider} followed by a notification + * to all previously registered {@link Handler} objects. * - * @param lastUpdate Time of last store update, changes before this moment might be dropped. - * @param delaySeconds Seconds between polling checks. + * @param lastUpdate + * Time of last store update, changes before this moment might be + * dropped. + * @param delaySeconds + * Seconds between polling checks. */ public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, - lastUpdate, null, handlers); - executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, - TimeUnit.SECONDS); + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, null, handlers); + executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, TimeUnit.SECONDS); - StoreUpdateManager.LOGGER.trace( - "ProRManager.contextInitializeServletListener() body ran successfully"); + StoreUpdateManager.LOGGER.trace("Poll request has been enqueued"); } /** * Submit a single update request. Typically done from the HTTP handler. * * @param lastUpdate - * @param message Specific details for the {@link ChangeProvider} - * @return {@link Future} that allows to block until the runnable is finished executing - * (strongly discouraged). + * @param message + * Specific details for the {@link ChangeProvider} + * @return {@link Future} that allows to block until the runnable is finished + * executing (strongly discouraged). */ public Future submit(final ZonedDateTime lastUpdate, final M message) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, - lastUpdate, message, handlers); + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, message, + handlers); return executor.submit(updateRunnable); } /** - * Add a {@link Handler} that will process the collection of - * {@link Change} generated by the - * {@link ChangeProvider}. Handler is not guaranteed to be called if added after the update - * has been scheduled. + * Add a {@link Handler} that will process the collection of {@link Change} + * generated by the {@link ChangeProvider}. Handler is not guaranteed to be + * called if added after the update has been scheduled. * - * @param handler Handler that should be called whenever {@link ChangeProvider} returns any - * changes. + * @param handler + * Handler that should be called whenever {@link ChangeProvider} + * returns any changes. */ public void addHandler(final Handler handler) { handlers.add(handler); } /** - * Method can be overridden in case a more sophisticated Runnable has to be constructed. + * Method can be overridden in case a more sophisticated Runnable has to be + * constructed. */ - protected StoreUpdateRunnable buildRunnable(final Store store, - final ChangeProvider changeProvider, final ZonedDateTime lastUpdate, final M message, - final List> handlers) { + protected StoreUpdateRunnable buildRunnable(final Store store, final ChangeProvider changeProvider, + final ZonedDateTime lastUpdate, final M message, final List> handlers) { return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); } } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java index b724d9a..dae9317 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java @@ -23,7 +23,7 @@ * @version $version-stub$ * @since 0.18.0 */ -class StoreUpdateRunnable implements Runnable { +class StoreUpdateRunnable implements Runnable { private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, 1, ZoneId.of("UTC")); @@ -74,7 +74,7 @@ public void run() { log.warn("Handler {} threw an exception", handler, e); } } - for (final Change change : changes) { + for (final Change change : changes) { if (change != null) { final Date date = change.getHistoryResource().getTimestamp(); final ZonedDateTime dateTime = date.toInstant() diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java new file mode 100644 index 0000000..9d32be7 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java @@ -0,0 +1,5 @@ +package org.eclipse.lyo.store.update; + +public interface UpdateMessage { + +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java index 0dc19f2..69dd1b4 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java @@ -9,12 +9,15 @@ * @version $version-stub$ * @since 0.0.0 */ -public class Change { +public class Change { + /** + * Not IExtendedResource due to the use of AbstractResource throughout Lyo generated code. + */ private final AbstractResource resource; private final HistoryResource historyResource; - private final M message; + private final T message; - public Change(AbstractResource resource, HistoryResource historyResource, M message) { + public Change(AbstractResource resource, HistoryResource historyResource, T message) { this.resource = resource; this.historyResource = historyResource; this.message = message; @@ -28,7 +31,7 @@ public HistoryResource getHistoryResource() { return historyResource; } - public M getMessage() { + public T getMessage() { return message; } } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java index 5dc65c3..2ed3216 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java @@ -15,19 +15,19 @@ */ public class ChangeHelper { - public static List> changesCreated(Collection> allChanges) { + public static List changesCreated(Collection allChanges) { return allChanges.stream() .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) .collect(Collectors.toList()); } - public static List> changesModified(Collection> allChanges) { - return allChanges.stream() - .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + public static List changesModified(Collection allChanges) { + return allChanges.stream().filter( + change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) .collect(Collectors.toList()); } - public static List historyFrom(Collection> changes) { + public static List historyFrom(Collection changes) { return ChangeHelper.mapFn(changes, Change::getHistoryResource); } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java index e135c9d..869b9fa 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java @@ -10,6 +10,6 @@ * @version $version-stub$ * @since 0.0.0 */ -public interface ChangeProvider { - Collection> getChangesSince(ZonedDateTime lastUpdate, M message); +public interface ChangeProvider { + Collection> getChangesSince(ZonedDateTime lastUpdate, T message); } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java new file mode 100644 index 0000000..4e7d194 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java @@ -0,0 +1,105 @@ +package org.eclipse.lyo.store.update.handlers; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.StoreAccessException; +import org.eclipse.lyo.store.update.Handler; +import org.eclipse.lyo.store.update.ServiceProviderMessage; +import org.eclipse.lyo.store.update.change.Change; +import org.eclipse.lyo.store.update.change.ChangeHelper; +import org.eclipse.lyo.store.update.change.ChangeKind; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This is a simple handler that puts resources into named graphs per + * {@link ServiceProvider} if the message implements + * {@link ServiceProviderMessage}. + * + * @author Andrew Berezovskyi + * @version $version-stub$ + * @param + * @since 2.4.0 + * + */ +public class SimpleStoreHandler implements Handler { + + private final URI defaultGraph; + + private final Logger log = LoggerFactory.getLogger(SimpleStoreHandler.class); + + private final Store store; + + public SimpleStoreHandler(Store store) { + this.store = store; + try { + this.defaultGraph = new URI("urn:x-arq:DefaultGraph"); + } catch (URISyntaxException e) { + // this should never happen - we don't want the exception trail + // so we cheat with wrapping this in an unmanaged exception + // that will halt the execution. + IllegalStateException exception = new IllegalStateException(e); + log.error("Failed to generate default graph URI"); + throw exception; + } + } + + @Override + public Collection> handle(Store store, Collection> changes) { + if (changes == null || changes.isEmpty()) { + log.warn("Empty change list cannot be handled"); + return changes; + } + + Optional> firstChange = changes.stream().findFirst(); + if (firstChange.get().getMessage() instanceof ServiceProviderMessage) { + Map>> map = changes.stream() + .collect(Collectors.groupingBy(c -> c.getMessage().getClass())); + for (Entry>> changeSet : map.entrySet()) { + URI spURI = ((ServiceProviderMessage) changeSet.getKey()).getServiceProviderUri(); + persistChanges(spURI, changeSet.getValue()); + } + } else { + persistChanges(defaultGraph, changes); + } + + return changes; + } + + private void persistChanges(URI spURI, Collection> value) { + try { + persistUpdates(spURI, value); + } catch (StoreAccessException e) { + log.error("Failed to persist updates", e); + } + + persistDeletions(spURI, value); + } + + private void persistDeletions(URI spURI, Collection> value) { + Collection deletedResources = value.stream() + .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.DELETION) + .map(c -> c.getResource().getAbout()).collect(Collectors.toList()); + store.deleteResources(spURI, deletedResources.toArray(new URI[0])); + } + + private void persistUpdates(URI spURI, Collection> value) throws StoreAccessException { + Collection updatedResources = value.stream() + .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.CREATION + || c.getHistoryResource().getChangeKindEnum() == ChangeKind.MODIFICATION) + .map(c -> c.getResource()).collect(Collectors.toList()); + store.appendResources(spURI, updatedResources); + } + +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java new file mode 100644 index 0000000..f5785bd --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java @@ -0,0 +1,61 @@ +package org.eclipse.lyo.store.update.handlers; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.update.Handler; +import org.eclipse.lyo.store.update.change.Change; +import org.eclipse.lyo.store.update.change.ChangeKind; +import org.eclipse.lyo.store.update.change.HistoryResource; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +public class TrsChangelogHandler implements Handler { + + private ChangeHistories changeLog; + + public TrsChangelogHandler(ChangeHistories changeLog) { + this.changeLog = changeLog; + } + + @Override + public Collection> handle(Store store, Collection> changes) { + updateChangelogHistory(changes); + return changes; + } + + protected List updateChangelogHistory(Collection> changes) { + List changesHistory = changesHistory(changes); + changeLog.updateHistories(changesHistory); + return changesHistory; + } + + private List changesHistory(Collection> changes) { + return changes.stream().map(this::historyElementFromChange).collect(Collectors.toList()); + } + + private HistoryData historyElementFromChange(Change change) { + HistoryResource h = change.getHistoryResource(); + HistoryData historyData = HistoryData.getInstance(h.getTimestamp(), h.getResourceURI(), + historyDataType(h.getChangeKindEnum())); + return historyData; + } + + private String historyDataType(ChangeKind changeKind) { + if (changeKind.equals(ChangeKind.CREATION)) { + return HistoryData.CREATED; + } else if (changeKind.equals(ChangeKind.MODIFICATION)) { + return HistoryData.MODIFIED; + } else if (changeKind.equals(ChangeKind.DELETION)) { + return HistoryData.DELETED; + } else { + throw new IllegalArgumentException("Illegal ChangeKind value"); + } + } + +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java new file mode 100644 index 0000000..40cf88b --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java @@ -0,0 +1,91 @@ +package org.eclipse.lyo.store.update.handlers; + +import java.lang.reflect.InvocationTargetException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; + +import org.eclipse.lyo.core.trs.ChangeEvent; +import org.eclipse.lyo.core.trs.Creation; +import org.eclipse.lyo.core.trs.Deletion; +import org.eclipse.lyo.core.trs.Modification; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.store.update.change.Change; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.hp.hpl.jena.rdf.model.Model; + +public class TrsMqttChangeLogHandler extends TrsChangelogHandler { + private final Logger log = LoggerFactory.getLogger(TrsMqttChangeLogHandler.class); + + private final MqttClient mqttClient; + private final String topic; + private int order; + + public TrsMqttChangeLogHandler(final ChangeHistories changeLog, final MqttClient mqttClient, final String topic) { + super(changeLog); + this.mqttClient = mqttClient; + this.topic = topic; + this.order = changeLog.getHistorySize(); + } + + @Override + protected List updateChangelogHistory(Collection> changes) { + List updateChangelogHistory = super.updateChangelogHistory(changes); + for (HistoryData historyData : updateChangelogHistory) { + AbstractResource res = trsChangeResourceFrom(historyData); + MqttMessage message = buildMqttMessage(res); + try { + mqttClient.publish(topic, message); + } catch (MqttException e) { + log.error("Can't publish the message to the MQTT channel", e); + } + } + return updateChangelogHistory; + } + + private MqttMessage buildMqttMessage(AbstractResource res) { + try { + Model changeEventJenaModel = JenaModelHelper.createJenaModel(new Object[] { res }); + MqttMessage message = new MqttMessage(); + message.setPayload(changeEventJenaModel.toString().getBytes()); + return message; + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException + | DatatypeConfigurationException | OslcCoreApplicationException e) { + throw new IllegalArgumentException(e); + } + } + + private AbstractResource trsChangeResourceFrom(HistoryData historyData) { + this.order += 1; + String histDataType = historyData.getType(); + URI uri = historyData.getUri(); + URI changedUri; + try { + changedUri = new URI("urn:x-trs:" + historyData.getTimestamp() + ":this.order"); + ChangeEvent ce; + if (histDataType == HistoryData.CREATED) { + ce = new Creation(changedUri, uri, this.order); + } else if (histDataType == HistoryData.MODIFIED) { + ce = new Modification(changedUri, uri, this.order); + } else { + ce = new Deletion(changedUri, uri, this.order); + } + return ce; + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } + } + +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java new file mode 100644 index 0000000..1947750 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author andrew + * + */ +package org.eclipse.lyo.store.update.handlers; \ No newline at end of file From 32a4b3323c584aa9803bf08e818fa400f03e8246 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Tue, 28 Nov 2017 00:51:04 +0100 Subject: [PATCH 07/15] Last issues with Jena 2 in Store Update --- src/store-update/pom.xml | 2 +- .../update/handlers/TrsMqttChangeLogHandler.java | 11 +++++++++-- .../eclipse/lyo/store/update/TestHistoryResource.java | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/store-update/pom.xml b/src/store-update/pom.xml index 12900a2..da76408 100644 --- a/src/store-update/pom.xml +++ b/src/store-update/pom.xml @@ -24,7 +24,7 @@ org.eclipse.lyo.store store-core - 2.2.0 + ${oslc4j-core.version} junit diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java index 40cf88b..589bccf 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java @@ -3,8 +3,11 @@ import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URISyntaxException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collection; import java.util.List; +import java.util.TimeZone; import javax.xml.datatype.DatatypeConfigurationException; @@ -24,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; public class TrsMqttChangeLogHandler extends TrsChangelogHandler { private final Logger log = LoggerFactory.getLogger(TrsMqttChangeLogHandler.class); @@ -73,7 +76,11 @@ private AbstractResource trsChangeResourceFrom(HistoryData historyData) { URI uri = historyData.getUri(); URI changedUri; try { - changedUri = new URI("urn:x-trs:" + historyData.getTimestamp() + ":this.order"); + TimeZone tz = TimeZone.getTimeZone("UTC"); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); // Quoted "Z" to indicate UTC, no timezone offset + df.setTimeZone(tz); + String nowAsISO = df.format(historyData.getTimestamp()); + changedUri = new URI("urn:x-trs:" + nowAsISO + ":" + this.order); ChangeEvent ce; if (histDataType == HistoryData.CREATED) { ce = new Creation(changedUri, uri, this.order); diff --git a/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java index fd4c32e..55adc55 100644 --- a/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java +++ b/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java @@ -1,6 +1,6 @@ package org.eclipse.lyo.store.update; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import java.net.URI; import java.time.Instant; import java.util.Collections; From a3646809bb1d27fc646ac136689b961d3424c92e Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 2 Sep 2017 22:08:48 +0200 Subject: [PATCH 08/15] Add Store Update This patch is moved from Gerrit Change 95016. Signed-off-by: Andrew Berezovskyi --- .../lyo/tools/store/update/Handler.java | 16 +++ .../lyo/tools/store/update/OSLCMessage.java | 31 ++++++ .../store/update/ServiceProviderMessage.java | 14 +++ .../store/update/StoreUpdateManager.java | 99 +++++++++++++++++++ .../store/update/StoreUpdateRunnable.java | 94 ++++++++++++++++++ .../lyo/tools/store/update/change/Change.java | 34 +++++++ .../store/update/change/ChangeHelper.java | 37 +++++++ .../tools/store/update/change/ChangeKind.java | 45 +++++++++ .../store/update/change/ChangeProvider.java | 15 +++ .../store/update/change/HistoryResource.java | 87 ++++++++++++++++ .../store/update/change/package-info.java | 9 ++ .../lyo/tools/store/update/package-info.java | 10 ++ .../store/update/TestHistoryResource.java | 86 ++++++++++++++++ 13 files changed, 577 insertions(+) create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java create mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java create mode 100644 src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java new file mode 100644 index 0000000..85dabc4 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java @@ -0,0 +1,16 @@ +package org.eclipse.lyo.tools.store.update; + +import java.util.Collection; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.Change; + +/** + * Handler is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface Handler { + void handle(Store store, Collection> changes); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java new file mode 100644 index 0000000..8d9a592 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java @@ -0,0 +1,31 @@ +package org.eclipse.lyo.tools.store.update; + +import java.net.URI; + +/** + * OSLCMessage is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class OSLCMessage implements ServiceProviderMessage { + private final URI serviceProviderId; + + public OSLCMessage(URI serviceProviderId) { + this.serviceProviderId = serviceProviderId; + } + + @Override + public URI getServiceProviderId() { + return serviceProviderId; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("OSLCMessage{"); + sb.append("serviceProviderId='").append(serviceProviderId).append('\''); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java new file mode 100644 index 0000000..3de8f8d --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java @@ -0,0 +1,14 @@ +package org.eclipse.lyo.tools.store.update; + +import java.net.URI; + +/** + * Created on 06.03.17 + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.1 + */ +public interface ServiceProviderMessage { + URI getServiceProviderId(); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java new file mode 100644 index 0000000..5351d63 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java @@ -0,0 +1,99 @@ +package org.eclipse.lyo.tools.store.update; + +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a + * predefined delay or on-demand. Operates on a generic message (which must extend + * {@link OSLCMessage}) that is passed to handlers. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class StoreUpdateManager { + private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); + private static final int NODELAY = 0; + private static final int SINGLE_THREAD_POOL = 1; + private final ScheduledExecutorService executor; + private final ChangeProvider changeProvider; + private final Store store; + private final List> handlers = new ArrayList<>(); + + /** + * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a + * predefined delay or on-demand. + * + * @param store Instance of an initialised Store + * @param changeProvider Provider of the changes in the underlying tool. + */ + public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { + executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); + this.store = store; + this.changeProvider = changeProvider; + } + + /** + * Polling update on a given {@link ChangeProvider} followed by a notification to all + * previously registered + * {@link Handler} objects. + * + * @param lastUpdate Time of last store update, changes before this moment might be dropped. + * @param delaySeconds Seconds between polling checks. + */ + public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, + lastUpdate, null, handlers); + executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, + TimeUnit.SECONDS); + + StoreUpdateManager.LOGGER.trace( + "ProRManager.contextInitializeServletListener() body ran successfully"); + } + + /** + * Submit a single update request. Typically done from the HTTP handler. + * + * @param lastUpdate + * @param message Specific details for the {@link ChangeProvider} + * @return {@link Future} that allows to block until the runnable is finished executing + * (strongly discouraged). + */ + public Future submit(final ZonedDateTime lastUpdate, final M message) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, + lastUpdate, message, handlers); + return executor.submit(updateRunnable); + } + + /** + * Add a {@link Handler} that will process the collection of + * {@link org.eclipse.lyo.tools.store.update.change.Change} generated by the + * {@link ChangeProvider}. Handler is not guaranteed to be called if added after the update + * has been scheduled. + * + * @param handler Handler that should be called whenever {@link ChangeProvider} returns any + * changes. + */ + public void addHandler(final Handler handler) { + handlers.add(handler); + } + + /** + * Method can be overridden in case a more sophisticated Runnable has to be constructed. + */ + protected StoreUpdateRunnable buildRunnable(final Store store, + final ChangeProvider changeProvider, final ZonedDateTime lastUpdate, final M message, + final List> handlers) { + return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java new file mode 100644 index 0000000..df16f7b --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java @@ -0,0 +1,94 @@ +package org.eclipse.lyo.tools.store.update; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.update.change.Change; +import org.eclipse.lyo.tools.store.update.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Requests latest {@link Change} collection from {@link ChangeProvider} and triggers each + * handler afterwards. Stores the timestamp of the newest change to request new updates starting + * from that point in time. + *

+ *

Handlers will be notified with different message per service provider as accessible via + * {@link OSLCMessage#getServiceProviderId()}.

+ * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +class StoreUpdateRunnable implements Runnable { + + private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, + 1, ZoneId.of("UTC")); + private final Logger log = LoggerFactory.getLogger(StoreUpdateRunnable.class); + private final ChangeProvider changeProvider; + private final M message; + private final Store store; + private final List> handlers; + private ZonedDateTime lastUpdate; + + /** + * @param store Initialised Store + * @param changeProvider Change provider + * @param lastUpdate Initial timestamp. If null, will be set to {@link + * StoreUpdateRunnable#LAST_UPDATE_DEFAULT} + * @param message Initial message to the {@link ChangeProvider} + * @param handlers List of handlers to be notified. + */ + StoreUpdateRunnable(final Store store, final ChangeProvider changeProvider, + final ZonedDateTime lastUpdate, final M message, final List> handlers) { + this.store = store; + this.changeProvider = changeProvider; + this.message = message; + this.handlers = handlers; + if (lastUpdate != null) { + this.lastUpdate = lastUpdate; + } else { + this.lastUpdate = StoreUpdateRunnable.LAST_UPDATE_DEFAULT; + } + } + + @Override + public void run() { + try { + log.trace("Running background update"); + Collection> changes = null; + try { + changes = changeProvider.getChangesSince(lastUpdate, message); + } catch (final Exception e) { + log.error("ChangeProvider threw an exception", e); + } + if (changes != null && !changes.isEmpty()) { + for (final Handler handler : handlers) { + log.trace("Notifying {}", handler); + try { + handler.handle(store, changes); + } catch (final Exception e) { + log.warn("Handler {} threw an exception", handler, e); + } + } + for (final Change change : changes) { + if (change != null) { + final Date date = change.getHistoryResource().getTimestamp(); + final ZonedDateTime dateTime = date.toInstant() + .atZone(ZoneId.systemDefault()); + if (lastUpdate.isBefore(dateTime)) { + lastUpdate = dateTime; + } + } + } + log.trace("Setting previous revision to {}", lastUpdate); + } + } catch (final Exception e) { + // ExecutorService will terminate the whole schedule if a Runnable throws an exception + log.error("A handler threw an exception!", e); + } + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java new file mode 100644 index 0000000..cb9e3d9 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java @@ -0,0 +1,34 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +/** + * Change is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class Change { + private final AbstractResource resource; + private final HistoryResource historyResource; + private final M message; + + public Change(AbstractResource resource, HistoryResource historyResource, M message) { + this.resource = resource; + this.historyResource = historyResource; + this.message = message; + } + + public AbstractResource getResource() { + return resource; + } + + public HistoryResource getHistoryResource() { + return historyResource; + } + + public M getMessage() { + return message; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java new file mode 100644 index 0000000..0bda8b5 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java @@ -0,0 +1,37 @@ +package org.eclipse.lyo.tools.store.update.change; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * ChangeHelper is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class ChangeHelper { + + public static List> changesCreated(Collection> allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) + .collect(Collectors.toList()); + } + + public static List> changesModified(Collection> allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + .collect(Collectors.toList()); + } + + public static List historyFrom(Collection> changes) { + return ChangeHelper.mapFn(changes, Change::getHistoryResource); + } + + public static List mapFn(Collection changes, Function mapper) { + return changes.stream().map(mapper).collect(Collectors.toList()); + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java new file mode 100644 index 0000000..5e1391c --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java @@ -0,0 +1,45 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; + +/** + * ChangeKind is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(ChangeKind.NAME) +@OslcResourceShape(title = "Change Kind Resource Shape", describes = HistoryResource.NS_TRS + ChangeKind.NAME) +public enum ChangeKind { + // Strings taken from the TRS provider implementation + CREATION("Created"), + MODIFICATION("Modified"), + DELETION("Deleted"); + + public static final String NAME = "ChangeKind"; + private final String created; + + ChangeKind(String created) { + this.created = created; + } + + public static ChangeKind fromString(String text) { + if (text != null) { + for (ChangeKind kind : ChangeKind.values()) { + if (text.equalsIgnoreCase(kind.created)) { + return kind; + } + } + } + throw new IllegalArgumentException("No constant with text " + text + " found"); + } + + @Override + public String toString() { + return created; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java new file mode 100644 index 0000000..0d9ae69 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java @@ -0,0 +1,15 @@ +package org.eclipse.lyo.tools.store.update.change; + +import java.time.ZonedDateTime; +import java.util.Collection; + +/** + * ChangeProvider is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface ChangeProvider { + Collection> getChangesSince(ZonedDateTime lastUpdate, M message); +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java new file mode 100644 index 0000000..e55e12a --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java @@ -0,0 +1,87 @@ +package org.eclipse.lyo.tools.store.update.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +import java.net.URI; +import java.time.ZonedDateTime; +import java.util.Date; + +/** + * HistoryResource is a wrapper OSLC Resource around org.eclipse.lyo.oslc4j.trs.provider.HistoryData. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(HistoryResource.NAME) +@OslcResourceShape(title = "TRS History Resource Shape", describes = HistoryResource.TYPE) +public class HistoryResource extends AbstractResource { + public static final String NS_TRS = "http://open-services.net/ns/core/trs#"; + public static final String NAME = "TrsHistoryResource"; + public static final String TYPE = NS_TRS + NAME; + private ChangeKind changeKind; + private Date timestamp; + private URI resourceURI; + + /** + * Shall be used only by the OSLC Jena Model Helper + */ + @Deprecated + public HistoryResource() { + } + + public HistoryResource(ChangeKind changeKind, Date timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = timestamp; + this.resourceURI = resourceURI; + } + + public HistoryResource(ChangeKind changeKind, ZonedDateTime timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = Date.from(timestamp.toInstant()); + this.resourceURI = resourceURI; + } + + @OslcName("change_kind") + @OslcPropertyDefinition(NS_TRS + "change_kind") + public String getChangeKind() { + return changeKind.toString(); + } + + public void setChangeKind(ChangeKind changeKind) { + this.changeKind = changeKind; + } + + public ChangeKind getChangeKindEnum() { + return changeKind; + } + + public void setChangeKind(String changeKind) { + this.changeKind = ChangeKind.fromString(changeKind); + } + + @OslcName("timestamp") + @OslcPropertyDefinition(NS_TRS + "timestamp") + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + @OslcName("uri") + @OslcPropertyDefinition(NS_TRS + "uri") + public URI getResourceURI() { + return resourceURI; + } + + public void setResourceURI(URI resourceURI) { + this.resourceURI = resourceURI; + } +} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java new file mode 100644 index 0000000..36a7641 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java @@ -0,0 +1,9 @@ +/** + * Classes for defining changes for handlers. + * {@link org.eclipse.lyo.tools.store.update.change.HistoryResource} can be persisted in a + * triplestore. + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.tools.store.update.change; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java new file mode 100644 index 0000000..2e5a945 --- /dev/null +++ b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java @@ -0,0 +1,10 @@ +/** + * Common primitives for updating store. + * {@link org.eclipse.lyo.tools.store.update.StoreUpdateRunnable} is scheduled by + * {@link org.eclipse.lyo.tools.store.update.StoreUpdateManager}. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.tools.store.update; diff --git a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java new file mode 100644 index 0000000..4c2c433 --- /dev/null +++ b/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java @@ -0,0 +1,86 @@ +package org.eclipse.lyo.tools.store.update; + +import com.hp.hpl.jena.rdf.model.Model; +import java.net.URI; +import java.time.Instant; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.tools.store.Store; +import org.eclipse.lyo.tools.store.StoreFactory; +import org.eclipse.lyo.tools.store.update.change.ChangeKind; +import org.eclipse.lyo.tools.store.update.change.HistoryResource; +import org.junit.Test; + +/** + * TestTrsHistoryResource is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class TestHistoryResource { + public static final URI RESOURCE_URI = URI.create("test:test"); + private final Store store = StoreFactory.inMemory(); + + @Test + public void testResourceIsMarshalled() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(0); + } + + @Test + public void testResourceContainsStatements() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(1); + } + + @Test + public void testResourceIsPersisted() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + assertThat(store.keySet()).hasSize(0); + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + assertThat(store.keySet()).hasSize(1); + } + + @Test + public void testResourceIsRestored() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + assertThat(resources).hasSize(1); + } + + @Test + public void testResourceIsRestoredWithProperties() throws Exception { + String testResourceURI = "lyo:testtest"; + Date timestamp = Date.from(Instant.now()); + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, timestamp, + URI.create(testResourceURI)); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + HistoryResource storeResource = resources.get(0); + + assertThat(storeResource.getChangeKind()).isEqualToIgnoringCase(String.valueOf(ChangeKind.CREATION)); + assertThat(storeResource.getTimestamp()).isEqualTo(timestamp); + assertThat(storeResource.getResourceURI().toASCIIString()).isEqualTo(testResourceURI); + } +} From 930e30aeb06d8184b7c0bdebf2b3dbbe71aa718a Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sat, 2 Sep 2017 22:44:00 +0200 Subject: [PATCH 09/15] Refactor the code to fit with the new store-core Signed-off-by: Andrew Berezovskyi --- .../{tools => }/store/update/OSLCMessage.java | 2 +- .../lyo/store/update/change/ChangeHelper.java | 10 +- .../lyo/tools/store/update/Handler.java | 16 --- .../store/update/ServiceProviderMessage.java | 14 --- .../store/update/StoreUpdateManager.java | 99 ------------------- .../store/update/StoreUpdateRunnable.java | 94 ------------------ .../lyo/tools/store/update/change/Change.java | 34 ------- .../store/update/change/ChangeHelper.java | 37 ------- .../tools/store/update/change/ChangeKind.java | 45 --------- .../store/update/change/ChangeProvider.java | 15 --- .../store/update/change/HistoryResource.java | 87 ---------------- .../store/update/change/package-info.java | 9 -- .../lyo/tools/store/update/package-info.java | 10 -- .../store/update/TestHistoryResource.java | 86 ---------------- 14 files changed, 6 insertions(+), 552 deletions(-) rename src/store-update/src/main/java/org/eclipse/lyo/{tools => }/store/update/OSLCMessage.java (94%) delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java delete mode 100644 src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java similarity index 94% rename from src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java rename to src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java index 8d9a592..c10466d 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/OSLCMessage.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java @@ -1,4 +1,4 @@ -package org.eclipse.lyo.tools.store.update; +package org.eclipse.lyo.store.update; import java.net.URI; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java index 2ed3216..5dc65c3 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java @@ -15,19 +15,19 @@ */ public class ChangeHelper { - public static List changesCreated(Collection allChanges) { + public static List> changesCreated(Collection> allChanges) { return allChanges.stream() .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) .collect(Collectors.toList()); } - public static List changesModified(Collection allChanges) { - return allChanges.stream().filter( - change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + public static List> changesModified(Collection> allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) .collect(Collectors.toList()); } - public static List historyFrom(Collection changes) { + public static List historyFrom(Collection> changes) { return ChangeHelper.mapFn(changes, Change::getHistoryResource); } diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java deleted file mode 100644 index 85dabc4..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/Handler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.eclipse.lyo.tools.store.update; - -import java.util.Collection; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.Change; - -/** - * Handler is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public interface Handler { - void handle(Store store, Collection> changes); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java deleted file mode 100644 index 3de8f8d..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/ServiceProviderMessage.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.eclipse.lyo.tools.store.update; - -import java.net.URI; - -/** - * Created on 06.03.17 - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.1 - */ -public interface ServiceProviderMessage { - URI getServiceProviderId(); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java deleted file mode 100644 index 5351d63..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateManager.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.eclipse.lyo.tools.store.update; - -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.ChangeProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a - * predefined delay or on-demand. Operates on a generic message (which must extend - * {@link OSLCMessage}) that is passed to handlers. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class StoreUpdateManager { - private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); - private static final int NODELAY = 0; - private static final int SINGLE_THREAD_POOL = 1; - private final ScheduledExecutorService executor; - private final ChangeProvider changeProvider; - private final Store store; - private final List> handlers = new ArrayList<>(); - - /** - * Schedules {@link StoreUpdateRunnable} via internal {@link ScheduledExecutorService} with a - * predefined delay or on-demand. - * - * @param store Instance of an initialised Store - * @param changeProvider Provider of the changes in the underlying tool. - */ - public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { - executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); - this.store = store; - this.changeProvider = changeProvider; - } - - /** - * Polling update on a given {@link ChangeProvider} followed by a notification to all - * previously registered - * {@link Handler} objects. - * - * @param lastUpdate Time of last store update, changes before this moment might be dropped. - * @param delaySeconds Seconds between polling checks. - */ - public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, - lastUpdate, null, handlers); - executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, - TimeUnit.SECONDS); - - StoreUpdateManager.LOGGER.trace( - "ProRManager.contextInitializeServletListener() body ran successfully"); - } - - /** - * Submit a single update request. Typically done from the HTTP handler. - * - * @param lastUpdate - * @param message Specific details for the {@link ChangeProvider} - * @return {@link Future} that allows to block until the runnable is finished executing - * (strongly discouraged). - */ - public Future submit(final ZonedDateTime lastUpdate, final M message) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, - lastUpdate, message, handlers); - return executor.submit(updateRunnable); - } - - /** - * Add a {@link Handler} that will process the collection of - * {@link org.eclipse.lyo.tools.store.update.change.Change} generated by the - * {@link ChangeProvider}. Handler is not guaranteed to be called if added after the update - * has been scheduled. - * - * @param handler Handler that should be called whenever {@link ChangeProvider} returns any - * changes. - */ - public void addHandler(final Handler handler) { - handlers.add(handler); - } - - /** - * Method can be overridden in case a more sophisticated Runnable has to be constructed. - */ - protected StoreUpdateRunnable buildRunnable(final Store store, - final ChangeProvider changeProvider, final ZonedDateTime lastUpdate, final M message, - final List> handlers) { - return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java deleted file mode 100644 index df16f7b..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/StoreUpdateRunnable.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.eclipse.lyo.tools.store.update; - -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.update.change.Change; -import org.eclipse.lyo.tools.store.update.change.ChangeProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Requests latest {@link Change} collection from {@link ChangeProvider} and triggers each - * handler afterwards. Stores the timestamp of the newest change to request new updates starting - * from that point in time. - *

- *

Handlers will be notified with different message per service provider as accessible via - * {@link OSLCMessage#getServiceProviderId()}.

- * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -class StoreUpdateRunnable implements Runnable { - - private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, - 1, ZoneId.of("UTC")); - private final Logger log = LoggerFactory.getLogger(StoreUpdateRunnable.class); - private final ChangeProvider changeProvider; - private final M message; - private final Store store; - private final List> handlers; - private ZonedDateTime lastUpdate; - - /** - * @param store Initialised Store - * @param changeProvider Change provider - * @param lastUpdate Initial timestamp. If null, will be set to {@link - * StoreUpdateRunnable#LAST_UPDATE_DEFAULT} - * @param message Initial message to the {@link ChangeProvider} - * @param handlers List of handlers to be notified. - */ - StoreUpdateRunnable(final Store store, final ChangeProvider changeProvider, - final ZonedDateTime lastUpdate, final M message, final List> handlers) { - this.store = store; - this.changeProvider = changeProvider; - this.message = message; - this.handlers = handlers; - if (lastUpdate != null) { - this.lastUpdate = lastUpdate; - } else { - this.lastUpdate = StoreUpdateRunnable.LAST_UPDATE_DEFAULT; - } - } - - @Override - public void run() { - try { - log.trace("Running background update"); - Collection> changes = null; - try { - changes = changeProvider.getChangesSince(lastUpdate, message); - } catch (final Exception e) { - log.error("ChangeProvider threw an exception", e); - } - if (changes != null && !changes.isEmpty()) { - for (final Handler handler : handlers) { - log.trace("Notifying {}", handler); - try { - handler.handle(store, changes); - } catch (final Exception e) { - log.warn("Handler {} threw an exception", handler, e); - } - } - for (final Change change : changes) { - if (change != null) { - final Date date = change.getHistoryResource().getTimestamp(); - final ZonedDateTime dateTime = date.toInstant() - .atZone(ZoneId.systemDefault()); - if (lastUpdate.isBefore(dateTime)) { - lastUpdate = dateTime; - } - } - } - log.trace("Setting previous revision to {}", lastUpdate); - } - } catch (final Exception e) { - // ExecutorService will terminate the whole schedule if a Runnable throws an exception - log.error("A handler threw an exception!", e); - } - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java deleted file mode 100644 index cb9e3d9..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/Change.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.eclipse.lyo.tools.store.update.change; - -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; - -/** - * Change is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class Change { - private final AbstractResource resource; - private final HistoryResource historyResource; - private final M message; - - public Change(AbstractResource resource, HistoryResource historyResource, M message) { - this.resource = resource; - this.historyResource = historyResource; - this.message = message; - } - - public AbstractResource getResource() { - return resource; - } - - public HistoryResource getHistoryResource() { - return historyResource; - } - - public M getMessage() { - return message; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java deleted file mode 100644 index 0bda8b5..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeHelper.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.eclipse.lyo.tools.store.update.change; - -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * ChangeHelper is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class ChangeHelper { - - public static List> changesCreated(Collection> allChanges) { - return allChanges.stream() - .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) - .collect(Collectors.toList()); - } - - public static List> changesModified(Collection> allChanges) { - return allChanges.stream() - .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) - .collect(Collectors.toList()); - } - - public static List historyFrom(Collection> changes) { - return ChangeHelper.mapFn(changes, Change::getHistoryResource); - } - - public static List mapFn(Collection changes, Function mapper) { - return changes.stream().map(mapper).collect(Collectors.toList()); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java deleted file mode 100644 index 5e1391c..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeKind.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.eclipse.lyo.tools.store.update.change; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcName; -import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; -import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; - -/** - * ChangeKind is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -@OslcNamespace(HistoryResource.NS_TRS) -@OslcName(ChangeKind.NAME) -@OslcResourceShape(title = "Change Kind Resource Shape", describes = HistoryResource.NS_TRS + ChangeKind.NAME) -public enum ChangeKind { - // Strings taken from the TRS provider implementation - CREATION("Created"), - MODIFICATION("Modified"), - DELETION("Deleted"); - - public static final String NAME = "ChangeKind"; - private final String created; - - ChangeKind(String created) { - this.created = created; - } - - public static ChangeKind fromString(String text) { - if (text != null) { - for (ChangeKind kind : ChangeKind.values()) { - if (text.equalsIgnoreCase(kind.created)) { - return kind; - } - } - } - throw new IllegalArgumentException("No constant with text " + text + " found"); - } - - @Override - public String toString() { - return created; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java deleted file mode 100644 index 0d9ae69..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/ChangeProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.eclipse.lyo.tools.store.update.change; - -import java.time.ZonedDateTime; -import java.util.Collection; - -/** - * ChangeProvider is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public interface ChangeProvider { - Collection> getChangesSince(ZonedDateTime lastUpdate, M message); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java deleted file mode 100644 index e55e12a..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/HistoryResource.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.eclipse.lyo.tools.store.update.change; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcName; -import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; -import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; -import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; - -import java.net.URI; -import java.time.ZonedDateTime; -import java.util.Date; - -/** - * HistoryResource is a wrapper OSLC Resource around org.eclipse.lyo.oslc4j.trs.provider.HistoryData. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -@OslcNamespace(HistoryResource.NS_TRS) -@OslcName(HistoryResource.NAME) -@OslcResourceShape(title = "TRS History Resource Shape", describes = HistoryResource.TYPE) -public class HistoryResource extends AbstractResource { - public static final String NS_TRS = "http://open-services.net/ns/core/trs#"; - public static final String NAME = "TrsHistoryResource"; - public static final String TYPE = NS_TRS + NAME; - private ChangeKind changeKind; - private Date timestamp; - private URI resourceURI; - - /** - * Shall be used only by the OSLC Jena Model Helper - */ - @Deprecated - public HistoryResource() { - } - - public HistoryResource(ChangeKind changeKind, Date timestamp, URI resourceURI) { - this.changeKind = changeKind; - this.timestamp = timestamp; - this.resourceURI = resourceURI; - } - - public HistoryResource(ChangeKind changeKind, ZonedDateTime timestamp, URI resourceURI) { - this.changeKind = changeKind; - this.timestamp = Date.from(timestamp.toInstant()); - this.resourceURI = resourceURI; - } - - @OslcName("change_kind") - @OslcPropertyDefinition(NS_TRS + "change_kind") - public String getChangeKind() { - return changeKind.toString(); - } - - public void setChangeKind(ChangeKind changeKind) { - this.changeKind = changeKind; - } - - public ChangeKind getChangeKindEnum() { - return changeKind; - } - - public void setChangeKind(String changeKind) { - this.changeKind = ChangeKind.fromString(changeKind); - } - - @OslcName("timestamp") - @OslcPropertyDefinition(NS_TRS + "timestamp") - public Date getTimestamp() { - return timestamp; - } - - public void setTimestamp(Date timestamp) { - this.timestamp = timestamp; - } - - @OslcName("uri") - @OslcPropertyDefinition(NS_TRS + "uri") - public URI getResourceURI() { - return resourceURI; - } - - public void setResourceURI(URI resourceURI) { - this.resourceURI = resourceURI; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java deleted file mode 100644 index 36a7641..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/change/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Classes for defining changes for handlers. - * {@link org.eclipse.lyo.tools.store.update.change.HistoryResource} can be persisted in a - * triplestore. - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -package org.eclipse.lyo.tools.store.update.change; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java deleted file mode 100644 index 2e5a945..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/tools/store/update/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Common primitives for updating store. - * {@link org.eclipse.lyo.tools.store.update.StoreUpdateRunnable} is scheduled by - * {@link org.eclipse.lyo.tools.store.update.StoreUpdateManager}. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -package org.eclipse.lyo.tools.store.update; diff --git a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java deleted file mode 100644 index 4c2c433..0000000 --- a/src/store-update/src/test/java/org/eclipse/lyo/tools/store/update/TestHistoryResource.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.eclipse.lyo.tools.store.update; - -import com.hp.hpl.jena.rdf.model.Model; -import java.net.URI; -import java.time.Instant; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.tools.store.Store; -import org.eclipse.lyo.tools.store.StoreFactory; -import org.eclipse.lyo.tools.store.update.change.ChangeKind; -import org.eclipse.lyo.tools.store.update.change.HistoryResource; -import org.junit.Test; - -/** - * TestTrsHistoryResource is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class TestHistoryResource { - public static final URI RESOURCE_URI = URI.create("test:test"); - private final Store store = StoreFactory.inMemory(); - - @Test - public void testResourceIsMarshalled() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - - Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); - assertThat(model.size()).isGreaterThan(0); - } - - @Test - public void testResourceContainsStatements() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); - assertThat(model.size()).isGreaterThan(1); - } - - @Test - public void testResourceIsPersisted() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - assertThat(store.keySet()).hasSize(0); - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - assertThat(store.keySet()).hasSize(1); - } - - @Test - public void testResourceIsRestored() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); - assertThat(resources).hasSize(1); - } - - @Test - public void testResourceIsRestoredWithProperties() throws Exception { - String testResourceURI = "lyo:testtest"; - Date timestamp = Date.from(Instant.now()); - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, timestamp, - URI.create(testResourceURI)); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - - List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); - HistoryResource storeResource = resources.get(0); - - assertThat(storeResource.getChangeKind()).isEqualToIgnoringCase(String.valueOf(ChangeKind.CREATION)); - assertThat(storeResource.getTimestamp()).isEqualTo(timestamp); - assertThat(storeResource.getResourceURI().toASCIIString()).isEqualTo(testResourceURI); - } -} From bbb537083018318dbd15134d12689b394b59b633 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Mon, 27 Nov 2017 21:56:28 +0100 Subject: [PATCH 10/15] Add TRS and Store handlers Signed-off-by: Andrew Berezovskyi --- .../eclipse/lyo/store/update/OSLCMessage.java | 31 ------------------- .../lyo/store/update/change/ChangeHelper.java | 10 +++--- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java deleted file mode 100644 index c10466d..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/OSLCMessage.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.net.URI; - -/** - * OSLCMessage is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class OSLCMessage implements ServiceProviderMessage { - private final URI serviceProviderId; - - public OSLCMessage(URI serviceProviderId) { - this.serviceProviderId = serviceProviderId; - } - - @Override - public URI getServiceProviderId() { - return serviceProviderId; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("OSLCMessage{"); - sb.append("serviceProviderId='").append(serviceProviderId).append('\''); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java index 5dc65c3..2ed3216 100644 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java +++ b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java @@ -15,19 +15,19 @@ */ public class ChangeHelper { - public static List> changesCreated(Collection> allChanges) { + public static List changesCreated(Collection allChanges) { return allChanges.stream() .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) .collect(Collectors.toList()); } - public static List> changesModified(Collection> allChanges) { - return allChanges.stream() - .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + public static List changesModified(Collection allChanges) { + return allChanges.stream().filter( + change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) .collect(Collectors.toList()); } - public static List historyFrom(Collection> changes) { + public static List historyFrom(Collection changes) { return ChangeHelper.mapFn(changes, Change::getHistoryResource); } From e1a70a9ff081b966e8883b0660dc2a1dc6009e00 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 11 Mar 2018 20:43:09 +0100 Subject: [PATCH 11/15] Refactor store-update into store-sync * Add both EPL and EDL licenses * Rename artefacts in POMs * Rebase on top of the Jena 3.6.0 move Signed-off-by: Andrew Berezovskyi --- LICENSE.EDL | 28 +++++ src/pom.xml | 14 ++- src/store-core/.gitignore | 10 +- src/store-core/pom.xml | 6 +- src/{store-update => store-sync}/.gitignore | 0 src/{store-update => store-sync}/LICENSE.txt | 0 src/{store-update => store-sync}/README.md | 0 .../doc/architecture.png | Bin src/{store-update => store-sync}/pom.xml | 28 +++-- .../src/license/eplv1/description.txt.ftl | 0 .../src/license/eplv1/header.txt.ftl | 0 .../src/license/eplv1/license.txt | 0 .../src/license/licenses.properties | 0 .../org/eclipse/lyo/store/sync/Handler.java | 16 +++ .../store/sync/ServiceProviderMessage.java | 14 +++ .../lyo/store/sync/StoreUpdateManager.java | 102 +++++++++++++++++ .../lyo/store/sync/StoreUpdateRunnable.java | 94 ++++++++++++++++ .../eclipse/lyo/store/sync/UpdateMessage.java | 5 + .../eclipse/lyo/store/sync/change/Change.java | 37 +++++++ .../lyo/store/sync/change/ChangeHelper.java | 37 +++++++ .../lyo/store/sync/change/ChangeKind.java | 45 ++++++++ .../lyo/store/sync/change/ChangeProvider.java | 15 +++ .../store/sync/change/HistoryResource.java | 87 +++++++++++++++ .../lyo/store/sync/change/package-info.java | 9 ++ .../sync/handlers/SimpleStoreHandler.java | 103 ++++++++++++++++++ .../lyo/store/sync/handlers/TrsHandler.java | 58 ++++++++++ .../handlers/TrsMqttChangeLogHandler.java | 100 +++++++++++++++++ .../lyo/store/sync/handlers/package-info.java | 8 ++ .../eclipse/lyo/store/sync/package-info.java | 10 ++ .../lyo/store/sync/TestHistoryResource.java | 86 +++++++++++++++ .../src/test/resources/log4j.properties | 0 31 files changed, 894 insertions(+), 18 deletions(-) create mode 100644 LICENSE.EDL rename src/{store-update => store-sync}/.gitignore (100%) rename src/{store-update => store-sync}/LICENSE.txt (100%) rename src/{store-update => store-sync}/README.md (100%) rename src/{store-update => store-sync}/doc/architecture.png (100%) rename src/{store-update => store-sync}/pom.xml (91%) rename src/{store-update => store-sync}/src/license/eplv1/description.txt.ftl (100%) rename src/{store-update => store-sync}/src/license/eplv1/header.txt.ftl (100%) rename src/{store-update => store-sync}/src/license/eplv1/license.txt (100%) rename src/{store-update => store-sync}/src/license/licenses.properties (100%) create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/package-info.java create mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/package-info.java create mode 100644 src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java rename src/{store-update => store-sync}/src/test/resources/log4j.properties (100%) diff --git a/LICENSE.EDL b/LICENSE.EDL new file mode 100644 index 0000000..8a8992b --- /dev/null +++ b/LICENSE.EDL @@ -0,0 +1,28 @@ +Eclipse Distribution License - v 1.0 + +Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +* Neither the name of the Eclipse Foundation, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/pom.xml b/src/pom.xml index 94ce337..93d7359 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -8,7 +8,7 @@ store-parent 2.4.0-SNAPSHOT pom - Lyo Store Parent + Lyo Store :: Parent UTF-8 @@ -19,7 +19,7 @@ store-core - store-update + store-sync @@ -55,6 +55,12 @@ xml-apis 1.3.04 + + javax.servlet + javax.servlet-api + 3.1.0 + provided + @@ -103,5 +109,9 @@ Eclipse Public License 1.0 https://www.eclipse.org/legal/epl-v10.html + + Eclipse Distribution License 1.0 + https://www.eclipse.org/org/documents/edl-v10.html + diff --git a/src/store-core/.gitignore b/src/store-core/.gitignore index afa7537..464fab7 100644 --- a/src/store-core/.gitignore +++ b/src/store-core/.gitignore @@ -13,9 +13,9 @@ hs_err_pid* # Eclipse -.project -.classpath -.metadata +/.project +/.classpath +/.metadata *.tmp *.bak *.swp @@ -63,8 +63,8 @@ local.properties # MAVEN ######################### -**/overlays/ -**/target/ +/overlays/ +/target/ pom.xml.tag pom.xml.next release.properties diff --git a/src/store-core/pom.xml b/src/store-core/pom.xml index 7baeef7..8d8045d 100644 --- a/src/store-core/pom.xml +++ b/src/store-core/pom.xml @@ -12,7 +12,7 @@ store-core - 2.4.0-SNAPSHOT + Lyo Store :: Core UTF-8 @@ -243,5 +243,9 @@ Eclipse Public License 1.0 https://www.eclipse.org/legal/epl-v10.html + + Eclipse Distribution License 1.0 + https://www.eclipse.org/org/documents/edl-v10.html + diff --git a/src/store-update/.gitignore b/src/store-sync/.gitignore similarity index 100% rename from src/store-update/.gitignore rename to src/store-sync/.gitignore diff --git a/src/store-update/LICENSE.txt b/src/store-sync/LICENSE.txt similarity index 100% rename from src/store-update/LICENSE.txt rename to src/store-sync/LICENSE.txt diff --git a/src/store-update/README.md b/src/store-sync/README.md similarity index 100% rename from src/store-update/README.md rename to src/store-sync/README.md diff --git a/src/store-update/doc/architecture.png b/src/store-sync/doc/architecture.png similarity index 100% rename from src/store-update/doc/architecture.png rename to src/store-sync/doc/architecture.png diff --git a/src/store-update/pom.xml b/src/store-sync/pom.xml similarity index 91% rename from src/store-update/pom.xml rename to src/store-sync/pom.xml index da76408..a8fd0e8 100644 --- a/src/store-update/pom.xml +++ b/src/store-sync/pom.xml @@ -7,24 +7,30 @@ org.eclipse.lyo.store store-parent - 2.3.0-SNAPSHOT + 2.4.0-SNAPSHOT ../pom.xml - store-update + store-sync + Lyo Store :: Sync UTF-8 UTF-8 1.8 1.8 - 2.3.0-SNAPSHOT + 2.4.0-SNAPSHOT + + javax.servlet + javax.servlet-api + provided + org.eclipse.lyo.store store-core - ${oslc4j-core.version} + ${version.lyo} junit @@ -39,7 +45,7 @@ org.eclipse.lyo.trs trs-provider - 2.4.0-SNAPSHOT + ${version.lyo} org.eclipse.paho @@ -86,7 +92,7 @@ 2016 - ${basedir}/src/license//eplv1/description.txt.ftl + ${basedir}/src/license/eplv1/description.txt.ftl true @@ -197,20 +203,22 @@ Eclipse Public License 1.0 https://www.eclipse.org/legal/epl-v10.html + + Eclipse Distribution License 1.0 + https://www.eclipse.org/org/documents/edl-v10.html + lyo-releases lyo-releases repository - https://repo.eclipse.org/content/repositories/lyo-releases/ - + https://repo.eclipse.org/content/repositories/lyo-releases/ lyo-snapshots lyo-snapshots repository - https://repo.eclipse.org/content/repositories/lyo-snapshots/ - + https://repo.eclipse.org/content/repositories/lyo-snapshots/ diff --git a/src/store-update/src/license/eplv1/description.txt.ftl b/src/store-sync/src/license/eplv1/description.txt.ftl similarity index 100% rename from src/store-update/src/license/eplv1/description.txt.ftl rename to src/store-sync/src/license/eplv1/description.txt.ftl diff --git a/src/store-update/src/license/eplv1/header.txt.ftl b/src/store-sync/src/license/eplv1/header.txt.ftl similarity index 100% rename from src/store-update/src/license/eplv1/header.txt.ftl rename to src/store-sync/src/license/eplv1/header.txt.ftl diff --git a/src/store-update/src/license/eplv1/license.txt b/src/store-sync/src/license/eplv1/license.txt similarity index 100% rename from src/store-update/src/license/eplv1/license.txt rename to src/store-sync/src/license/eplv1/license.txt diff --git a/src/store-update/src/license/licenses.properties b/src/store-sync/src/license/licenses.properties similarity index 100% rename from src/store-update/src/license/licenses.properties rename to src/store-sync/src/license/licenses.properties diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java new file mode 100644 index 0000000..7dda34f --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java @@ -0,0 +1,16 @@ +package org.eclipse.lyo.store.sync; + +import java.util.Collection; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.sync.change.Change; + +/** + * Handler is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface Handler { + Collection> handle(Store store, Collection> changes); +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java new file mode 100644 index 0000000..80aaa4b --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java @@ -0,0 +1,14 @@ +package org.eclipse.lyo.store.sync; + +import java.net.URI; + +/** + * Created on 06.03.17 + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.1 + */ +public interface ServiceProviderMessage { + URI getServiceProviderUri(); +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java new file mode 100644 index 0000000..a8579e6 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java @@ -0,0 +1,102 @@ +package org.eclipse.lyo.store.sync; + +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.sync.change.Change; +import org.eclipse.lyo.store.sync.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Schedules {@link StoreUpdateRunnable} via internal + * {@link ScheduledExecutorService} with a predefined delay or on-demand. + * Operates on a generic message that is passed to handlers. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class StoreUpdateManager { + private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); + private static final int NODELAY = 0; + private static final int SINGLE_THREAD_POOL = 1; + private final ScheduledExecutorService executor; + private final ChangeProvider changeProvider; + private final Store store; + private final List> handlers = new ArrayList<>(); + + /** + * Schedules {@link StoreUpdateRunnable} via internal + * {@link ScheduledExecutorService} with a predefined delay or on-demand. + * + * @param store + * Instance of an initialised Store + * @param changeProvider + * Provider of the changes in the underlying tool. + */ + public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { + executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); + this.store = store; + this.changeProvider = changeProvider; + } + + /** + * Polling update on a given {@link ChangeProvider} followed by a notification + * to all previously registered {@link Handler} objects. + * + * @param lastUpdate + * Time of last store update, changes before this moment might be + * dropped. + * @param delaySeconds + * Seconds between polling checks. + */ + public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, null, handlers); + executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, TimeUnit.SECONDS); + + StoreUpdateManager.LOGGER.trace("Poll request has been enqueued"); + } + + /** + * Submit a single update request. Typically done from the HTTP handler. + * + * @param lastUpdate + * @param message + * Specific details for the {@link ChangeProvider} + * @return {@link Future} that allows to block until the runnable is finished + * executing (strongly discouraged). + */ + public Future submit(final ZonedDateTime lastUpdate, final M message) { + final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, message, + handlers); + return executor.submit(updateRunnable); + } + + /** + * Add a {@link Handler} that will process the collection of {@link Change} + * generated by the {@link ChangeProvider}. Handler is not guaranteed to be + * called if added after the update has been scheduled. + * + * @param handler + * Handler that should be called whenever {@link ChangeProvider} + * returns any changes. + */ + public void addHandler(final Handler handler) { + handlers.add(handler); + } + + /** + * Method can be overridden in case a more sophisticated Runnable has to be + * constructed. + */ + protected StoreUpdateRunnable buildRunnable(final Store store, final ChangeProvider changeProvider, + final ZonedDateTime lastUpdate, final M message, final List> handlers) { + return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java new file mode 100644 index 0000000..88aa112 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java @@ -0,0 +1,94 @@ +package org.eclipse.lyo.store.sync; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.sync.change.Change; +import org.eclipse.lyo.store.sync.change.ChangeProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Requests latest {@link Change} collection from {@link ChangeProvider} and triggers each + * handler afterwards. Stores the timestamp of the newest change to request new updates starting + * from that point in time. + *

+ *

Handlers will be notified with different message per service provider as accessible via + * {@link OSLCMessage#getServiceProviderId()}.

+ * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +class StoreUpdateRunnable implements Runnable { + + private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, + 1, ZoneId.of("UTC")); + private final Logger log = LoggerFactory.getLogger(StoreUpdateRunnable.class); + private final ChangeProvider changeProvider; + private final M message; + private final Store store; + private final List> handlers; + private ZonedDateTime lastUpdate; + + /** + * @param store Initialised Store + * @param changeProvider Change provider + * @param lastUpdate Initial timestamp. If null, will be set to {@link + * StoreUpdateRunnable#LAST_UPDATE_DEFAULT} + * @param message Initial message to the {@link ChangeProvider} + * @param handlers List of handlers to be notified. + */ + StoreUpdateRunnable(final Store store, final ChangeProvider changeProvider, + final ZonedDateTime lastUpdate, final M message, final List> handlers) { + this.store = store; + this.changeProvider = changeProvider; + this.message = message; + this.handlers = handlers; + if (lastUpdate != null) { + this.lastUpdate = lastUpdate; + } else { + this.lastUpdate = StoreUpdateRunnable.LAST_UPDATE_DEFAULT; + } + } + + @Override + public void run() { + try { + log.trace("Running background update"); + Collection> changes = null; + try { + changes = changeProvider.getChangesSince(lastUpdate, message); + } catch (final Exception e) { + log.error("ChangeProvider threw an exception", e); + } + if (changes != null && !changes.isEmpty()) { + for (final Handler handler : handlers) { + log.trace("Notifying {}", handler); + try { + handler.handle(store, changes); + } catch (final Exception e) { + log.warn("Handler {} threw an exception", handler, e); + } + } + for (final Change change : changes) { + if (change != null) { + final Date date = change.getHistoryResource().getTimestamp(); + final ZonedDateTime dateTime = date.toInstant() + .atZone(ZoneId.systemDefault()); + if (lastUpdate.isBefore(dateTime)) { + lastUpdate = dateTime; + } + } + } + log.trace("Setting previous revision to {}", lastUpdate); + } + } catch (final Exception e) { + // ExecutorService will terminate the whole schedule if a Runnable throws an exception + log.error("A handler threw an exception!", e); + } + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java new file mode 100644 index 0000000..0bb4cef --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java @@ -0,0 +1,5 @@ +package org.eclipse.lyo.store.sync; + +public interface UpdateMessage { + +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java new file mode 100644 index 0000000..d891df9 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java @@ -0,0 +1,37 @@ +package org.eclipse.lyo.store.sync.change; + +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +/** + * Change is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class Change { + /** + * Not IExtendedResource due to the use of AbstractResource throughout Lyo generated code. + */ + private final AbstractResource resource; + private final HistoryResource historyResource; + private final T message; + + public Change(AbstractResource resource, HistoryResource historyResource, T message) { + this.resource = resource; + this.historyResource = historyResource; + this.message = message; + } + + public AbstractResource getResource() { + return resource; + } + + public HistoryResource getHistoryResource() { + return historyResource; + } + + public T getMessage() { + return message; + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java new file mode 100644 index 0000000..ff3753c --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java @@ -0,0 +1,37 @@ +package org.eclipse.lyo.store.sync.change; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * ChangeHelper is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class ChangeHelper { + + public static List changesCreated(Collection allChanges) { + return allChanges.stream() + .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) + .collect(Collectors.toList()); + } + + public static List changesModified(Collection allChanges) { + return allChanges.stream().filter( + change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) + .collect(Collectors.toList()); + } + + public static List historyFrom(Collection changes) { + return ChangeHelper.mapFn(changes, Change::getHistoryResource); + } + + public static List mapFn(Collection changes, Function mapper) { + return changes.stream().map(mapper).collect(Collectors.toList()); + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java new file mode 100644 index 0000000..d063b1b --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java @@ -0,0 +1,45 @@ +package org.eclipse.lyo.store.sync.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; + +/** + * ChangeKind is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(ChangeKind.NAME) +@OslcResourceShape(title = "Change Kind Resource Shape", describes = HistoryResource.NS_TRS + ChangeKind.NAME) +public enum ChangeKind { + // Strings taken from the TRS provider implementation + CREATION("Created"), + MODIFICATION("Modified"), + DELETION("Deleted"); + + public static final String NAME = "ChangeKind"; + private final String created; + + ChangeKind(String created) { + this.created = created; + } + + public static ChangeKind fromString(String text) { + if (text != null) { + for (ChangeKind kind : ChangeKind.values()) { + if (text.equalsIgnoreCase(kind.created)) { + return kind; + } + } + } + throw new IllegalArgumentException("No constant with text " + text + " found"); + } + + @Override + public String toString() { + return created; + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java new file mode 100644 index 0000000..9f38ced --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java @@ -0,0 +1,15 @@ +package org.eclipse.lyo.store.sync.change; + +import java.time.ZonedDateTime; +import java.util.Collection; + +/** + * ChangeProvider is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public interface ChangeProvider { + Collection> getChangesSince(ZonedDateTime lastUpdate, T message); +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java new file mode 100644 index 0000000..c95fc1b --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java @@ -0,0 +1,87 @@ +package org.eclipse.lyo.store.sync.change; + +import org.eclipse.lyo.oslc4j.core.annotation.OslcName; +import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; +import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; +import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; + +import java.net.URI; +import java.time.ZonedDateTime; +import java.util.Date; + +/** + * HistoryResource is a wrapper OSLC Resource around org.eclipse.lyo.oslc4j.trs.provider.HistoryData. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +@OslcNamespace(HistoryResource.NS_TRS) +@OslcName(HistoryResource.NAME) +@OslcResourceShape(title = "TRS History Resource Shape", describes = HistoryResource.TYPE) +public class HistoryResource extends AbstractResource { + public static final String NS_TRS = "http://open-services.net/ns/core/trs#"; + public static final String NAME = "TrsHistoryResource"; + public static final String TYPE = NS_TRS + NAME; + private ChangeKind changeKind; + private Date timestamp; + private URI resourceURI; + + /** + * Shall be used only by the OSLC Jena Model Helper + */ + @Deprecated + public HistoryResource() { + } + + public HistoryResource(ChangeKind changeKind, Date timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = timestamp; + this.resourceURI = resourceURI; + } + + public HistoryResource(ChangeKind changeKind, ZonedDateTime timestamp, URI resourceURI) { + this.changeKind = changeKind; + this.timestamp = Date.from(timestamp.toInstant()); + this.resourceURI = resourceURI; + } + + @OslcName("change_kind") + @OslcPropertyDefinition(NS_TRS + "change_kind") + public String getChangeKind() { + return changeKind.toString(); + } + + public void setChangeKind(ChangeKind changeKind) { + this.changeKind = changeKind; + } + + public ChangeKind getChangeKindEnum() { + return changeKind; + } + + public void setChangeKind(String changeKind) { + this.changeKind = ChangeKind.fromString(changeKind); + } + + @OslcName("timestamp") + @OslcPropertyDefinition(NS_TRS + "timestamp") + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + @OslcName("uri") + @OslcPropertyDefinition(NS_TRS + "uri") + public URI getResourceURI() { + return resourceURI; + } + + public void setResourceURI(URI resourceURI) { + this.resourceURI = resourceURI; + } +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java new file mode 100644 index 0000000..550f3de --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java @@ -0,0 +1,9 @@ +/** + * Classes for defining changes for handlers. + * {@link org.eclipse.lyo.store.sync.change.HistoryResource} can be persisted in a + * triplestore. + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.store.sync.change; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java new file mode 100644 index 0000000..7bf12b1 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java @@ -0,0 +1,103 @@ +package org.eclipse.lyo.store.sync.handlers; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.StoreAccessException; +import org.eclipse.lyo.store.sync.Handler; +import org.eclipse.lyo.store.sync.ServiceProviderMessage; +import org.eclipse.lyo.store.sync.change.Change; +import org.eclipse.lyo.store.sync.change.ChangeKind; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This is a simple handler that puts resources into named graphs per + * {@link ServiceProvider} if the message implements + * {@link ServiceProviderMessage}. + * + * @author Andrew Berezovskyi + * @version $version-stub$ + * @param + * @since 2.4.0 + * + */ +public class SimpleStoreHandler implements Handler { + + private final URI defaultGraph; + + private final Logger log = LoggerFactory.getLogger(SimpleStoreHandler.class); + + private final Store store; + + public SimpleStoreHandler(Store store) { + this.store = store; + try { + this.defaultGraph = new URI("urn:x-arq:DefaultGraph"); + } catch (URISyntaxException e) { + // this should never happen - we don't want the exception trail + // so we cheat with wrapping this in an unmanaged exception + // that will halt the execution. + IllegalStateException exception = new IllegalStateException(e); + log.error("Failed to generate default graph URI"); + throw exception; + } + } + + @Override + public Collection> handle(Store store, Collection> changes) { + if (changes == null || changes.isEmpty()) { + log.warn("Empty change list cannot be handled"); + return changes; + } + + Optional> firstChange = changes.stream().findFirst(); + if (firstChange.get().getMessage() instanceof ServiceProviderMessage) { + Map>> map = changes.stream() + .collect(Collectors.groupingBy(c -> c.getMessage().getClass())); + for (Entry>> changeSet : map.entrySet()) { + URI spURI = ((ServiceProviderMessage) changeSet.getKey()).getServiceProviderUri(); + persistChanges(spURI, changeSet.getValue()); + } + } else { + persistChanges(defaultGraph, changes); + } + + return changes; + } + + private void persistChanges(URI spURI, Collection> value) { + try { + persistUpdates(spURI, value); + } catch (StoreAccessException e) { + log.error("Failed to persist updates", e); + } + + persistDeletions(spURI, value); + } + + private void persistDeletions(URI spURI, Collection> value) { + Collection deletedResources = value.stream() + .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.DELETION) + .map(c -> c.getResource().getAbout()).collect(Collectors.toList()); + store.deleteResources(spURI, deletedResources.toArray(new URI[0])); + } + + private void persistUpdates(URI spURI, Collection> value) throws StoreAccessException { + Collection updatedResources = value.stream() + .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.CREATION + || c.getHistoryResource().getChangeKindEnum() == ChangeKind.MODIFICATION) + .map(c -> c.getResource()).collect(Collectors.toList()); + store.appendResources(spURI, updatedResources); + } + +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java new file mode 100644 index 0000000..f71eea8 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java @@ -0,0 +1,58 @@ +package org.eclipse.lyo.store.sync.handlers; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.sync.Handler; +import org.eclipse.lyo.store.sync.change.Change; +import org.eclipse.lyo.store.sync.change.ChangeKind; +import org.eclipse.lyo.store.sync.change.HistoryResource; + +public class TrsHandler implements Handler { + + private ChangeHistories changeLog; + + public TrsHandler(ChangeHistories changeLog) { + this.changeLog = changeLog; + } + + @Override + public Collection> handle(Store store, Collection> changes) { + updateChangelogHistory(changes); + return changes; + } + + protected List updateChangelogHistory(Collection> changes) { + List changesHistory = changesHistory(changes); + changeLog.updateHistories(changesHistory); + return changesHistory; + } + + private List changesHistory(Collection> changes) { + return changes.stream().map(this::historyElementFromChange).collect(Collectors.toList()); + } + + private HistoryData historyElementFromChange(Change change) { + HistoryResource h = change.getHistoryResource(); + HistoryData historyData = HistoryData.getInstance(h.getTimestamp(), h.getResourceURI(), + historyDataType(h.getChangeKindEnum())); + return historyData; + } + + private String historyDataType(ChangeKind changeKind) { + if (changeKind.equals(ChangeKind.CREATION)) { + return HistoryData.CREATED; + } else if (changeKind.equals(ChangeKind.MODIFICATION)) { + return HistoryData.MODIFIED; + } else if (changeKind.equals(ChangeKind.DELETION)) { + return HistoryData.DELETED; + } else { + throw new IllegalArgumentException("Illegal ChangeKind value"); + } + } + +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java new file mode 100644 index 0000000..307910a --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java @@ -0,0 +1,100 @@ +package org.eclipse.lyo.store.sync.handlers; + +import java.lang.reflect.InvocationTargetException; +import java.net.URI; +import java.net.URISyntaxException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.List; +import java.util.TimeZone; + +import javax.xml.datatype.DatatypeConfigurationException; + +import org.eclipse.lyo.core.trs.ChangeEvent; +import org.eclipse.lyo.core.trs.Creation; +import org.eclipse.lyo.core.trs.Deletion; +import org.eclipse.lyo.core.trs.Modification; +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.store.sync.change.Change; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.jena.rdf.model.Model; + +public class TrsMqttChangeLogHandler extends TrsHandler { + private final Logger log = LoggerFactory.getLogger(TrsMqttChangeLogHandler.class); + + private final MqttClient mqttClient; + private final String topic; + private int order; + + public TrsMqttChangeLogHandler(final ChangeHistories changeLog, final MqttClient mqttClient, final String topic) { + super(changeLog); + this.mqttClient = mqttClient; + this.topic = topic; + // FIXME Andrew@2018-03-11: may and should blow up, but bringing back + this.order = changeLog.getHistory(null, null).length; + } + + @Override + protected List updateChangelogHistory(Collection> changes) { + List updateChangelogHistory = super.updateChangelogHistory(changes); + for (HistoryData historyData : updateChangelogHistory) { + AbstractResource res = trsChangeResourceFrom(historyData); + MqttMessage message = buildMqttMessage(res); + try { + mqttClient.publish(topic, message); + } catch (MqttException e) { + log.error("Can't publish the message to the MQTT channel", e); + } + } + return updateChangelogHistory; + } + + private MqttMessage buildMqttMessage(AbstractResource res) { + try { + Model changeEventJenaModel = JenaModelHelper.createJenaModel(new Object[] { res }); + MqttMessage message = new MqttMessage(); + message.setPayload(changeEventJenaModel.toString().getBytes()); + return message; + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException + | DatatypeConfigurationException | OslcCoreApplicationException e) { + throw new IllegalArgumentException(e); + } + } + + private AbstractResource trsChangeResourceFrom(HistoryData historyData) { + // FIXME Andrew@2018-03-11: not thread-safe + this.order += 1; + String histDataType = historyData.getType(); + URI uri = historyData.getUri(); + URI changedUri; + try { + TimeZone tz = TimeZone.getTimeZone("UTC"); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); // Quoted "Z" to indicate UTC, no timezone offset + df.setTimeZone(tz); + String nowAsISO = df.format(historyData.getTimestamp()); + changedUri = new URI("urn:x-trs:" + nowAsISO + ":" + this.order); + ChangeEvent ce; + if (histDataType == HistoryData.CREATED) { + ce = new Creation(changedUri, uri, this.order); + } else if (histDataType == HistoryData.MODIFIED) { + ce = new Modification(changedUri, uri, this.order); + } else { + ce = new Deletion(changedUri, uri, this.order); + } + return ce; + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } + } + +} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/package-info.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/package-info.java new file mode 100644 index 0000000..c27aae5 --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author andrew + * + */ +package org.eclipse.lyo.store.sync.handlers; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/package-info.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/package-info.java new file mode 100644 index 0000000..74482ab --- /dev/null +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/package-info.java @@ -0,0 +1,10 @@ +/** + * Common primitives for updating store. + * {@link org.eclipse.lyo.store.sync.StoreUpdateRunnable} is scheduled by + * {@link org.eclipse.lyo.store.sync.StoreUpdateManager}. + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.18.0 + */ +package org.eclipse.lyo.store.sync; diff --git a/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java b/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java new file mode 100644 index 0000000..882db4c --- /dev/null +++ b/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java @@ -0,0 +1,86 @@ +package org.eclipse.lyo.store.sync; + +import org.apache.jena.rdf.model.Model; +import java.net.URI; +import java.time.Instant; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; +import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; +import org.eclipse.lyo.store.Store; +import org.eclipse.lyo.store.StoreFactory; +import org.eclipse.lyo.store.sync.change.ChangeKind; +import org.eclipse.lyo.store.sync.change.HistoryResource; +import org.junit.Test; + +/** + * TestTrsHistoryResource is . + * + * @author Andrew Berezovskyi (andriib@kth.se) + * @version $version-stub$ + * @since 0.0.0 + */ +public class TestHistoryResource { + public static final URI RESOURCE_URI = URI.create("test:test"); + private final Store store = StoreFactory.inMemory(); + + @Test + public void testResourceIsMarshalled() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(0); + } + + @Test + public void testResourceContainsStatements() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); + assertThat(model.size()).isGreaterThan(1); + } + + @Test + public void testResourceIsPersisted() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + assertThat(store.keySet()).hasSize(0); + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + assertThat(store.keySet()).hasSize(1); + } + + @Test + public void testResourceIsRestored() throws Exception { + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, + Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + assertThat(resources).hasSize(1); + } + + @Test + public void testResourceIsRestoredWithProperties() throws Exception { + String testResourceURI = "lyo:testtest"; + Date timestamp = Date.from(Instant.now()); + HistoryResource resource = new HistoryResource(ChangeKind.CREATION, timestamp, + URI.create(testResourceURI)); + resource.setAbout(TestHistoryResource.RESOURCE_URI); + + store.putResources(resource.getAbout(), Collections.singletonList(resource)); + + List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); + HistoryResource storeResource = resources.get(0); + + assertThat(storeResource.getChangeKind()).isEqualToIgnoringCase(String.valueOf(ChangeKind.CREATION)); + assertThat(storeResource.getTimestamp()).isEqualTo(timestamp); + assertThat(storeResource.getResourceURI().toASCIIString()).isEqualTo(testResourceURI); + } +} diff --git a/src/store-update/src/test/resources/log4j.properties b/src/store-sync/src/test/resources/log4j.properties similarity index 100% rename from src/store-update/src/test/resources/log4j.properties rename to src/store-sync/src/test/resources/log4j.properties From 3c344e329f8a5585d0c5f16edf154729f040b115 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Sun, 18 Mar 2018 04:13:13 +0100 Subject: [PATCH 12/15] Remove update module Signed-off-by: Andrew Berezovskyi --- .../org/eclipse/lyo/store/update/Handler.java | 16 --- .../store/update/ServiceProviderMessage.java | 14 --- .../lyo/store/update/StoreUpdateManager.java | 102 ----------------- .../lyo/store/update/StoreUpdateRunnable.java | 94 ---------------- .../lyo/store/update/UpdateMessage.java | 5 - .../lyo/store/update/change/Change.java | 37 ------ .../lyo/store/update/change/ChangeHelper.java | 37 ------ .../lyo/store/update/change/ChangeKind.java | 45 -------- .../store/update/change/ChangeProvider.java | 15 --- .../store/update/change/HistoryResource.java | 87 --------------- .../lyo/store/update/change/package-info.java | 9 -- .../update/handlers/SimpleStoreHandler.java | 105 ------------------ .../update/handlers/TrsChangelogHandler.java | 61 ---------- .../handlers/TrsMqttChangeLogHandler.java | 98 ---------------- .../store/update/handlers/package-info.java | 8 -- .../lyo/store/update/package-info.java | 10 -- .../lyo/store/update/TestHistoryResource.java | 86 -------------- 17 files changed, 829 deletions(-) delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java delete mode 100644 src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java delete mode 100644 src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java deleted file mode 100644 index f22f08f..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/Handler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.util.Collection; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.update.change.Change; - -/** - * Handler is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public interface Handler { - Collection> handle(Store store, Collection> changes); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java deleted file mode 100644 index 607ffab..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/ServiceProviderMessage.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.net.URI; - -/** - * Created on 06.03.17 - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.1 - */ -public interface ServiceProviderMessage { - URI getServiceProviderUri(); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java deleted file mode 100644 index c375791..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateManager.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.update.change.Change; -import org.eclipse.lyo.store.update.change.ChangeProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Schedules {@link StoreUpdateRunnable} via internal - * {@link ScheduledExecutorService} with a predefined delay or on-demand. - * Operates on a generic message that is passed to handlers. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class StoreUpdateManager { - private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); - private static final int NODELAY = 0; - private static final int SINGLE_THREAD_POOL = 1; - private final ScheduledExecutorService executor; - private final ChangeProvider changeProvider; - private final Store store; - private final List> handlers = new ArrayList<>(); - - /** - * Schedules {@link StoreUpdateRunnable} via internal - * {@link ScheduledExecutorService} with a predefined delay or on-demand. - * - * @param store - * Instance of an initialised Store - * @param changeProvider - * Provider of the changes in the underlying tool. - */ - public StoreUpdateManager(final Store store, final ChangeProvider changeProvider) { - executor = Executors.newScheduledThreadPool(StoreUpdateManager.SINGLE_THREAD_POOL); - this.store = store; - this.changeProvider = changeProvider; - } - - /** - * Polling update on a given {@link ChangeProvider} followed by a notification - * to all previously registered {@link Handler} objects. - * - * @param lastUpdate - * Time of last store update, changes before this moment might be - * dropped. - * @param delaySeconds - * Seconds between polling checks. - */ - public void poll(final ZonedDateTime lastUpdate, final int delaySeconds) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, null, handlers); - executor.scheduleWithFixedDelay(updateRunnable, StoreUpdateManager.NODELAY, delaySeconds, TimeUnit.SECONDS); - - StoreUpdateManager.LOGGER.trace("Poll request has been enqueued"); - } - - /** - * Submit a single update request. Typically done from the HTTP handler. - * - * @param lastUpdate - * @param message - * Specific details for the {@link ChangeProvider} - * @return {@link Future} that allows to block until the runnable is finished - * executing (strongly discouraged). - */ - public Future submit(final ZonedDateTime lastUpdate, final M message) { - final StoreUpdateRunnable updateRunnable = buildRunnable(store, changeProvider, lastUpdate, message, - handlers); - return executor.submit(updateRunnable); - } - - /** - * Add a {@link Handler} that will process the collection of {@link Change} - * generated by the {@link ChangeProvider}. Handler is not guaranteed to be - * called if added after the update has been scheduled. - * - * @param handler - * Handler that should be called whenever {@link ChangeProvider} - * returns any changes. - */ - public void addHandler(final Handler handler) { - handlers.add(handler); - } - - /** - * Method can be overridden in case a more sophisticated Runnable has to be - * constructed. - */ - protected StoreUpdateRunnable buildRunnable(final Store store, final ChangeProvider changeProvider, - final ZonedDateTime lastUpdate, final M message, final List> handlers) { - return new StoreUpdateRunnable<>(store, changeProvider, lastUpdate, message, handlers); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java deleted file mode 100644 index dae9317..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/StoreUpdateRunnable.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.eclipse.lyo.store.update; - -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.update.change.Change; -import org.eclipse.lyo.store.update.change.ChangeProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Requests latest {@link Change} collection from {@link ChangeProvider} and triggers each - * handler afterwards. Stores the timestamp of the newest change to request new updates starting - * from that point in time. - *

- *

Handlers will be notified with different message per service provider as accessible via - * {@link OSLCMessage#getServiceProviderId()}.

- * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -class StoreUpdateRunnable implements Runnable { - - private static final ZonedDateTime LAST_UPDATE_DEFAULT = ZonedDateTime.of(1971, 1, 1, 1, 1, 1, - 1, ZoneId.of("UTC")); - private final Logger log = LoggerFactory.getLogger(StoreUpdateRunnable.class); - private final ChangeProvider changeProvider; - private final M message; - private final Store store; - private final List> handlers; - private ZonedDateTime lastUpdate; - - /** - * @param store Initialised Store - * @param changeProvider Change provider - * @param lastUpdate Initial timestamp. If null, will be set to {@link - * StoreUpdateRunnable#LAST_UPDATE_DEFAULT} - * @param message Initial message to the {@link ChangeProvider} - * @param handlers List of handlers to be notified. - */ - StoreUpdateRunnable(final Store store, final ChangeProvider changeProvider, - final ZonedDateTime lastUpdate, final M message, final List> handlers) { - this.store = store; - this.changeProvider = changeProvider; - this.message = message; - this.handlers = handlers; - if (lastUpdate != null) { - this.lastUpdate = lastUpdate; - } else { - this.lastUpdate = StoreUpdateRunnable.LAST_UPDATE_DEFAULT; - } - } - - @Override - public void run() { - try { - log.trace("Running background update"); - Collection> changes = null; - try { - changes = changeProvider.getChangesSince(lastUpdate, message); - } catch (final Exception e) { - log.error("ChangeProvider threw an exception", e); - } - if (changes != null && !changes.isEmpty()) { - for (final Handler handler : handlers) { - log.trace("Notifying {}", handler); - try { - handler.handle(store, changes); - } catch (final Exception e) { - log.warn("Handler {} threw an exception", handler, e); - } - } - for (final Change change : changes) { - if (change != null) { - final Date date = change.getHistoryResource().getTimestamp(); - final ZonedDateTime dateTime = date.toInstant() - .atZone(ZoneId.systemDefault()); - if (lastUpdate.isBefore(dateTime)) { - lastUpdate = dateTime; - } - } - } - log.trace("Setting previous revision to {}", lastUpdate); - } - } catch (final Exception e) { - // ExecutorService will terminate the whole schedule if a Runnable throws an exception - log.error("A handler threw an exception!", e); - } - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java deleted file mode 100644 index 9d32be7..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/UpdateMessage.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.eclipse.lyo.store.update; - -public interface UpdateMessage { - -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java deleted file mode 100644 index 69dd1b4..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/Change.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.eclipse.lyo.store.update.change; - -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; - -/** - * Change is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class Change { - /** - * Not IExtendedResource due to the use of AbstractResource throughout Lyo generated code. - */ - private final AbstractResource resource; - private final HistoryResource historyResource; - private final T message; - - public Change(AbstractResource resource, HistoryResource historyResource, T message) { - this.resource = resource; - this.historyResource = historyResource; - this.message = message; - } - - public AbstractResource getResource() { - return resource; - } - - public HistoryResource getHistoryResource() { - return historyResource; - } - - public T getMessage() { - return message; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java deleted file mode 100644 index 2ed3216..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeHelper.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.eclipse.lyo.store.update.change; - -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * ChangeHelper is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class ChangeHelper { - - public static List changesCreated(Collection allChanges) { - return allChanges.stream() - .filter(change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.CREATION)) - .collect(Collectors.toList()); - } - - public static List changesModified(Collection allChanges) { - return allChanges.stream().filter( - change -> Objects.equals(change.getHistoryResource().getChangeKindEnum(), ChangeKind.MODIFICATION)) - .collect(Collectors.toList()); - } - - public static List historyFrom(Collection changes) { - return ChangeHelper.mapFn(changes, Change::getHistoryResource); - } - - public static List mapFn(Collection changes, Function mapper) { - return changes.stream().map(mapper).collect(Collectors.toList()); - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java deleted file mode 100644 index 1c8ad1f..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeKind.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.eclipse.lyo.store.update.change; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcName; -import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; -import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; - -/** - * ChangeKind is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -@OslcNamespace(HistoryResource.NS_TRS) -@OslcName(ChangeKind.NAME) -@OslcResourceShape(title = "Change Kind Resource Shape", describes = HistoryResource.NS_TRS + ChangeKind.NAME) -public enum ChangeKind { - // Strings taken from the TRS provider implementation - CREATION("Created"), - MODIFICATION("Modified"), - DELETION("Deleted"); - - public static final String NAME = "ChangeKind"; - private final String created; - - ChangeKind(String created) { - this.created = created; - } - - public static ChangeKind fromString(String text) { - if (text != null) { - for (ChangeKind kind : ChangeKind.values()) { - if (text.equalsIgnoreCase(kind.created)) { - return kind; - } - } - } - throw new IllegalArgumentException("No constant with text " + text + " found"); - } - - @Override - public String toString() { - return created; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java deleted file mode 100644 index 869b9fa..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/ChangeProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.eclipse.lyo.store.update.change; - -import java.time.ZonedDateTime; -import java.util.Collection; - -/** - * ChangeProvider is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public interface ChangeProvider { - Collection> getChangesSince(ZonedDateTime lastUpdate, T message); -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java deleted file mode 100644 index 188e852..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/HistoryResource.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.eclipse.lyo.store.update.change; - -import org.eclipse.lyo.oslc4j.core.annotation.OslcName; -import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace; -import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition; -import org.eclipse.lyo.oslc4j.core.annotation.OslcResourceShape; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; - -import java.net.URI; -import java.time.ZonedDateTime; -import java.util.Date; - -/** - * HistoryResource is a wrapper OSLC Resource around org.eclipse.lyo.oslc4j.trs.provider.HistoryData. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -@OslcNamespace(HistoryResource.NS_TRS) -@OslcName(HistoryResource.NAME) -@OslcResourceShape(title = "TRS History Resource Shape", describes = HistoryResource.TYPE) -public class HistoryResource extends AbstractResource { - public static final String NS_TRS = "http://open-services.net/ns/core/trs#"; - public static final String NAME = "TrsHistoryResource"; - public static final String TYPE = NS_TRS + NAME; - private ChangeKind changeKind; - private Date timestamp; - private URI resourceURI; - - /** - * Shall be used only by the OSLC Jena Model Helper - */ - @Deprecated - public HistoryResource() { - } - - public HistoryResource(ChangeKind changeKind, Date timestamp, URI resourceURI) { - this.changeKind = changeKind; - this.timestamp = timestamp; - this.resourceURI = resourceURI; - } - - public HistoryResource(ChangeKind changeKind, ZonedDateTime timestamp, URI resourceURI) { - this.changeKind = changeKind; - this.timestamp = Date.from(timestamp.toInstant()); - this.resourceURI = resourceURI; - } - - @OslcName("change_kind") - @OslcPropertyDefinition(NS_TRS + "change_kind") - public String getChangeKind() { - return changeKind.toString(); - } - - public void setChangeKind(ChangeKind changeKind) { - this.changeKind = changeKind; - } - - public ChangeKind getChangeKindEnum() { - return changeKind; - } - - public void setChangeKind(String changeKind) { - this.changeKind = ChangeKind.fromString(changeKind); - } - - @OslcName("timestamp") - @OslcPropertyDefinition(NS_TRS + "timestamp") - public Date getTimestamp() { - return timestamp; - } - - public void setTimestamp(Date timestamp) { - this.timestamp = timestamp; - } - - @OslcName("uri") - @OslcPropertyDefinition(NS_TRS + "uri") - public URI getResourceURI() { - return resourceURI; - } - - public void setResourceURI(URI resourceURI) { - this.resourceURI = resourceURI; - } -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java deleted file mode 100644 index 8d8df3b..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/change/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Classes for defining changes for handlers. - * {@link org.eclipse.lyo.store.update.change.HistoryResource} can be persisted in a - * triplestore. - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -package org.eclipse.lyo.store.update.change; diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java deleted file mode 100644 index 4e7d194..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/SimpleStoreHandler.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.eclipse.lyo.store.update.handlers; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.stream.Collector; -import java.util.stream.Collectors; - -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.StoreAccessException; -import org.eclipse.lyo.store.update.Handler; -import org.eclipse.lyo.store.update.ServiceProviderMessage; -import org.eclipse.lyo.store.update.change.Change; -import org.eclipse.lyo.store.update.change.ChangeHelper; -import org.eclipse.lyo.store.update.change.ChangeKind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This is a simple handler that puts resources into named graphs per - * {@link ServiceProvider} if the message implements - * {@link ServiceProviderMessage}. - * - * @author Andrew Berezovskyi - * @version $version-stub$ - * @param - * @since 2.4.0 - * - */ -public class SimpleStoreHandler implements Handler { - - private final URI defaultGraph; - - private final Logger log = LoggerFactory.getLogger(SimpleStoreHandler.class); - - private final Store store; - - public SimpleStoreHandler(Store store) { - this.store = store; - try { - this.defaultGraph = new URI("urn:x-arq:DefaultGraph"); - } catch (URISyntaxException e) { - // this should never happen - we don't want the exception trail - // so we cheat with wrapping this in an unmanaged exception - // that will halt the execution. - IllegalStateException exception = new IllegalStateException(e); - log.error("Failed to generate default graph URI"); - throw exception; - } - } - - @Override - public Collection> handle(Store store, Collection> changes) { - if (changes == null || changes.isEmpty()) { - log.warn("Empty change list cannot be handled"); - return changes; - } - - Optional> firstChange = changes.stream().findFirst(); - if (firstChange.get().getMessage() instanceof ServiceProviderMessage) { - Map>> map = changes.stream() - .collect(Collectors.groupingBy(c -> c.getMessage().getClass())); - for (Entry>> changeSet : map.entrySet()) { - URI spURI = ((ServiceProviderMessage) changeSet.getKey()).getServiceProviderUri(); - persistChanges(spURI, changeSet.getValue()); - } - } else { - persistChanges(defaultGraph, changes); - } - - return changes; - } - - private void persistChanges(URI spURI, Collection> value) { - try { - persistUpdates(spURI, value); - } catch (StoreAccessException e) { - log.error("Failed to persist updates", e); - } - - persistDeletions(spURI, value); - } - - private void persistDeletions(URI spURI, Collection> value) { - Collection deletedResources = value.stream() - .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.DELETION) - .map(c -> c.getResource().getAbout()).collect(Collectors.toList()); - store.deleteResources(spURI, deletedResources.toArray(new URI[0])); - } - - private void persistUpdates(URI spURI, Collection> value) throws StoreAccessException { - Collection updatedResources = value.stream() - .filter(c -> c.getHistoryResource().getChangeKindEnum() == ChangeKind.CREATION - || c.getHistoryResource().getChangeKindEnum() == ChangeKind.MODIFICATION) - .map(c -> c.getResource()).collect(Collectors.toList()); - store.appendResources(spURI, updatedResources); - } - -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java deleted file mode 100644 index f5785bd..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsChangelogHandler.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.eclipse.lyo.store.update.handlers; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - -import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; -import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.update.Handler; -import org.eclipse.lyo.store.update.change.Change; -import org.eclipse.lyo.store.update.change.ChangeKind; -import org.eclipse.lyo.store.update.change.HistoryResource; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; - -public class TrsChangelogHandler implements Handler { - - private ChangeHistories changeLog; - - public TrsChangelogHandler(ChangeHistories changeLog) { - this.changeLog = changeLog; - } - - @Override - public Collection> handle(Store store, Collection> changes) { - updateChangelogHistory(changes); - return changes; - } - - protected List updateChangelogHistory(Collection> changes) { - List changesHistory = changesHistory(changes); - changeLog.updateHistories(changesHistory); - return changesHistory; - } - - private List changesHistory(Collection> changes) { - return changes.stream().map(this::historyElementFromChange).collect(Collectors.toList()); - } - - private HistoryData historyElementFromChange(Change change) { - HistoryResource h = change.getHistoryResource(); - HistoryData historyData = HistoryData.getInstance(h.getTimestamp(), h.getResourceURI(), - historyDataType(h.getChangeKindEnum())); - return historyData; - } - - private String historyDataType(ChangeKind changeKind) { - if (changeKind.equals(ChangeKind.CREATION)) { - return HistoryData.CREATED; - } else if (changeKind.equals(ChangeKind.MODIFICATION)) { - return HistoryData.MODIFIED; - } else if (changeKind.equals(ChangeKind.DELETION)) { - return HistoryData.DELETED; - } else { - throw new IllegalArgumentException("Illegal ChangeKind value"); - } - } - -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java deleted file mode 100644 index 589bccf..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/TrsMqttChangeLogHandler.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.eclipse.lyo.store.update.handlers; - -import java.lang.reflect.InvocationTargetException; -import java.net.URI; -import java.net.URISyntaxException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.List; -import java.util.TimeZone; - -import javax.xml.datatype.DatatypeConfigurationException; - -import org.eclipse.lyo.core.trs.ChangeEvent; -import org.eclipse.lyo.core.trs.Creation; -import org.eclipse.lyo.core.trs.Deletion; -import org.eclipse.lyo.core.trs.Modification; -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; -import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; -import org.eclipse.lyo.store.update.change.Change; -import org.eclipse.paho.client.mqttv3.MqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.MqttMessage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.jena.rdf.model.Model; - -public class TrsMqttChangeLogHandler extends TrsChangelogHandler { - private final Logger log = LoggerFactory.getLogger(TrsMqttChangeLogHandler.class); - - private final MqttClient mqttClient; - private final String topic; - private int order; - - public TrsMqttChangeLogHandler(final ChangeHistories changeLog, final MqttClient mqttClient, final String topic) { - super(changeLog); - this.mqttClient = mqttClient; - this.topic = topic; - this.order = changeLog.getHistorySize(); - } - - @Override - protected List updateChangelogHistory(Collection> changes) { - List updateChangelogHistory = super.updateChangelogHistory(changes); - for (HistoryData historyData : updateChangelogHistory) { - AbstractResource res = trsChangeResourceFrom(historyData); - MqttMessage message = buildMqttMessage(res); - try { - mqttClient.publish(topic, message); - } catch (MqttException e) { - log.error("Can't publish the message to the MQTT channel", e); - } - } - return updateChangelogHistory; - } - - private MqttMessage buildMqttMessage(AbstractResource res) { - try { - Model changeEventJenaModel = JenaModelHelper.createJenaModel(new Object[] { res }); - MqttMessage message = new MqttMessage(); - message.setPayload(changeEventJenaModel.toString().getBytes()); - return message; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException - | DatatypeConfigurationException | OslcCoreApplicationException e) { - throw new IllegalArgumentException(e); - } - } - - private AbstractResource trsChangeResourceFrom(HistoryData historyData) { - this.order += 1; - String histDataType = historyData.getType(); - URI uri = historyData.getUri(); - URI changedUri; - try { - TimeZone tz = TimeZone.getTimeZone("UTC"); - DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); // Quoted "Z" to indicate UTC, no timezone offset - df.setTimeZone(tz); - String nowAsISO = df.format(historyData.getTimestamp()); - changedUri = new URI("urn:x-trs:" + nowAsISO + ":" + this.order); - ChangeEvent ce; - if (histDataType == HistoryData.CREATED) { - ce = new Creation(changedUri, uri, this.order); - } else if (histDataType == HistoryData.MODIFIED) { - ce = new Modification(changedUri, uri, this.order); - } else { - ce = new Deletion(changedUri, uri, this.order); - } - return ce; - } catch (URISyntaxException e) { - throw new IllegalStateException(e); - } - } - -} diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java deleted file mode 100644 index 1947750..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/handlers/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * - */ -/** - * @author andrew - * - */ -package org.eclipse.lyo.store.update.handlers; \ No newline at end of file diff --git a/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java b/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java deleted file mode 100644 index dedee4f..0000000 --- a/src/store-update/src/main/java/org/eclipse/lyo/store/update/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Common primitives for updating store. - * {@link org.eclipse.lyo.store.update.StoreUpdateRunnable} is scheduled by - * {@link org.eclipse.lyo.store.update.StoreUpdateManager}. - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.18.0 - */ -package org.eclipse.lyo.store.update; diff --git a/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java b/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java deleted file mode 100644 index 55adc55..0000000 --- a/src/store-update/src/test/java/org/eclipse/lyo/store/update/TestHistoryResource.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.eclipse.lyo.store.update; - -import org.apache.jena.rdf.model.Model; -import java.net.URI; -import java.time.Instant; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; -import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.store.Store; -import org.eclipse.lyo.store.StoreFactory; -import org.eclipse.lyo.store.update.change.ChangeKind; -import org.eclipse.lyo.store.update.change.HistoryResource; -import org.junit.Test; - -/** - * TestTrsHistoryResource is . - * - * @author Andrew Berezovskyi (andriib@kth.se) - * @version $version-stub$ - * @since 0.0.0 - */ -public class TestHistoryResource { - public static final URI RESOURCE_URI = URI.create("test:test"); - private final Store store = StoreFactory.inMemory(); - - @Test - public void testResourceIsMarshalled() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - - Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); - assertThat(model.size()).isGreaterThan(0); - } - - @Test - public void testResourceContainsStatements() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - Model model = JenaModelHelper.createJenaModel(new Object[] { resource }); - assertThat(model.size()).isGreaterThan(1); - } - - @Test - public void testResourceIsPersisted() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - assertThat(store.keySet()).hasSize(0); - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - assertThat(store.keySet()).hasSize(1); - } - - @Test - public void testResourceIsRestored() throws Exception { - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, - Date.from(Instant.now()), TestHistoryResource.RESOURCE_URI); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); - assertThat(resources).hasSize(1); - } - - @Test - public void testResourceIsRestoredWithProperties() throws Exception { - String testResourceURI = "lyo:testtest"; - Date timestamp = Date.from(Instant.now()); - HistoryResource resource = new HistoryResource(ChangeKind.CREATION, timestamp, - URI.create(testResourceURI)); - resource.setAbout(TestHistoryResource.RESOURCE_URI); - - store.putResources(resource.getAbout(), Collections.singletonList(resource)); - - List resources = store.getResources(TestHistoryResource.RESOURCE_URI, HistoryResource.class); - HistoryResource storeResource = resources.get(0); - - assertThat(storeResource.getChangeKind()).isEqualToIgnoringCase(String.valueOf(ChangeKind.CREATION)); - assertThat(storeResource.getTimestamp()).isEqualTo(timestamp); - assertThat(storeResource.getResourceURI().toASCIIString()).isEqualTo(testResourceURI); - } -} From 4afe4c5e1d8410de26e561fcfb2e2a14c70fa12e Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Fri, 15 Feb 2019 21:58:46 +0100 Subject: [PATCH 13/15] Fix corrupted POM file Signed-off-by: Andrew Berezovskyi --- src/store-core/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/store-core/pom.xml b/src/store-core/pom.xml index 92d9b88..ea4e41c 100644 --- a/src/store-core/pom.xml +++ b/src/store-core/pom.xml @@ -46,11 +46,6 @@ - - - org.apache.jena - apache-jena-libs - pom org.eclipse.lyo.core.query oslc-query From 649115a8e29bfd939eafee9ed6aa52969d358cdf Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Fri, 15 Feb 2019 22:11:36 +0100 Subject: [PATCH 14/15] Update store-sync to Lyo 4.0 Signed-off-by: Andrew Berezovskyi --- src/store-sync/pom.xml | 6 +++--- .../org/eclipse/lyo/store/sync/handlers/TrsHandler.java | 4 ++-- .../lyo/store/sync/handlers/TrsMqttChangeLogHandler.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/store-sync/pom.xml b/src/store-sync/pom.xml index a8fd0e8..f94e4a5 100644 --- a/src/store-sync/pom.xml +++ b/src/store-sync/pom.xml @@ -7,7 +7,7 @@ org.eclipse.lyo.store store-parent - 2.4.0-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 1.8 - 2.4.0-SNAPSHOT + 4.0.0-SNAPSHOT @@ -44,7 +44,7 @@ org.eclipse.lyo.trs - trs-provider + trs-server ${version.lyo} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java index f71eea8..ce5128a 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.stream.Collectors; -import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; -import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.oslc4j.trs.server.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.server.HistoryData; import org.eclipse.lyo.store.Store; import org.eclipse.lyo.store.sync.Handler; import org.eclipse.lyo.store.sync.change.Change; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java index 307910a..e74d4d8 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java @@ -18,8 +18,8 @@ import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper; -import org.eclipse.lyo.oslc4j.trs.provider.ChangeHistories; -import org.eclipse.lyo.oslc4j.trs.provider.HistoryData; +import org.eclipse.lyo.oslc4j.trs.server.ChangeHistories; +import org.eclipse.lyo.oslc4j.trs.server.HistoryData; import org.eclipse.lyo.store.sync.change.Change; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttException; From 22b1020dd71356902eb72e71af6c195418bb5aa5 Mon Sep 17 00:00:00 2001 From: Andrew Berezovskyi Date: Mon, 9 Nov 2020 23:51:49 +0100 Subject: [PATCH 15/15] Split store-sync into base and trs and update --- README.md | 2 +- src/pom.xml | 1 + src/store-sync-trs/pom.xml | 30 +++++++++++++++++++ .../lyo/store/sync/handlers/TrsHandler.java | 29 ++++++++++++++---- .../handlers/TrsMqttChangeLogHandler.java | 13 ++++++++ src/store-sync/README.md | 4 +-- src/store-sync/pom.xml | 5 ---- .../org/eclipse/lyo/store/sync/Handler.java | 15 +++++++++- .../store/sync/ServiceProviderMessage.java | 13 ++++++++ .../lyo/store/sync/StoreUpdateManager.java | 15 +++++++++- .../lyo/store/sync/StoreUpdateRunnable.java | 13 ++++++++ .../eclipse/lyo/store/sync/UpdateMessage.java | 5 ---- .../eclipse/lyo/store/sync/change/Change.java | 16 ++++++++-- .../lyo/store/sync/change/ChangeHelper.java | 15 +++++++++- .../lyo/store/sync/change/ChangeKind.java | 15 +++++++++- .../lyo/store/sync/change/ChangeProvider.java | 15 +++++++++- .../store/sync/change/HistoryResource.java | 15 +++++++++- .../lyo/store/sync/change/package-info.java | 3 +- .../sync/handlers/SimpleStoreHandler.java | 13 ++++++++ .../lyo/store/sync/TestHistoryResource.java | 2 +- 20 files changed, 209 insertions(+), 30 deletions(-) create mode 100644 src/store-sync-trs/pom.xml rename src/{store-sync => store-sync-trs}/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java (63%) rename src/{store-sync => store-sync-trs}/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java (88%) delete mode 100644 src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java diff --git a/README.md b/README.md index f2c04d0..ada48cc 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Now, add the following dependency: org.eclipse.lyo.store store-core - 2.4.0 + %version% ``` Now you are all set to start using the library. diff --git a/src/pom.xml b/src/pom.xml index 5fb3467..4c11a87 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -23,6 +23,7 @@ store-core store-sync + diff --git a/src/store-sync-trs/pom.xml b/src/store-sync-trs/pom.xml new file mode 100644 index 0000000..72d1a57 --- /dev/null +++ b/src/store-sync-trs/pom.xml @@ -0,0 +1,30 @@ + + + + store-parent + org.eclipse.lyo.store + 4.0.0-SNAPSHOT + + 4.0.0 + + store-sync-trs + + + + + org.eclipse.lyo.store + store-sync + ${project.version} + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.1.0 + + + + + \ No newline at end of file diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java b/src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java similarity index 63% rename from src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java rename to src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java index ce5128a..9ed50bf 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java +++ b/src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsHandler.java @@ -1,11 +1,24 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.handlers; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import org.eclipse.lyo.oslc4j.trs.server.ChangeHistories; import org.eclipse.lyo.oslc4j.trs.server.HistoryData; +import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler; import org.eclipse.lyo.store.Store; import org.eclipse.lyo.store.sync.Handler; import org.eclipse.lyo.store.sync.change.Change; @@ -14,10 +27,10 @@ public class TrsHandler implements Handler { - private ChangeHistories changeLog; + private TrsEventHandler eventHandler; - public TrsHandler(ChangeHistories changeLog) { - this.changeLog = changeLog; + public TrsHandler(TrsEventHandler trsEventHandler) { + this.eventHandler = trsEventHandler; } @Override @@ -28,7 +41,13 @@ public Collection> handle(Store store, Collection> changes) protected List updateChangelogHistory(Collection> changes) { List changesHistory = changesHistory(changes); - changeLog.updateHistories(changesHistory); + for (HistoryData element: changesHistory + ) { + if(HistoryData.CREATED.equals(element.getType()) { + // FIXME: 2020-11-09 Either pass the resource or add "light" onCreatedMeta() resources + eventHandler.onCreated(); + } + } return changesHistory; } diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java b/src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java similarity index 88% rename from src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java rename to src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java index e74d4d8..fc5e31a 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java +++ b/src/store-sync-trs/src/main/java/org/eclipse/lyo/store/sync/handlers/TrsMqttChangeLogHandler.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.handlers; import java.lang.reflect.InvocationTargetException; diff --git a/src/store-sync/README.md b/src/store-sync/README.md index d29beec..2ab6f22 100644 --- a/src/store-sync/README.md +++ b/src/store-sync/README.md @@ -2,8 +2,6 @@ *Lyo Store* is a library that provides a simple interface for working with a triplestore via Java objects representing OSLC Resources. Lyo Store and Jena Models in the triple stores. -**[Lyo Store Javadoc](http://assume.gitlab.io/jena-cache/apidocs/)** - ## Prerequisites * For an in-memory option: JVM heap should be set to 1G or above (see [Jena documentation][1] for more information on this). @@ -15,7 +13,7 @@ org.eclipse.lyo.tools lyo-store - 0.24.0-SNAPSHOT + %version% More build systems are covered here: http://assume.gitlab.io/jena-cache/dependency-info.html diff --git a/src/store-sync/pom.xml b/src/store-sync/pom.xml index f94e4a5..162e1ea 100644 --- a/src/store-sync/pom.xml +++ b/src/store-sync/pom.xml @@ -47,11 +47,6 @@ trs-server ${version.lyo} - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.1.0 - diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java index 7dda34f..85ba20d 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/Handler.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync; import java.util.Collection; @@ -9,7 +22,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public interface Handler { Collection> handle(Store store, Collection> changes); diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java index 80aaa4b..fb95534 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/ServiceProviderMessage.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync; import java.net.URI; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java index a8579e6..358d219 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateManager.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync; import java.time.ZonedDateTime; @@ -20,7 +33,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public class StoreUpdateManager { private final static Logger LOGGER = LoggerFactory.getLogger(StoreUpdateManager.class); diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java index 88aa112..c91e279 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/StoreUpdateRunnable.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync; import java.time.ZoneId; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java deleted file mode 100644 index 0bb4cef..0000000 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/UpdateMessage.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.eclipse.lyo.store.sync; - -public interface UpdateMessage { - -} diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java index d891df9..d26d93c 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/Change.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.change; import org.eclipse.lyo.oslc4j.core.model.AbstractResource; @@ -5,9 +18,8 @@ /** * Change is . * - * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public class Change { /** diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java index ff3753c..8f0738c 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeHelper.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.change; import java.util.Collection; @@ -11,7 +24,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public class ChangeHelper { diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java index d063b1b..e3a251f 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeKind.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.change; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; @@ -9,7 +22,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ @OslcNamespace(HistoryResource.NS_TRS) @OslcName(ChangeKind.NAME) diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java index 9f38ced..70bb0b4 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/ChangeProvider.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.change; import java.time.ZonedDateTime; @@ -8,7 +21,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public interface ChangeProvider { Collection> getChangesSince(ZonedDateTime lastUpdate, T message); diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java index c95fc1b..d09b1f1 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/HistoryResource.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.change; import org.eclipse.lyo.oslc4j.core.annotation.OslcName; @@ -15,7 +28,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ @OslcNamespace(HistoryResource.NS_TRS) @OslcName(HistoryResource.NAME) diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java index 550f3de..6241141 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/change/package-info.java @@ -2,8 +2,7 @@ * Classes for defining changes for handlers. * {@link org.eclipse.lyo.store.sync.change.HistoryResource} can be persisted in a * triplestore. - * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.18.0 + * @since 4.0.0 */ package org.eclipse.lyo.store.sync.change; diff --git a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java index 7bf12b1..cde1051 100644 --- a/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java +++ b/src/store-sync/src/main/java/org/eclipse/lyo/store/sync/handlers/SimpleStoreHandler.java @@ -1,3 +1,16 @@ +/* + * Copyright (c) 2020 Contributors to the Eclipse Foundation + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Eclipse Distribution License is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-1.0 OR BSD-3-Clause + */ package org.eclipse.lyo.store.sync.handlers; import java.net.URI; diff --git a/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java b/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java index 882db4c..2b91965 100644 --- a/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java +++ b/src/store-sync/src/test/java/org/eclipse/lyo/store/sync/TestHistoryResource.java @@ -19,7 +19,7 @@ * * @author Andrew Berezovskyi (andriib@kth.se) * @version $version-stub$ - * @since 0.0.0 + * @since 4.0.0 */ public class TestHistoryResource { public static final URI RESOURCE_URI = URI.create("test:test");