Reverted changes to ticket services

James Moger

2014-05-01 3490ef1a69af4bc72be03188fd9961ef2183dc2b

Reverted changes to ticket services

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

@@ -207,27 +207,8 @@
    @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>();
        
        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);
        Repository db = repositoryManager.getRepository(repository.name);
            try {
                // Collect the set of all json files
                File dir = new File(db.getDirectory(), TICKETS_PATH);
@@ -253,12 +234,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 {}:{}", repository, journal);
                            continue;
                        }
                        TicketModel ticket = TicketModel.buildTicket(changes);
                        ticket.project = models.get(i).projectPath;
                        ticket.repository = models.get(i).name;
                    ticket.project = repository.projectPath;
                    ticket.repository = repository.name;
                        ticket.number = ticketId;
    
                        // add the ticket, conditionally, to the list
@@ -271,18 +252,17 @@
                        }
                    } catch (Exception e) {
                        log.error("failed to deserialize {}/{}\n{}",
                                new Object [] { models.get(i), journal, e.getMessage()});
                            new Object [] { repository, journal, e.getMessage()});
                        log.error(null, e);
                    }
                }
            } finally {
                db.close();
            }
        }
        
        // sort the tickets by creation
        Collections.sort(list);
        return list;
        } finally {
            db.close();
        }
    }

    private List<File> findAll(File dir, String filename) {

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

@@ -783,17 +783,8 @@
    /**
     * Returns all tickets.  This is not a Lucene search!
     * 
     * @return all tickets
     */
    public List<TicketModel> getTickets() {
        return getTickets(null, null);
    }

    /**
     * Returns all tickets.  This is not a Lucene search!
     *
     * @param repository
     * @return all tickets of a given repository
     * @return all tickets
     * @since 1.4.0
     */
    public List<TicketModel> getTickets(RepositoryModel repository) {