Remove explicit use of the default value
Change-Id: I27efdfbb7703f49b7ca13b12fcc71fa20bccf6a7
Showing
16 changed files
with
17 additions
and
17 deletions
| ... | @@ -91,7 +91,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -91,7 +91,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 91 | /** | 91 | /** |
| 92 | * Provides implementation of the flow NB & SB APIs. | 92 | * Provides implementation of the flow NB & SB APIs. |
| 93 | */ | 93 | */ |
| 94 | -@Component(immediate = true, enabled = true) | 94 | +@Component(immediate = true) |
| 95 | @Service | 95 | @Service |
| 96 | public class FlowRuleManager | 96 | public class FlowRuleManager |
| 97 | extends AbstractListenerProviderRegistry<FlowRuleEvent, FlowRuleListener, | 97 | extends AbstractListenerProviderRegistry<FlowRuleEvent, FlowRuleListener, | ... | ... |
| ... | @@ -43,7 +43,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -43,7 +43,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 43 | /** | 43 | /** |
| 44 | * Implementation of device key services. | 44 | * Implementation of device key services. |
| 45 | */ | 45 | */ |
| 46 | -@Component(immediate = true, enabled = true) | 46 | +@Component(immediate = true) |
| 47 | @Service | 47 | @Service |
| 48 | public class DeviceKeyManager extends AbstractListenerManager<DeviceKeyEvent, DeviceKeyListener> | 48 | public class DeviceKeyManager extends AbstractListenerManager<DeviceKeyEvent, DeviceKeyListener> |
| 49 | implements DeviceKeyService, DeviceKeyAdminService { | 49 | implements DeviceKeyService, DeviceKeyAdminService { | ... | ... |
| ... | @@ -67,7 +67,7 @@ import static org.onosproject.security.AppPermission.Type.*; | ... | @@ -67,7 +67,7 @@ import static org.onosproject.security.AppPermission.Type.*; |
| 67 | /** | 67 | /** |
| 68 | * Provides an implementation of the Flow Statistic Service. | 68 | * Provides an implementation of the Flow Statistic Service. |
| 69 | */ | 69 | */ |
| 70 | -@Component(immediate = true, enabled = true) | 70 | +@Component(immediate = true) |
| 71 | @Service | 71 | @Service |
| 72 | public class FlowStatisticManager implements FlowStatisticService { | 72 | public class FlowStatisticManager implements FlowStatisticService { |
| 73 | private final Logger log = getLogger(getClass()); | 73 | private final Logger log = getLogger(getClass()); | ... | ... |
| ... | @@ -44,7 +44,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -44,7 +44,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 44 | * Manages inventory of component configurations in a distributed data store | 44 | * Manages inventory of component configurations in a distributed data store |
| 45 | * that provides strong sequential consistency guarantees. | 45 | * that provides strong sequential consistency guarantees. |
| 46 | */ | 46 | */ |
| 47 | -@Component(immediate = true, enabled = true) | 47 | +@Component(immediate = true) |
| 48 | @Service | 48 | @Service |
| 49 | public class DistributedComponentConfigStore | 49 | public class DistributedComponentConfigStore |
| 50 | extends AbstractStore<ComponentConfigEvent, ComponentConfigStoreDelegate> | 50 | extends AbstractStore<ComponentConfigEvent, ComponentConfigStoreDelegate> | ... | ... |
| ... | @@ -49,7 +49,7 @@ import org.slf4j.Logger; | ... | @@ -49,7 +49,7 @@ import org.slf4j.Logger; |
| 49 | * primitive. | 49 | * primitive. |
| 50 | */ | 50 | */ |
| 51 | @Service | 51 | @Service |
| 52 | -@Component(immediate = true, enabled = true) | 52 | +@Component(immediate = true) |
| 53 | public class DistributedLeadershipStore | 53 | public class DistributedLeadershipStore |
| 54 | extends AbstractStore<LeadershipEvent, LeadershipStoreDelegate> | 54 | extends AbstractStore<LeadershipEvent, LeadershipStoreDelegate> |
| 55 | implements LeadershipStore { | 55 | implements LeadershipStore { | ... | ... |
| ... | @@ -90,7 +90,7 @@ import static org.onosproject.security.AppPermission.Type.CLUSTER_WRITE; | ... | @@ -90,7 +90,7 @@ import static org.onosproject.security.AppPermission.Type.CLUSTER_WRITE; |
| 90 | /** | 90 | /** |
| 91 | * Netty based MessagingService. | 91 | * Netty based MessagingService. |
| 92 | */ | 92 | */ |
| 93 | -@Component(immediate = true, enabled = true) | 93 | +@Component(immediate = true) |
| 94 | @Service | 94 | @Service |
| 95 | public class NettyMessagingManager implements MessagingService { | 95 | public class NettyMessagingManager implements MessagingService { |
| 96 | 96 | ... | ... |
| ... | @@ -48,7 +48,7 @@ import com.google.common.collect.Maps; | ... | @@ -48,7 +48,7 @@ import com.google.common.collect.Maps; |
| 48 | * ApplicationIdStore implementation on top of {@code AtomicCounter} | 48 | * ApplicationIdStore implementation on top of {@code AtomicCounter} |
| 49 | * and {@code ConsistentMap} primitives. | 49 | * and {@code ConsistentMap} primitives. |
| 50 | */ | 50 | */ |
| 51 | -@Component(immediate = true, enabled = true) | 51 | +@Component(immediate = true) |
| 52 | @Service | 52 | @Service |
| 53 | public class DistributedApplicationIdStore implements ApplicationIdStore { | 53 | public class DistributedApplicationIdStore implements ApplicationIdStore { |
| 54 | 54 | ... | ... |
| ... | @@ -36,7 +36,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -36,7 +36,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 36 | /** | 36 | /** |
| 37 | * Implementation of {@code IdBlockStore} using {@code AtomicCounter}. | 37 | * Implementation of {@code IdBlockStore} using {@code AtomicCounter}. |
| 38 | */ | 38 | */ |
| 39 | -@Component(immediate = true, enabled = true) | 39 | +@Component(immediate = true) |
| 40 | @Service | 40 | @Service |
| 41 | public class DistributedIdBlockStore implements IdBlockStore { | 41 | public class DistributedIdBlockStore implements IdBlockStore { |
| 42 | 42 | ... | ... |
| ... | @@ -36,7 +36,7 @@ import static org.onosproject.security.AppPermission.Type.CLOCK_WRITE; | ... | @@ -36,7 +36,7 @@ import static org.onosproject.security.AppPermission.Type.CLOCK_WRITE; |
| 36 | /** | 36 | /** |
| 37 | * LogicalClockService implementation based on a {@link AtomicCounter}. | 37 | * LogicalClockService implementation based on a {@link AtomicCounter}. |
| 38 | */ | 38 | */ |
| 39 | -@Component(immediate = true, enabled = true) | 39 | +@Component(immediate = true) |
| 40 | @Service | 40 | @Service |
| 41 | public class LogicalClockManager implements LogicalClockService { | 41 | public class LogicalClockManager implements LogicalClockService { |
| 42 | 42 | ||
| ... | @@ -64,4 +64,4 @@ public class LogicalClockManager implements LogicalClockService { | ... | @@ -64,4 +64,4 @@ public class LogicalClockManager implements LogicalClockService { |
| 64 | checkPermission(CLOCK_WRITE); | 64 | checkPermission(CLOCK_WRITE); |
| 65 | return new LogicalTimestamp(atomicCounter.incrementAndGet()); | 65 | return new LogicalTimestamp(atomicCounter.incrementAndGet()); |
| 66 | } | 66 | } |
| 67 | -} | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 67 | +} | ... | ... |
| ... | @@ -106,7 +106,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -106,7 +106,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 106 | /** | 106 | /** |
| 107 | * Manages inventory of flow rules using a distributed state management protocol. | 107 | * Manages inventory of flow rules using a distributed state management protocol. |
| 108 | */ | 108 | */ |
| 109 | -@Component(immediate = true, enabled = true) | 109 | +@Component(immediate = true) |
| 110 | @Service | 110 | @Service |
| 111 | public class DistributedFlowRuleStore | 111 | public class DistributedFlowRuleStore |
| 112 | extends AbstractStore<FlowRuleBatchEvent, FlowRuleStoreDelegate> | 112 | extends AbstractStore<FlowRuleBatchEvent, FlowRuleStoreDelegate> | ... | ... |
| ... | @@ -50,7 +50,7 @@ import java.util.concurrent.LinkedBlockingQueue; | ... | @@ -50,7 +50,7 @@ import java.util.concurrent.LinkedBlockingQueue; |
| 50 | /** | 50 | /** |
| 51 | * Manages the inventory of created next groups. | 51 | * Manages the inventory of created next groups. |
| 52 | */ | 52 | */ |
| 53 | -@Component(immediate = true, enabled = true) | 53 | +@Component(immediate = true) |
| 54 | @Service | 54 | @Service |
| 55 | public class DistributedFlowObjectiveStore | 55 | public class DistributedFlowObjectiveStore |
| 56 | extends AbstractStore<ObjectiveEvent, FlowObjectiveStoreDelegate> | 56 | extends AbstractStore<ObjectiveEvent, FlowObjectiveStoreDelegate> | ... | ... |
| ... | @@ -41,7 +41,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -41,7 +41,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 41 | * A collection that maps Intent IDs as keys to values as Intent IDs, | 41 | * A collection that maps Intent IDs as keys to values as Intent IDs, |
| 42 | * where each key may associated with multiple values without duplication. | 42 | * where each key may associated with multiple values without duplication. |
| 43 | */ | 43 | */ |
| 44 | -@Component(immediate = true, enabled = true) | 44 | +@Component(immediate = true) |
| 45 | @Service | 45 | @Service |
| 46 | @Beta | 46 | @Beta |
| 47 | public class ConsistentIntentSetMultimap implements IntentSetMultimap { | 47 | public class ConsistentIntentSetMultimap implements IntentSetMultimap { | ... | ... |
| ... | @@ -63,7 +63,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -63,7 +63,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 63 | */ | 63 | */ |
| 64 | //FIXME we should listen for leadership changes. if the local instance has just | 64 | //FIXME we should listen for leadership changes. if the local instance has just |
| 65 | // ... become a leader, scan the pending map and process those | 65 | // ... become a leader, scan the pending map and process those |
| 66 | -@Component(immediate = true, enabled = true) | 66 | +@Component(immediate = true) |
| 67 | @Service | 67 | @Service |
| 68 | public class GossipIntentStore | 68 | public class GossipIntentStore |
| 69 | extends AbstractStore<IntentEvent, IntentStoreDelegate> | 69 | extends AbstractStore<IntentEvent, IntentStoreDelegate> | ... | ... |
| ... | @@ -92,7 +92,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -92,7 +92,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
| 92 | /** | 92 | /** |
| 93 | * Manages the inventory of links using a {@code EventuallyConsistentMap}. | 93 | * Manages the inventory of links using a {@code EventuallyConsistentMap}. |
| 94 | */ | 94 | */ |
| 95 | -@Component(immediate = true, enabled = true) | 95 | +@Component(immediate = true) |
| 96 | @Service | 96 | @Service |
| 97 | public class ECLinkStore | 97 | public class ECLinkStore |
| 98 | extends AbstractStore<LinkEvent, LinkStoreDelegate> | 98 | extends AbstractStore<LinkEvent, LinkStoreDelegate> | ... | ... |
| ... | @@ -70,7 +70,7 @@ import com.google.common.collect.Maps; | ... | @@ -70,7 +70,7 @@ import com.google.common.collect.Maps; |
| 70 | /** | 70 | /** |
| 71 | * Implementation of the MastershipStore on top of Leadership Service. | 71 | * Implementation of the MastershipStore on top of Leadership Service. |
| 72 | */ | 72 | */ |
| 73 | -@Component(immediate = true, enabled = true) | 73 | +@Component(immediate = true) |
| 74 | @Service | 74 | @Service |
| 75 | public class ConsistentDeviceMastershipStore | 75 | public class ConsistentDeviceMastershipStore |
| 76 | extends AbstractStore<MastershipEvent, MastershipStoreDelegate> | 76 | extends AbstractStore<MastershipEvent, MastershipStoreDelegate> | ... | ... |
| ... | @@ -66,7 +66,7 @@ import com.google.common.util.concurrent.Futures; | ... | @@ -66,7 +66,7 @@ import com.google.common.util.concurrent.Futures; |
| 66 | * Implementation for {@code StorageService} and {@code StorageAdminService}. | 66 | * Implementation for {@code StorageService} and {@code StorageAdminService}. |
| 67 | */ | 67 | */ |
| 68 | @Service | 68 | @Service |
| 69 | -@Component(immediate = true, enabled = true) | 69 | +@Component(immediate = true) |
| 70 | public class StorageManager implements StorageService, StorageAdminService { | 70 | public class StorageManager implements StorageService, StorageAdminService { |
| 71 | 71 | ||
| 72 | private final Logger log = getLogger(getClass()); | 72 | private final Logger log = getLogger(getClass()); | ... | ... |
-
Please register or login to post a comment