diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java index 62589f97..ac74b405 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/AdminResource.java @@ -32,14 +32,14 @@ public class AdminResource { private final Coordinator coordinator; private final Repository repository; - private final CoordinatorConfig config; + private final boolean allowDuplicateInstallationsOnAnAgent; @Inject public AdminResource(Coordinator coordinator, Repository repository, CoordinatorConfig config) { this.coordinator = coordinator; this.repository = repository; - this.config = config; + this.allowDuplicateInstallationsOnAnAgent = config.isAllowDuplicateInstallationsOnAnAgent(); } @GET @@ -82,7 +82,7 @@ public Response getAllAgents(@Context UriInfo uriInfo) Predicate agentPredicate = AgentFilterBuilder.build(uriInfo, transform(coordinator.getAgents(), idGetter()), transform(allSlotStatus, SlotStatus.uuidGetter()), - config.isAllowDuplicateInstallationsOnAnAgent(), + allowDuplicateInstallationsOnAnAgent, repository); List agents = coordinator.getAgents(agentPredicate); diff --git a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java index 9773b22a..07dd1999 100644 --- a/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java +++ b/airship-coordinator/src/main/java/io/airlift/airship/coordinator/CoordinatorSlotResource.java @@ -56,18 +56,18 @@ public class CoordinatorSlotResource private final Coordinator coordinator; private final Repository repository; - private final CoordinatorConfig config; + private final boolean allowDuplicateInstallationsOnAnAgent; @Inject public CoordinatorSlotResource(Coordinator coordinator, Repository repository, CoordinatorConfig config) { Preconditions.checkNotNull(coordinator, "coordinator must not be null"); Preconditions.checkNotNull(repository, "repository is null"); + Preconditions.checkNotNull(config, "coordinatorConfig is null"); this.coordinator = coordinator; this.repository = repository; - - this.config = Preconditions.checkNotNull(config, "coordinatorConfig is null"); + this.allowDuplicateInstallationsOnAnAgent = config.isAllowDuplicateInstallationsOnAnAgent(); } @GET @@ -105,7 +105,7 @@ public Response install( Predicate agentFilter = AgentFilterBuilder.build(uriInfo, transform(coordinator.getAgents(), idGetter()), transform(coordinator.getAllSlotStatus(), uuidGetter()), - config.isAllowDuplicateInstallationsOnAnAgent(), + allowDuplicateInstallationsOnAnAgent, repository); List agents = coordinator.getAgents(agentFilter);