Skip to content

Commit 0f0880f

Browse files
TRS Services for rm-server (#473)
Co-authored-by: Andrew Berezovskyi <andriib@kth.se>
1 parent b84cad7 commit 0f0880f

File tree

8 files changed

+6935
-6843
lines changed

8 files changed

+6935
-6843
lines changed

model/representations.aird

Lines changed: 5872 additions & 5850 deletions
Large diffs are not rendered by default.

model/toolchain.xml

Lines changed: 267 additions & 266 deletions
Large diffs are not rendered by default.

src/server-rm/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<servlet.port>8800</servlet.port>
3030
<application.contextpath>/</application.contextpath>
3131
<application.filename>server-rm</application.filename>
32-
3332
<!-- Start of user code properties
3433
-->
3534
<v.lucene>9.12.0</v.lucene>
@@ -247,6 +246,10 @@
247246
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
248247
<artifactId>oslc4j-json4j-provider</artifactId>
249248
</dependency>
249+
<dependency>
250+
<groupId>org.eclipse.lyo.trs</groupId>
251+
<artifactId>trs-server</artifactId>
252+
</dependency>
250253
<dependency>
251254
<groupId>org.eclipse.lyo.clients</groupId>
252255
<artifactId>oslc-client</artifactId>
@@ -314,13 +317,11 @@
314317
<finalName>${application.filename}</finalName>
315318
<plugins>
316319
<!-- Start of user code plugins
317-
-->
320+
-->
318321
<plugin>
319322
<groupId>org.apache.maven.plugins</groupId>
320323
<artifactId>maven-enforcer-plugin</artifactId>
321324
</plugin>
322-
<!-- End of user code
323-
-->
324325
<plugin>
325326
<groupId>org.apache.maven.plugins</groupId>
326327
<artifactId>maven-compiler-plugin</artifactId>
@@ -331,6 +332,8 @@
331332
</compilerArgument>
332333
</configuration>
333334
</plugin>
335+
<!-- End of user code
336+
-->
334337
<plugin>
335338
<groupId>org.eclipse.jetty</groupId>
336339
<artifactId>jetty-maven-plugin</artifactId>
@@ -423,10 +426,6 @@
423426
</configuration>
424427
</plugin>
425428

426-
<!-- Start of user code plugins
427-
-->
428-
<!-- End of user code
429-
-->
430429
</plugins>
431430
</build>
432431
<!-- Start of user code post_build

src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.eclipse.lyo.oslc.domains.rm.Requirement;
4444
import org.eclipse.lyo.oslc.domains.rm.RequirementCollection;
4545

46+
import org.eclipse.lyo.oslc4j.trs.server.TrsEventHandler;
4647

4748

4849
// Start of user code imports
@@ -93,7 +94,7 @@ public class RestDelegate {
9394
private static final Logger log = LoggerFactory.getLogger(RestDelegate.class);
9495

9596

96-
97+
@Inject TrsEventHandler trsEventHandler;
9798
@Inject ResourcesFactory resourcesFactory;
9899
// Start of user code class_attributes
99100
public static final String SP_DEFAULT = "sp_single";
@@ -251,6 +252,7 @@ public Requirement createRequirement(HttpServletRequest httpServletRequest, fina
251252
log.info("Created {}", aResource.getShortTitle());
252253
newResource = aResource;
253254
addToIndex(newResource, serviceProviderId);
255+
trsEventHandler.onCreated(newResource);
254256
// End of user code
255257
return newResource;
256258
}
@@ -314,6 +316,7 @@ public RequirementCollection createRequirementCollection(HttpServletRequest http
314316
newResource = aResource;
315317
// TODO Andrew@2019-09-24: add to index
316318
// addToIndex(newResource, serviceProviderId);
319+
trsEventHandler.onCreated(newResource);
317320
// End of user code
318321
return newResource;
319322
}
@@ -351,7 +354,9 @@ public Boolean deleteRequirement(HttpServletRequest httpServletRequest, final St
351354

352355
// Start of user code deleteRequirement
353356
final Map<String, Requirement> requirements = requirementsForSP(serviceProviderId);
354-
deleted = requirements.remove(resourceId) != null;
357+
Requirement requirement = requirements.remove(resourceId);
358+
deleted = requirement != null;
359+
trsEventHandler.onDeleted(requirement.getAbout());
355360
// End of user code
356361
return deleted;
357362
}
@@ -361,7 +366,9 @@ public Boolean deleteRequirementCollection(HttpServletRequest httpServletRequest
361366

362367
// Start of user code deleteRequirementCollection
363368
final Map<String, RequirementCollection> repository = requirementCollectionsForSP(serviceProviderId);
364-
deleted = repository.remove(resourceId) != null;
369+
RequirementCollection requirementCollection = repository.remove(resourceId);
370+
deleted = requirementCollection != null;
371+
trsEventHandler.onDeleted(requirementCollection.getAbout());
365372
// End of user code
366373
return deleted;
367374
}
@@ -377,6 +384,7 @@ public Requirement updateRequirement(HttpServletRequest httpServletRequest, fina
377384
final Map<String, Requirement> repository = requirementsForSP(serviceProviderId);
378385
repository.put(resourceId, aResource);
379386
updatedResource = aResource;
387+
trsEventHandler.onModified(updatedResource);
380388
// End of user code
381389
return updatedResource;
382390
}
@@ -391,6 +399,7 @@ public RequirementCollection updateRequirementCollection(HttpServletRequest http
391399
final Map<String, RequirementCollection> repository = requirementCollectionsForSP(serviceProviderId);
392400
repository.put(resourceId, aResource);
393401
updatedResource = aResource;
402+
trsEventHandler.onModified(updatedResource);
394403
// End of user code
395404
return updatedResource;
396405
}

0 commit comments

Comments
 (0)