Do not use @Inject on the ticket service constructors

James Moger

2014-03-06 63fbcc2b3b9c83f41298ee2822e98b0de418e013

Do not use @Inject on the ticket service constructors

 src/main/java/com/gitblit/GitBlit.java

@@ -205,7 +205,9 @@
        try {
            Class<? extends ITicketService> serviceClass = (Class<? extends ITicketService>) Class.forName(clazz);
            ticketService = injector.get(serviceClass).start();
            if (ticketService.isReady()) {
            if (ticketService instanceof NullTicketService) {
                logger.warn("No ticket service configured.");
            } else if (ticketService.isReady()) {
                logger.info("{} is ready.", ticketService);
            } else {
                logger.warn("{} is disabled.", ticketService);
@@ -284,5 +286,37 @@
        @Provides @Singleton IGitblit provideGitblit() {
            return GitBlit.this;
        }

        @Provides @Singleton NullTicketService provideNullTicketService() {
            return new NullTicketService(
                    runtimeManager,
                    notificationManager,
                    userManager,
                    repositoryManager);
        }

        @Provides @Singleton FileTicketService provideFileTicketService() {
            return new FileTicketService(
                    runtimeManager,
                    notificationManager,
                    userManager,
                    repositoryManager);
        }

        @Provides @Singleton BranchTicketService provideBranchTicketService() {
            return new BranchTicketService(
                    runtimeManager,
                    notificationManager,
                    userManager,
                    repositoryManager);
        }

        @Provides @Singleton RedisTicketService provideRedisTicketService() {
            return new RedisTicketService(
                    runtimeManager,
                    notificationManager,
                    userManager,
                    repositoryManager);
        }
    }
}

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

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

import javax.inject.Inject;

import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.dircache.DirCache;
@@ -90,7 +88,6 @@

    private final Map<String, AtomicLong> lastAssignedId;

    @Inject
    public BranchTicketService(
            IRuntimeManager runtimeManager,
            INotificationManager notificationManager,

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

@@ -25,8 +25,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;

import javax.inject.Inject;

import org.eclipse.jgit.lib.Repository;

import com.gitblit.Constants;
@@ -58,7 +56,6 @@

    private final Map<String, AtomicLong> lastAssignedId;

    @Inject
    public FileTicketService(
            IRuntimeManager runtimeManager,
            INotificationManager notificationManager,

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

@@ -18,8 +18,6 @@
import java.util.Collections;
import java.util.List;

import javax.inject.Inject;

import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
@@ -37,7 +35,6 @@
 */
public class NullTicketService extends ITicketService {

    @Inject
    public NullTicketService(
            IRuntimeManager runtimeManager,
            INotificationManager notificationManager,

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

@@ -21,8 +21,6 @@
import java.util.List;
import java.util.Set;

import javax.inject.Inject;

import org.apache.commons.pool2.impl.GenericObjectPoolConfig;

import redis.clients.jedis.Client;
@@ -61,7 +59,6 @@
        journal, ticket, counter
    }

    @Inject
    public RedisTicketService(
            IRuntimeManager runtimeManager,
            INotificationManager notificationManager,