Merge pull request #356 from cloudant/291-refactor-datastore-callables-part-3

291 refactor datastore callables part 3

Author: tomblench

cloudant-sync-datastore-core/src/main/java/com/cloudant/sync/datastore/AttachmentManager.java

@@ -197,7 +197,7 @@ public static void addAttachment(SQLDatabase db, String attachmentsDir,
      * @throws AttachmentException if there was an error preparing the attachment, e.g., reading
      *                  attachment data.
      */
-    protected static PreparedAttachment prepareAttachment(String attachmentsDir,
+    public static PreparedAttachment prepareAttachment(String attachmentsDir,
                                                           AttachmentStreamFactory attachmentStreamFactory,
                                                           Attachment attachment)
             throws AttachmentException {
@@ -232,7 +232,7 @@ protected static PreparedAttachment prepareAttachment(String attachmentsDir,
      * @param attachments Attachments to search.
      * @return List of attachments which already exist in the attachment store, or an empty list if none.
      */
-    protected static List<SavedAttachment> findExistingAttachments(
+    public static List<SavedAttachment> findExistingAttachments(
             Collection<? extends Attachment> attachments) {
         ArrayList<SavedAttachment> list = new ArrayList<SavedAttachment>();
         for (Attachment a : attachments) {
@@ -249,7 +249,7 @@ protected static List<SavedAttachment> findExistingAttachments(
      * @param attachments Attachments to search.
      * @return List of attachments which need adding to the attachment store, or an empty list if none.
      */
-    protected static List<Attachment> findNewAttachments(Collection<? extends Attachment> attachments) {
+    public static List<Attachment> findNewAttachments(Collection<? extends Attachment> attachments) {
         ArrayList<Attachment> list = new ArrayList<Attachment>();
         for (Attachment a : attachments) {
             if (!(a instanceof SavedAttachment)) {
@@ -263,12 +263,13 @@ protected static List<Attachment> findNewAttachments(Collection<? extends Attach
      * Download each attachment in {@code attachments} to a temporary location, and
      * return a list of attachments suitable for passing to {@code setAttachments}.
      *
-     * Typically {@code attachments} is found via a call to {@see findNewAttachments}.
+     * Typically {@code attachments} is found via a call to {@link #findNewAttachments}.
      *
      * @param attachments List of attachments to prepare.
      * @return Attachments prepared for inserting into attachment store.
+     * @see #findNewAttachments
      */
-    protected static List<PreparedAttachment> prepareAttachments(String attachmentsDir,
+    public static List<PreparedAttachment> prepareAttachments(String attachmentsDir,
                                                                  AttachmentStreamFactory attachmentStreamFactory,
                                                                  List<Attachment> attachments)
         throws AttachmentException {
@@ -393,7 +394,7 @@ public static void copyAttachmentsToRevision(SQLDatabase db, List<SavedAttachmen
      * @param newSequence identifies sequence number of revision to copy attachment data to
      * @param filename filename of attachment to copy
      */
-    protected static void copyAttachment(SQLDatabase db, long parentSequence, long newSequence,
+    public static void copyAttachment(SQLDatabase db, long parentSequence, long newSequence,
                                          String filename) throws SQLException {
         Cursor c = null;
         try{
@@ -409,7 +410,7 @@ protected static void copyAttachment(SQLDatabase db, long parentSequence, long n
      * Called by BasicDatastore on the execution queue, this needs have the db passed ot it
      * @param db database to purge attachments from
      */
-    protected static void purgeAttachments(SQLDatabase db, String attachmentsDir) {
+    public static void purgeAttachments(SQLDatabase db, String attachmentsDir) {
         // it's easier to deal with Strings since java doesn't know how to compare byte[]s
         Set<String> currentKeys = new HashSet<String>();
         Cursor c = null;

cloudant-sync-datastore-core/src/main/java/com/cloudant/sync/datastore/Changes.java

@@ -35,7 +35,22 @@ public class Changes {
 
     private final List<DocumentRevision> results;
 
-    protected Changes(long lastSequence, List<DocumentRevision> results) {
+    /**
+     * <p>
+     * Construct a list of changes
+     * </p>
+     * <p>
+     * Note that this constructor is for internal use. To get a set of changes from a given sequence
+     * number, use {@link com.cloudant.sync.datastore.Datastore#changes}
+     * </p>
+     * @param lastSequence the last sequence number of this change set
+     * @param results the list of {@code DocumentRevision}s in this change set
+     *
+     * @see com.cloudant.sync.datastore.Datastore#changes
+     *
+     * @api_private
+     */
+    public Changes(long lastSequence, List<DocumentRevision> results) {
         Misc.checkNotNull(results, "Changes results");
         this.lastSequence = lastSequence;
         this.results = results;

cloudant-sync-datastore-core/src/main/java/com/cloudant/sync/datastore/DatastoreException.java

@@ -24,16 +24,15 @@ public class DatastoreException extends Exception {
     public DatastoreException(){
 
     }
-
     public DatastoreException(String message){
         super(message);
     }
 
-    public DatastoreException(Exception causedBy){
+    public DatastoreException(Throwable causedBy){
         super(causedBy);
     }
 
-    public DatastoreException(String message, Exception causedBy){
+    public DatastoreException(String message, Throwable causedBy){
         super(message,causedBy);
     }