Implementation of the getTickets capability of recovering all tickets from ...

Hybris95

2014-04-16 7d19224c99f118351ad15a77942762e74940536f

Implementation of the getTickets capability of recovering all tickets from a nullable RepositoryModel

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

@@ -436,8 +436,27 @@
    @Override
    public List<TicketModel> getTickets(RepositoryModel repository, TicketFilter filter) {
        List<TicketModel> list = new ArrayList<TicketModel>();
        List<Repository> databases = new ArrayList<Repository>();
        List<RepositoryModel> models = new ArrayList<RepositoryModel>();

        Repository db = repositoryManager.getRepository(repository.name);
        if(repository == null)
        {
            List<String> allRepo = repositoryManager.getRepositoryList();
            for(int i = 0; i < allRepo.size(); i++)
            {
                databases.add(repositoryManager.getRepository(allRepo.get(i)));
                models.add(repositoryManager.getRepositoryModel(allRepo.get(i)));
            }
        }
        else
        {
            databases.add(repositoryManager.getRepository(repository.name));
            models.add(repository);
        }

        for(int i = 0; i < databases.size(); i++)
        {
            Repository db = databases.get(i);
        try {
            RefModel ticketsBranch = getTicketsBranch(db);
            if (ticketsBranch == null) {
@@ -465,12 +484,12 @@
                    long ticketId = Long.parseLong(tid);
                    List<Change> changes = TicketSerializer.deserializeJournal(json);
                    if (ArrayUtils.isEmpty(changes)) {
                        log.warn("Empty journal for {}:{}", repository, path.path);
                            log.warn("Empty journal for {}:{}", models.get(i), path.path);
                        continue;
                    }
                    TicketModel ticket = TicketModel.buildTicket(changes);
                    ticket.project = repository.projectPath;
                    ticket.repository = repository.name;
                        ticket.project = models.get(i).projectPath;
                        ticket.repository = models.get(i).name;
                    ticket.number = ticketId;

                    // add the ticket, conditionally, to the list
@@ -487,13 +506,14 @@
                    log.error(null, e);
                }
            }
            } finally {
                db.close();
            }
        }

            // sort the tickets by creation
            Collections.sort(list);
            return list;
        } finally {
            db.close();
        }
    }

    /**

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

@@ -228,6 +228,7 @@
        for(int i = 0; i < databases.size(); i++)
        {
            Repository db = databases.get(i);
            RepositoryModel model = models.get(i);
            try {
                // Collect the set of all json files
                File dir = new File(db.getDirectory(), TICKETS_PATH);
@@ -253,12 +254,12 @@
                        long ticketId = Long.parseLong(tid);
                        List<Change> changes = TicketSerializer.deserializeJournal(json);
                        if (ArrayUtils.isEmpty(changes)) {
                            log.warn("Empty journal for {}:{}", models.get(i), journal);
                            log.warn("Empty journal for {}:{}", model, journal);
                            continue;
                        }
                        TicketModel ticket = TicketModel.buildTicket(changes);
                        ticket.project = models.get(i).projectPath;
                        ticket.repository = models.get(i).name;
                        ticket.project = model.projectPath;
                        ticket.repository = model.name;
                        ticket.number = ticketId;
    
                        // add the ticket, conditionally, to the list
@@ -271,7 +272,7 @@
                        }
                    } catch (Exception e) {
                        log.error("failed to deserialize {}/{}\n{}",
                                new Object [] { models.get(i), journal, e.getMessage()});
                                new Object [] { model, journal, e.getMessage()});
                        log.error(null, e);
                    }
                }

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

@@ -22,6 +22,7 @@
import java.util.Set;

import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.eclipse.jgit.lib.Repository;

import redis.clients.jedis.Client;
import redis.clients.jedis.Jedis;
@@ -228,24 +229,42 @@
    public List<TicketModel> getTickets(RepositoryModel repository, TicketFilter filter) {
        Jedis jedis = pool.getResource();
        List<TicketModel> list = new ArrayList<TicketModel>();
        List<RepositoryModel> models = new ArrayList<RepositoryModel>();
		
        if(repository == null)
        {
            List<String> allRepo = repositoryManager.getRepositoryList();
            for(int i = 0; i < allRepo.size(); i++)
            {
                models.add(repositoryManager.getRepositoryModel(allRepo.get(i)));
            }
        }
        else
        {
            models.add(repository);
        }
		
        if (jedis == null) {
            return list;
        }
        for(int i = 0; i < models.size(); i++)
        {
            RepositoryModel model = models.get(i);
        try {
            // Deserialize each journal, build the ticket, and optionally filter
            Set<String> keys = jedis.keys(key(repository, KeyType.journal, "*"));
                Set<String> keys = jedis.keys(key(model, KeyType.journal, "*"));
            for (String key : keys) {
                // {repo}:journal:{id}
                String id = key.split(":")[2];
                long ticketId = Long.parseLong(id);
                List<Change> changes = getJournal(jedis, repository, ticketId);
                    List<Change> changes = getJournal(jedis, model, ticketId);
                if (ArrayUtils.isEmpty(changes)) {
                    log.warn("Empty journal for {}:{}", repository, ticketId);
                        log.warn("Empty journal for {}:{}", model, ticketId);
                    continue;
                }
                TicketModel ticket = TicketModel.buildTicket(changes);
                ticket.project = repository.projectPath;
                ticket.repository = repository.name;
                    ticket.project = model.projectPath;
                    ticket.repository = model.name;
                ticket.number = ticketId;

                // add the ticket, conditionally, to the list
@@ -257,9 +276,6 @@
                    }
                }
            }

            // sort the tickets by creation
            Collections.sort(list);
        } catch (JedisException e) {
            log.error("failed to retrieve tickets from Redis @ " + getUrl(), e);
            pool.returnBrokenResource(jedis);
@@ -269,6 +285,9 @@
                pool.returnResource(jedis);
            }
        }
        }
        // sort the tickets by creation
        Collections.sort(list);
        return list;
    }