Cleans up store related classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/0b550672 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/0b550672 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/0b550672 Branch: refs/heads/master Commit: 0b550672da3c923fbc6be0a963d2bf54c735b783 Parents: d9a9686 Author: Yuri Zelikov <[email protected]> Authored: Sat Jan 18 12:27:41 2014 +0200 Committer: Yuri Zelikov <[email protected]> Committed: Sat Jan 18 12:27:41 2014 +0200 ---------------------------------------------------------------------- .../box/server/attachment/AttachmentService.java | 2 +- .../common/CoreWaveletOperationSerializer.java | 4 +--- .../box/server/persistence/AttachmentStore.java | 8 ++++---- .../persistence/file/FileAttachmentStore.java | 2 +- .../server/persistence/mongodb/MongoDbProvider.java | 16 ++++++++-------- .../server/persistence/mongodb/MongoDbStore.java | 11 +---------- 6 files changed, 16 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/attachment/AttachmentService.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/attachment/AttachmentService.java b/src/org/waveprotocol/box/server/attachment/AttachmentService.java index 9c4d78a..163435f 100644 --- a/src/org/waveprotocol/box/server/attachment/AttachmentService.java +++ b/src/org/waveprotocol/box/server/attachment/AttachmentService.java @@ -164,7 +164,7 @@ public class AttachmentService { private void storeThumbnail(AttachmentId attachemntId, BufferedImage thumbnail) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); ImageIO.write(thumbnail, THUMBNAIL_FORMAT_NAME, out); - store.storeThumnail(attachemntId, new ByteArrayInputStream(out.toByteArray())); + store.storeThumbnail(attachemntId, new ByteArrayInputStream(out.toByteArray())); } private static String waveletName2WaveRef(WaveletName waveletName) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/common/CoreWaveletOperationSerializer.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/common/CoreWaveletOperationSerializer.java b/src/org/waveprotocol/box/server/common/CoreWaveletOperationSerializer.java index 9d81d22..3522fd4 100644 --- a/src/org/waveprotocol/box/server/common/CoreWaveletOperationSerializer.java +++ b/src/org/waveprotocol/box/server/common/CoreWaveletOperationSerializer.java @@ -36,7 +36,6 @@ import org.waveprotocol.wave.model.document.operation.AnnotationBoundaryMap; import org.waveprotocol.wave.model.document.operation.Attributes; import org.waveprotocol.wave.model.document.operation.AttributesUpdate; import org.waveprotocol.wave.model.document.operation.DocOp; -import org.waveprotocol.wave.model.document.operation.DocOp; import org.waveprotocol.wave.model.document.operation.DocOpCursor; import org.waveprotocol.wave.model.document.operation.impl.AnnotationBoundaryMapImpl; import org.waveprotocol.wave.model.document.operation.impl.AttributesImpl; @@ -307,8 +306,7 @@ public class CoreWaveletOperationSerializer { ops.add(deserialize(op, context)); } HashedVersion hashedVersion = deserialize(delta.getHashedVersion()); - return new WaveletDelta(new ParticipantId(delta.getAuthor()), - deserialize(delta.getHashedVersion()), ops); + return new WaveletDelta(new ParticipantId(delta.getAuthor()), hashedVersion, ops); } /** http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/persistence/AttachmentStore.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/persistence/AttachmentStore.java b/src/org/waveprotocol/box/server/persistence/AttachmentStore.java index 2ce0b82..3452476 100644 --- a/src/org/waveprotocol/box/server/persistence/AttachmentStore.java +++ b/src/org/waveprotocol/box/server/persistence/AttachmentStore.java @@ -18,12 +18,12 @@ */ package org.waveprotocol.box.server.persistence; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import org.waveprotocol.box.attachment.AttachmentMetadata; import org.waveprotocol.wave.media.model.AttachmentId; +import java.io.IOException; +import java.io.InputStream; + /** * An attachment store is a place for storing attachment data. * @@ -90,7 +90,7 @@ public interface AttachmentStore { * @param metaData attachment metadata * @throws IOException */ - void storeThumnail(AttachmentId attachmentId, InputStream dataData) throws IOException; + void storeThumbnail(AttachmentId attachmentId, InputStream dataData) throws IOException; /** * Delete the specified attachment from the store. If the attachment does http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/persistence/file/FileAttachmentStore.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/persistence/file/FileAttachmentStore.java b/src/org/waveprotocol/box/server/persistence/file/FileAttachmentStore.java index 1b96e91..96b23a3 100644 --- a/src/org/waveprotocol/box/server/persistence/file/FileAttachmentStore.java +++ b/src/org/waveprotocol/box/server/persistence/file/FileAttachmentStore.java @@ -135,7 +135,7 @@ public class FileAttachmentStore implements AttachmentStore { } @Override - public void storeThumnail(AttachmentId attachmentId, InputStream data) throws IOException { + public void storeThumbnail(AttachmentId attachmentId, InputStream data) throws IOException { File file = new File(getThumbnailPath(attachmentId)); if (file.exists()) { throw new IOException("Attachment already exist"); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbProvider.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbProvider.java b/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbProvider.java index 4136258..4e29077 100644 --- a/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbProvider.java +++ b/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbProvider.java @@ -28,11 +28,11 @@ import com.mongodb.MongoClient; import com.mongodb.MongoException; import org.waveprotocol.box.server.persistence.PersistenceStartException; +import org.waveprotocol.wave.util.logging.Log; import java.io.IOException; import java.net.UnknownHostException; import java.util.Properties; -import java.util.logging.Logger; /** * Class to lazily setup and manage the MongoDb connection. @@ -41,7 +41,7 @@ import java.util.logging.Logger; * */ public class MongoDbProvider { - private static final Logger LOG = Logger.getLogger(MongoDbProvider.class.getName()); + private static final Log LOG = Log.get(MongoDbProvider.class); /** Location of the MongoDB properties file in the classpath. */ private static final String PROPERTIES_LOC = @@ -76,7 +76,7 @@ public class MongoDbProvider { * Separated store for Deltas {@link MongoDbDeltaStore} */ private MongoDbDeltaStore mongoDbDeltaStore; - + /** Stores whether we have successfully setup a live {@link Mongo} instance. */ private boolean isRunning; @@ -189,18 +189,18 @@ public class MongoDbProvider { } return mongoDbStore; } - + /** - * Returns a {@link MongoDbDeltaStore} instance created from the settings in this + * Returns a {@link MongoDbDeltaStore} instance created from the settings in this * provider. */ public MongoDbDeltaStore provideMongoDbDeltaStore() { if (mongoDbDeltaStore == null) { mongoDbDeltaStore = new MongoDbDeltaStore(getDatabase()); } - + return mongoDbDeltaStore; - + } - + } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0b550672/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbStore.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbStore.java b/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbStore.java index ea85233..6832070 100644 --- a/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbStore.java +++ b/src/org/waveprotocol/box/server/persistence/mongodb/MongoDbStore.java @@ -46,13 +46,11 @@ import org.waveprotocol.box.server.persistence.AccountStore; import org.waveprotocol.box.server.persistence.AttachmentStore; import org.waveprotocol.box.server.persistence.PersistenceException; import org.waveprotocol.box.server.persistence.SignerInfoStore; -import org.waveprotocol.box.server.persistence.file.FileUtils; import org.waveprotocol.box.server.robots.RobotCapabilities; import org.waveprotocol.wave.crypto.SignatureException; import org.waveprotocol.wave.crypto.SignerInfo; import org.waveprotocol.wave.federation.Proto.ProtocolSignerInfo; import org.waveprotocol.wave.media.model.AttachmentId; -import org.waveprotocol.wave.model.id.WaveletName; import org.waveprotocol.wave.model.util.CollectionUtils; import org.waveprotocol.wave.model.wave.ParticipantId; @@ -101,7 +99,6 @@ public final class MongoDbStore implements SignerInfoStore, AttachmentStore, Acc private static final String CAPABILITY_FILTER_FIELD = "filter"; private static final Logger LOG = Logger.getLogger(MongoDbStore.class.getName()); - private final static String SEPARATOR_CHAR = "#"; private final DB database; @@ -246,7 +243,7 @@ public final class MongoDbStore implements SignerInfoStore, AttachmentStore, Acc } @Override - public void storeThumnail(AttachmentId attachmentId, InputStream dataData) throws IOException { + public void storeThumbnail(AttachmentId attachmentId, InputStream dataData) throws IOException { throw new UnsupportedOperationException("Not supported yet."); } @@ -414,10 +411,4 @@ public final class MongoDbStore implements SignerInfoStore, AttachmentStore, Acc return new RobotCapabilities(capabilities, capabilitiesHash, version); } - - private String computeCompleteAttachmentId(WaveletName waveletName, String id) { - String waveletNamePrefix = FileUtils.waveletNameToPathSegment(waveletName); - String completeAttachmentId = waveletNamePrefix + SEPARATOR_CHAR + id; - return completeAttachmentId; - } }
