X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=d1ceee933b888d3c2d63572e1758bcd90a39ee64;hb=8d49fb185ee26853262a12f6d419ef2e39c1116c;hp=eed00eab1e3607a08b69a2fdb047f7230b9d72cc;hpb=60fda3f6fd8cd72151338c831f509dd8d9d0f9ff;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index eed00ea..d1ceee9 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -1,5 +1,5 @@
/*
- * Sone - MemoryPostDatabase.java - Copyright © 2013 David Roden
+ * Sone - MemoryDatabase.java - Copyright © 2013 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,28 +17,49 @@
package net.pterodactylus.sone.database.memory;
+import static com.google.common.base.Optional.fromNullable;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.not;
+import static com.google.common.collect.FluentIterable.from;
+import static java.util.Collections.emptyList;
+import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
+import java.util.SortedSet;
+import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
+import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.impl.AbstractPostBuilder;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.DatabaseException;
import net.pterodactylus.sone.database.PostBuilder;
import net.pterodactylus.sone.database.PostDatabase;
-import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.database.PostReplyBuilder;
+import net.pterodactylus.sone.database.SoneBuilder;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
+import com.google.common.base.Function;
import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.SortedSetMultimap;
+import com.google.common.collect.TreeMultimap;
+import com.google.common.util.concurrent.AbstractService;
import com.google.inject.Inject;
/**
@@ -46,13 +67,15 @@ import com.google.inject.Inject;
*
* @author David âBombeâ Roden
*/
-public class MemoryPostDatabase implements PostDatabase {
+public class MemoryDatabase extends AbstractService implements Database {
/** The lock. */
private final ReadWriteLock lock = new ReentrantReadWriteLock();
- /** The Sone provider. */
- private final SoneProvider soneProvider;
+ /** The configuration. */
+ private final Configuration configuration;
+
+ private final Map sones = new HashMap();
/** All posts by their ID. */
private final Map allPosts = new HashMap();
@@ -66,75 +89,163 @@ public class MemoryPostDatabase implements PostDatabase {
/** Whether posts are known. */
private final Set knownPosts = new HashSet();
+ /** All post replies by their ID. */
+ private final Map allPostReplies = new HashMap();
+
+ /** Replies sorted by Sone. */
+ private final SortedSetMultimap sonePostReplies = TreeMultimap.create(new Comparator() {
+
+ @Override
+ public int compare(String leftString, String rightString) {
+ return leftString.compareTo(rightString);
+ }
+ }, PostReply.TIME_COMPARATOR);
+
+ /** Replies by post. */
+ private final Map> postReplies = new HashMap>();
+
+ /** Whether post replies are known. */
+ private final Set knownPostReplies = new HashSet();
+
+ private final Map allAlbums = new HashMap();
+ private final ListMultimap albumChildren = ArrayListMultimap.create();
+ private final ListMultimap albumImages = ArrayListMultimap.create();
+
+ private final Map allImages = new HashMap();
+
/**
* Creates a new memory database.
*
- * @param soneProvider
- * The Sone provider
+ * @param configuration
+ * The configuration for loading and saving elements
*/
@Inject
- public MemoryPostDatabase(SoneProvider soneProvider) {
- this.soneProvider = soneProvider;
+ public MemoryDatabase(Configuration configuration) {
+ this.configuration = configuration;
}
//
- // POSTPROVIDER METHODS
+ // DATABASE METHODS
//
/**
- * {@inheritDocs}
+ * Saves the database.
+ *
+ * @throws DatabaseException
+ * if an error occurs while saving
*/
@Override
- public Optional getPost(String postId) {
+ public void save() throws DatabaseException {
+ saveKnownPosts();
+ saveKnownPostReplies();
+ }
+
+ //
+ // SERVICE METHODS
+ //
+
+ /** {@inheritDocs} */
+ @Override
+ protected void doStart() {
+ loadKnownPosts();
+ loadKnownPostReplies();
+ notifyStarted();
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ protected void doStop() {
+ try {
+ save();
+ notifyStopped();
+ } catch (DatabaseException de1) {
+ notifyFailed(de1);
+ }
+ }
+
+ @Override
+ public Optional getSone(String soneId) {
lock.readLock().lock();
try {
- return Optional.fromNullable(allPosts.get(postId));
+ return fromNullable(sones.get(soneId));
} finally {
lock.readLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
@Override
- public Collection getPosts(String soneId) {
- return new HashSet(getPostsFrom(soneId));
+ public Collection getSones() {
+ lock.readLock().lock();
+ try {
+ return Collections.unmodifiableCollection(sones.values());
+ } finally {
+ lock.readLock().unlock();
+ }
}
- /**
- * {@inheritDocs}
- */
@Override
- public Collection getDirectedPosts(String recipientId) {
+ public Collection getLocalSones() {
lock.readLock().lock();
try {
- Collection posts = recipientPosts.get(recipientId);
- return (posts == null) ? Collections. emptySet() : new HashSet(posts);
+ return from(getSones()).filter(LOCAL_SONE_FILTER).toSet();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getRemoteSones() {
+ lock.readLock().lock();
+ try {
+ return from(getSones()).filter(not(LOCAL_SONE_FILTER)).toSet();
} finally {
lock.readLock().unlock();
}
}
+ @Override
+ public SoneBuilder newSoneBuilder() {
+ return null;
+ }
+
//
- // POSTBUILDERFACTORY METHODS
+ // POSTPROVIDER METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
- public PostBuilder newPostBuilder() {
- return new MemoryPostBuilder(soneProvider);
+ public Optional getPost(String postId) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allPosts.get(postId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ public Collection getPosts(String soneId) {
+ return new HashSet(getPostsFrom(soneId));
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ public Collection getDirectedPosts(String recipientId) {
+ lock.readLock().lock();
+ try {
+ Collection posts = recipientPosts.get(recipientId);
+ return (posts == null) ? Collections.emptySet() : new HashSet(posts);
+ } finally {
+ lock.readLock().unlock();
+ }
}
//
// POSTSTORE METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePost(Post post) {
checkNotNull(post, "post must not be null");
@@ -150,9 +261,7 @@ public class MemoryPostDatabase implements PostDatabase {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePost(Post post) {
checkNotNull(post, "post must not be null");
@@ -169,9 +278,7 @@ public class MemoryPostDatabase implements PostDatabase {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePosts(Sone sone, Collection posts) throws IllegalArgumentException {
checkNotNull(sone, "sone must not be null");
@@ -206,9 +313,7 @@ public class MemoryPostDatabase implements PostDatabase {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePosts(Sone sone) {
checkNotNull(sone, "sone must not be null");
@@ -228,46 +333,295 @@ public class MemoryPostDatabase implements PostDatabase {
}
//
- // POSTDATABASE METHODS
+ // POSTREPLYPROVIDER METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
- public void loadKnownPosts(Configuration configuration, String prefix) {
+ public Optional getPostReply(String id) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allPostReplies.get(id));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ public List getReplies(String postId) {
+ lock.readLock().lock();
+ try {
+ if (!postReplies.containsKey(postId)) {
+ return emptyList();
+ }
+ return new ArrayList(postReplies.get(postId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ //
+ // POSTREPLYBUILDERFACTORY METHODS
+ //
+
+ /** {@inheritDocs} */
+ @Override
+ public PostReplyBuilder newPostReplyBuilder() {
+ return new MemoryPostReplyBuilder(this, this);
+ }
+
+ //
+ // POSTREPLYSTORE METHODS
+ //
+
+ /** {@inheritDocs} */
+ @Override
+ public void storePostReply(PostReply postReply) {
lock.writeLock().lock();
try {
- int postCounter = 0;
- while (true) {
- String knownPostId = configuration.getStringValue(prefix + postCounter++ + "/ID").getValue(null);
- if (knownPostId == null) {
- break;
+ allPostReplies.put(postReply.getId(), postReply);
+ if (postReplies.containsKey(postReply.getPostId())) {
+ postReplies.get(postReply.getPostId()).add(postReply);
+ } else {
+ TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
+ replies.add(postReply);
+ postReplies.put(postReply.getPostId(), replies);
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ public void storePostReplies(Sone sone, Collection postReplies) {
+ checkNotNull(sone, "sone must not be null");
+ /* verify that all posts are from the same Sone. */
+ for (PostReply postReply : postReplies) {
+ if (!sone.equals(postReply.getSone())) {
+ throw new IllegalArgumentException(String.format("PostReply from different Sone found: %s", postReply));
+ }
+ }
+
+ lock.writeLock().lock();
+ try {
+ /* remove all post replies of the Sone. */
+ for (PostReply postReply : getRepliesFrom(sone.getId())) {
+ removePostReply(postReply);
+ }
+ for (PostReply postReply : postReplies) {
+ allPostReplies.put(postReply.getId(), postReply);
+ sonePostReplies.put(postReply.getSone().getId(), postReply);
+ if (this.postReplies.containsKey(postReply.getPostId())) {
+ this.postReplies.get(postReply.getPostId()).add(postReply);
+ } else {
+ TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
+ replies.add(postReply);
+ this.postReplies.put(postReply.getPostId(), replies);
}
- knownPosts.add(knownPostId);
}
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
+ @Override
+ public void removePostReply(PostReply postReply) {
+ lock.writeLock().lock();
+ try {
+ allPostReplies.remove(postReply.getId());
+ if (postReplies.containsKey(postReply.getPostId())) {
+ postReplies.get(postReply.getPostId()).remove(postReply);
+ if (postReplies.get(postReply.getPostId()).isEmpty()) {
+ postReplies.remove(postReply.getPostId());
+ }
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ /** {@inheritDocs} */
+ @Override
+ public void removePostReplies(Sone sone) {
+ checkNotNull(sone, "sone must not be null");
+
+ lock.writeLock().lock();
+ try {
+ for (PostReply postReply : sone.getReplies()) {
+ removePostReply(postReply);
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
+ // ALBUMPROVDER METHODS
+ //
+
@Override
- public void saveKnownPosts(Configuration configuration, String prefix) throws ConfigurationException {
+ public Optional getAlbum(String albumId) {
lock.readLock().lock();
try {
- int postCounter = 0;
- for (String knownPostId : knownPosts) {
- configuration.getStringValue(prefix + postCounter++ + "/ID").setValue(knownPostId);
+ return fromNullable(allAlbums.get(albumId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public List getAlbums(Album parent) {
+ lock.readLock().lock();
+ try {
+ return from(albumChildren.get(parent.getId())).transformAndConcat(getAlbum()).toList();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public void moveUp(Album album) {
+ lock.writeLock().lock();
+ try {
+ List albums = albumChildren.get(album.getParent().getId());
+ int currentIndex = albums.indexOf(album.getId());
+ if (currentIndex == 0) {
+ return;
+ }
+ albums.remove(album.getId());
+ albums.add(currentIndex - 1, album.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void moveDown(Album album) {
+ lock.writeLock().lock();
+ try {
+ List albums = albumChildren.get(album.getParent().getId());
+ int currentIndex = albums.indexOf(album.getId());
+ if (currentIndex == (albums.size() - 1)) {
+ return;
}
- configuration.getStringValue(prefix + postCounter + "/ID").setValue(null);
+ albums.remove(album.getId());
+ albums.add(currentIndex + 1, album.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
+ // ALBUMSTORE METHODS
+ //
+
+ @Override
+ public void storeAlbum(Album album) {
+ lock.writeLock().lock();
+ try {
+ allAlbums.put(album.getId(), album);
+ albumChildren.put(album.getParent().getId(), album.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void removeAlbum(Album album) {
+ lock.writeLock().lock();
+ try {
+ allAlbums.remove(album.getId());
+ albumChildren.remove(album.getParent().getId(), album.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
+ // IMAGEPROVIDER METHODS
+ //
+
+ @Override
+ public Optional getImage(String imageId) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allImages.get(imageId));
} finally {
lock.readLock().unlock();
}
}
+ @Override
+ public List getImages(Album parent) {
+ lock.readLock().lock();
+ try {
+ return from(albumImages.get(parent.getId())).transformAndConcat(getImage()).toList();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public void moveUp(Image image) {
+ lock.writeLock().lock();
+ try {
+ List images = albumImages.get(image.getAlbum().getId());
+ int currentIndex = images.indexOf(image.getId());
+ if (currentIndex == 0) {
+ return;
+ }
+ images.remove(image.getId());
+ images.add(currentIndex - 1, image.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void moveDown(Image image) {
+ lock.writeLock().lock();
+ try {
+ List images = albumChildren.get(image.getAlbum().getId());
+ int currentIndex = images.indexOf(image.getId());
+ if (currentIndex == (images.size() - 1)) {
+ return;
+ }
+ images.remove(image.getId());
+ images.add(currentIndex + 1, image.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
+ // IMAGESTORE METHODS
+ //
+
+ @Override
+ public void storeImage(Image image) {
+ lock.writeLock().lock();
+ try {
+ allImages.put(image.getId(), image);
+ albumImages.put(image.getAlbum().getId(), image.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void removeImage(Image image) {
+ lock.writeLock().lock();
+ try {
+ allImages.remove(image.getId());
+ albumImages.remove(image.getAlbum().getId(), image.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
//
// PACKAGE-PRIVATE METHODS
//
@@ -276,7 +630,7 @@ public class MemoryPostDatabase implements PostDatabase {
* Returns whether the given post is known.
*
* @param post
- * The post
+ * The post
* @return {@code true} if the post is known, {@code false} otherwise
*/
boolean isPostKnown(Post post) {
@@ -292,9 +646,9 @@ public class MemoryPostDatabase implements PostDatabase {
* Sets whether the given post is known.
*
* @param post
- * The post
+ * The post
* @param known
- * {@code true} if the post is known, {@code false} otherwise
+ * {@code true} if the post is known, {@code false} otherwise
*/
void setPostKnown(Post post, boolean known) {
lock.writeLock().lock();
@@ -309,6 +663,44 @@ public class MemoryPostDatabase implements PostDatabase {
}
}
+ /**
+ * Returns whether the given post reply is known.
+ *
+ * @param postReply
+ * The post reply
+ * @return {@code true} if the given post reply is known, {@code false}
+ * otherwise
+ */
+ boolean isPostReplyKnown(PostReply postReply) {
+ lock.readLock().lock();
+ try {
+ return knownPostReplies.contains(postReply.getId());
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ /**
+ * Sets whether the given post reply is known.
+ *
+ * @param postReply
+ * The post reply
+ * @param known
+ * {@code true} if the post reply is known, {@code false} otherwise
+ */
+ void setPostReplyKnown(PostReply postReply, boolean known) {
+ lock.writeLock().lock();
+ try {
+ if (known) {
+ knownPostReplies.add(postReply.getId());
+ } else {
+ knownPostReplies.remove(postReply.getId());
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
//
// PRIVATE METHODS
//
@@ -318,7 +710,7 @@ public class MemoryPostDatabase implements PostDatabase {
* none yet.
*
* @param soneId
- * The ID of the Sone to get the posts for
+ * The ID of the Sone to get the posts for
* @return All posts
*/
private Collection getPostsFrom(String soneId) {
@@ -345,11 +737,11 @@ public class MemoryPostDatabase implements PostDatabase {
}
/**
- * Gets all posts that are directed the given Sone, creating a new
- * collection if there is none yet.
+ * Gets all posts that are directed the given Sone, creating a new collection
+ * if there is none yet.
*
* @param recipientId
- * The ID of the Sone to get the posts for
+ * The ID of the Sone to get the posts for
* @return All posts
*/
private Collection getPostsTo(String recipientId) {
@@ -375,34 +767,117 @@ public class MemoryPostDatabase implements PostDatabase {
return posts;
}
+ /** Loads the known posts. */
+ private void loadKnownPosts() {
+ lock.writeLock().lock();
+ try {
+ int postCounter = 0;
+ while (true) {
+ String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
+ if (knownPostId == null) {
+ break;
+ }
+ knownPosts.add(knownPostId);
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
/**
- * {@link PostBuilder} implementation that creates a {@link MemoryPost}.
+ * Saves the known posts to the configuration.
*
- * @author David âBombeâ Roden
+ * @throws DatabaseException
+ * if a configuration error occurs
*/
- private class MemoryPostBuilder extends AbstractPostBuilder {
+ private void saveKnownPosts() throws DatabaseException {
+ lock.readLock().lock();
+ try {
+ int postCounter = 0;
+ for (String knownPostId : knownPosts) {
+ configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
+ }
+ configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
+ } catch (ConfigurationException ce1) {
+ throw new DatabaseException("Could not save database.", ce1);
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
- /**
- * Creates a new memory post builder.
- *
- * @param soneProvider
- * The Sone provider
- */
- public MemoryPostBuilder(SoneProvider soneProvider) {
- super(soneProvider);
+ /**
+ * Returns all replies by the given Sone.
+ *
+ * @param id
+ * The ID of the Sone
+ * @return The post replies of the Sone, sorted by time (newest first)
+ */
+ private Collection getRepliesFrom(String id) {
+ lock.readLock().lock();
+ try {
+ if (sonePostReplies.containsKey(id)) {
+ return Collections.unmodifiableCollection(sonePostReplies.get(id));
+ }
+ return Collections.emptySet();
+ } finally {
+ lock.readLock().unlock();
}
+ }
- /**
- * {@inheritDocs}
- */
- @Override
- public Post build() throws IllegalStateException {
- validate();
- Post post = new MemoryPost(MemoryPostDatabase.this, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, recipientId, currentTime ? System.currentTimeMillis() : time, text);
- post.setKnown(isPostKnown(post));
- return post;
+ /** Loads the known post replies. */
+ private void loadKnownPostReplies() {
+ lock.writeLock().lock();
+ try {
+ int replyCounter = 0;
+ while (true) {
+ String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
+ if (knownReplyId == null) {
+ break;
+ }
+ knownPostReplies.add(knownReplyId);
+ }
+ } finally {
+ lock.writeLock().unlock();
}
+ }
+ /**
+ * Saves the known post replies to the configuration.
+ *
+ * @throws DatabaseException
+ * if a configuration error occurs
+ */
+ private void saveKnownPostReplies() throws DatabaseException {
+ lock.readLock().lock();
+ try {
+ int replyCounter = 0;
+ for (String knownReplyId : knownPostReplies) {
+ configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
+ }
+ configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
+ } catch (ConfigurationException ce1) {
+ throw new DatabaseException("Could not save database.", ce1);
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ private Function> getAlbum() {
+ return new Function>() {
+ @Override
+ public Iterable apply(String input) {
+ return (input == null) ? Collections.emptyList() : getAlbum(input).asSet();
+ }
+ };
+ }
+
+ private Function> getImage() {
+ return new Function>() {
+ @Override
+ public Iterable apply(String input) {
+ return (input == null) ? Collections.emptyList() : getImage(input).asSet();
+ }
+ };
}
}