Replace Dagger with Guice 4.0 beta and update Guava to 16.0.1

James Moger

2014-05-16 aa1361d04cfe09f90e7d8bece90c00dd6e4185bb

 src/main/java/com/gitblit/tickets/BranchTicketService.java

@@ -30,6 +30,9 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

import javax.inject.Inject;
import javax.inject.Singleton;

import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.dircache.DirCache;
@@ -81,6 +84,7 @@
 * @author James Moger
 *
 */
@Singleton
public class BranchTicketService extends ITicketService implements RefsChangedListener {

   public static final String BRANCH = "refs/meta/gitblit/tickets";
@@ -91,6 +95,7 @@

   private final Map<String, AtomicLong> lastAssignedId;

   @Inject
   public BranchTicketService(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
@@ -378,6 +383,37 @@
   }

   /**
    * Returns the assigned ticket ids.
    *
    * @return the assigned ticket ids
    */
   @Override
   public synchronized Set<Long> getIds(RepositoryModel repository) {
      Repository db = repositoryManager.getRepository(repository.name);
      try {
         if (getTicketsBranch(db) == null) {
            return Collections.emptySet();
         }
         Set<Long> ids = new TreeSet<Long>();
         List<PathModel> paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH);
         for (PathModel path : paths) {
            String name = path.name.substring(path.name.lastIndexOf('/') + 1);
            if (!JOURNAL.equals(name)) {
               continue;
            }
            String tid = path.path.split("/")[2];
            long ticketId = Long.parseLong(tid);
            ids.add(ticketId);
         }
         return ids;
      } finally {
         if (db != null) {
            db.close();
         }
      }
   }

   /**
    * Assigns a new ticket id.
    *
    * @param repository
@@ -398,16 +434,10 @@
         }
         AtomicLong lastId = lastAssignedId.get(repository.name);
         if (lastId.get() <= 0) {
            List<PathModel> paths = JGitUtils.getDocuments(db, Arrays.asList("json"), BRANCH);
            for (PathModel path : paths) {
               String name = path.name.substring(path.name.lastIndexOf('/') + 1);
               if (!JOURNAL.equals(name)) {
                  continue;
               }
               String tid = path.path.split("/")[2];
               long ticketId = Long.parseLong(tid);
               if (ticketId > lastId.get()) {
                  lastId.set(ticketId);
            Set<Long> ids = getIds(repository);
            for (long id : ids) {
               if (id > lastId.get()) {
                  lastId.set(id);
               }
            }
         }
@@ -520,6 +550,28 @@
            ticket.number = ticketId;
         }
         return ticket;
      } finally {
         db.close();
      }
   }

   /**
    * Retrieves the journal for the ticket.
    *
    * @param repository
    * @param ticketId
    * @return a journal, if it exists, otherwise null
    */
   @Override
   protected List<Change> getJournalImpl(RepositoryModel repository, long ticketId) {
      Repository db = repositoryManager.getRepository(repository.name);
      try {
         List<Change> changes = getJournal(db, ticketId);
         if (ArrayUtils.isEmpty(changes)) {
            log.warn("Empty journal for {}:{}", repository, ticketId);
            return null;
         }
         return changes;
      } finally {
         db.close();
      }
@@ -659,7 +711,9 @@
                  ticket.number, db.getDirectory()), t);
         } finally {
            // release the treewalk
            treeWalk.release();
            if (treeWalk != null) {
               treeWalk.release();
            }
         }
      } finally {
         db.close();