Skip to content

Use CDI decorators for MementoService #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2019
Merged

Use CDI decorators for MementoService #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion db/src/main/java/org/trellisldp/ext/db/DBWrappedMementoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
import java.util.TreeSet;
import java.util.concurrent.CompletionStage;

import javax.decorator.Decorator;
import javax.decorator.Delegate;
import javax.inject.Inject;
import javax.sql.DataSource;

import org.apache.commons.rdf.api.IRI;
Expand All @@ -31,6 +34,7 @@
import org.slf4j.Logger;
import org.trellisldp.api.*;

@Decorator
public class DBWrappedMementoService implements MementoService {

private static final Logger LOGGER = getLogger(DBWrappedMementoService.class);
Expand All @@ -42,7 +46,8 @@ public class DBWrappedMementoService implements MementoService {
* @param ds the DataSource object
* @param service the memento service implementation
*/
public DBWrappedMementoService(final DataSource ds, final MementoService service) {
@Inject
public DBWrappedMementoService(final DataSource ds, @Delegate final MementoService service) {
this(Jdbi.create(ds), service);
}

Expand Down
46 changes: 0 additions & 46 deletions webapp/src/main/java/org/trellisldp/ext/db/webapp/ServiceProducers.java
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions webapp/src/main/resources/META-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
version="1.1" bean-discovery-mode="all">
<decorators>
<class>org.trellisldp.ext.db.DBWrappedMementoService</class>
</decorators>
</beans>