<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
<!-- Testing dependencies -->
<dependency>
*/
package org.opendaylight.transportpce.common.mapping;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.List;
import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOtsiOtsigroup;
import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-public class MappingUtilsImpl implements MappingUtils {
+@Component
+public final class MappingUtilsImpl implements MappingUtils {
private static final Logger LOG = LoggerFactory.getLogger(MappingUtilsImpl.class);
- private final DataBroker dataBroker;
-
private static final ImmutableMap<String, SupportedIfCapability> CAP_TYPE_MAP =
ImmutableMap.<String, SupportedIfCapability>builder()
.put("If400GE{qname=(http://org/openroadm/port/types?revision=2020-03-27)if-400GE}", If400GE.VALUE)
If100GEODU4.VALUE)
.build();
- public MappingUtilsImpl(DataBroker dataBroker) {
-
- this.dataBroker = dataBroker;
+ private final DataBroker dataBroker;
+ @Activate
+ public MappingUtilsImpl(@Reference DataBroker dataBroker) {
+ this.dataBroker = requireNonNull(dataBroker);
}
public String getOpenRoadmVersion(String nodeId) {
<reference id="mountPointService" interface="org.opendaylight.mdsal.binding.api.MountPointService" />
<reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />
+ <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
<bean id="deviceTransactionManager" class="org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl"
destroy-method="preDestroy" >
<argument value="15000" />
</bean>
- <bean id="mappingUtils" class="org.opendaylight.transportpce.common.mapping.MappingUtilsImpl" >
- <argument ref="dataBroker" />
- </bean>
-
<bean id="openRoadmInterfaces121" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121" >
<argument ref="deviceTransactionManager" />
</bean>
<service ref="crossConnectImpl" interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
- <service ref="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
-
</blueprint>