Migrate boolean getters 09/94309/12
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 29 Dec 2020 12:47:55 +0000 (13:47 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 31 Dec 2020 00:19:03 +0000 (01:19 +0100)
DataObject.isFoo() is now deprecated, use getFoo() instead. There
is also a bunch of drive-by updates to expressiveness, fixing various
(bogus) Eclipse warnings.

Tests relying on explicit order are documented as such and refactored
for clarity.

Change-Id: I40285b7a226a1b23c578badea78a80158325a561
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
193 files changed:
algo/algo-impl/src/main/java/org/opendaylight/algo/impl/AbstractPathComputation.java
bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/extended/communities/ESILabelExtCom.java
bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/extended/communities/Layer2AttributesExtCom.java
bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/extended/communities/MACMobExtCom.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSDestinationPortHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSDscpHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSIcmpCodeHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSIcmpTypeHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSIpProtocolHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSIpv6FlowLabelHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSIpv6NextHeaderHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSPacketLengthHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSPortHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSSourcePortHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FSTcpFlagsHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/RedirectIpNextHopEcHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/TrafficActionEcHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractFSFragmentHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractNumericOperandParser.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/BitmaskOperandParser.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FSIpv4FragmentHandler.java
bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/FSIpv6FragmentHandler.java
bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/codec/Ipv6BgpPrefixSidParser.java
bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/Ipv6BgpPrefixSidParserTest.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/NodeAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/PrefixAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/BindingSidLabelParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/RangeTlvParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrNodeAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrPrefixAttributesParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/BackupUnnumberedParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4BackupEro.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6BackupEro.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6EroParser.java
bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/UnnumberedEroParser.java
bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/NonTransitiveAttributesFilterHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/SetExtCommunityHandler.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializer.java
bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtil.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateGraphBuilder.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java
bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherUtil.java
bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java
bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java
bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java
bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
pcep/auto-bandwidth-extension/src/main/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/BandwidthUsageObjectCodec.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPccIdReqObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractPceIdObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractVendorInformationObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPBandwidthObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPCloseObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPErrorObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExcludeRouteObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPGlobalConstraintsObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPIncludeRouteObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLoadBalancingObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPLspaObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMetricObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPMonitoringObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNotificationObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPObjectiveFunctionObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOverloadObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPathKeyObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPProcTimeObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPSecondaryExplicitRouteObjecParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPSecondaryRecordRouteObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPSvecObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/bnc/BNCUtil.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/bnc/BranchNodeListObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/bnc/NonBranchNodeListObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv4ObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv6ObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsObjectSerializer.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv4ObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv6ObjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv4UnreachDestinationParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv6UnreachDestinationParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPUnreachDestinationSerializer.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROAsNumberSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROExplicitExclusionRouteSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROUnnumberedInterfaceSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROUnnumberedInterfaceSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROAsNumberSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey128SubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROPathKey32SubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSrlgSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROUnnumberedInterfaceSubobjectParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/tlv/NoPathVectorTlvParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated/InitiatedLspObjectParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated/InitiatedPCInitiateMessageParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated/InitiatedSrpObjectParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated/InitiatedStatefulCapabilityTlvParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/PCEPStatefulCapability.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/PathBindingTlvParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulErrorMessageParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulLspObjectParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulPCReportMessageParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulPCUpdateRequestMessageParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulRSVPErrorSpecTlvParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulSrpObjectParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful/StatefulStatefulCapabilityTlvParser.java
pcep/ietf-stateful/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsCapabilityTlvParser.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrPceCapabilityTlvParser.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractEROPathKeySubobjectParser.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationObjectRegistry.java
pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java
pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListener.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java
pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListenerTest.java
pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImpl.java
pcep/topology/topology-stats/src/test/java/org/opendaylight/bgpcep/pcep/topology/stats/rpc/TopologyStatsRpcServiceImplTest.java
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java
pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java
pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java
pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROAsNumberSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROExplicitExclusionRouteSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROIpv4PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROIpv6PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROLabelSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROPathKey32SubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROUnnumberedInterfaceSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/SEROBasicProtectionSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/SERODynamicProtectionSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROIpv4PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROIpv6PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROLabelSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROUnnumberedInterfaceSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROAsNumberSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROIpv4PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROIpv6PrefixSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROPathKey32SubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROSrlgSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/xro/XROUnnumberedInterfaceSubobjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AdminStatusObjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/MetricObjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/ProtectionCommonParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/SecondaryRecordRouteObjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/SessionAttributeLspObjectParser.java
rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/SessionAttributeLspRaObjectParser.java

index 1da3eda4b2474a26e9cbe3c382c1fea1394aed1b..297000cc6a3e535e9aeded6ec8b2f0198b249a68 100644 (file)
@@ -45,13 +45,11 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
     protected PathConstraints constraints = null;
 
     /* Priority Queue and HashMap to manage path computation */
-    protected PriorityQueue<CspfPath> priorityQueue;
-    protected HashMap<Long, CspfPath> processedPath;
+    protected final PriorityQueue<CspfPath> priorityQueue = new PriorityQueue<>();
+    protected final HashMap<Long, CspfPath> processedPath = new HashMap<>();
 
-    protected AbstractPathComputation(ConnectedGraph graph) {
+    protected AbstractPathComputation(final ConnectedGraph graph) {
         this.graph = graph;
-        priorityQueue = new PriorityQueue<CspfPath>();
-        processedPath = new HashMap<Long, CspfPath>();
     }
 
     /**
@@ -66,7 +64,7 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
      * @return Constrained Path Builder with status set to 'OnGoing' if
      *         initialization success, 'Failed' otherwise
      */
-    protected ConstrainedPathBuilder initializePathComputation(VertexKey src, VertexKey dst) {
+    protected ConstrainedPathBuilder initializePathComputation(final VertexKey src, final VertexKey dst) {
         ConstrainedPathBuilder cpathBuilder = new ConstrainedPathBuilder().setStatus(ComputationStatus.InProgress);
 
         /* Check that source and destination vertexKey are not identical */
@@ -120,7 +118,7 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
      *
      * @return True if Edge must be prune, False if Edge must be keep
      */
-    protected boolean pruneEdge(ConnectedEdge edge, CspfPath path) {
+    protected boolean pruneEdge(final ConnectedEdge edge, final CspfPath path) {
         /* Check that Constraints are initialized */
         if (constraints == null) {
             LOG.warn("Constraints not set");
@@ -128,7 +126,7 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
         }
 
         /* Edge could point to an unknown Vertex e.g. with inter-domain link */
-        if ((edge.getDestination() == null) || (edge.getDestination().getVertex() == null)) {
+        if (edge.getDestination() == null || edge.getDestination().getVertex() == null) {
             LOG.debug("No Destination");
             return true;
         }
@@ -143,15 +141,15 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
         /* Check that Edge belongs to the requested address family */
         switch (constraints.getAddressFamily()) {
             case Ipv4:
-                if ((attributes.getRemoteAddress() == null)
-                        || (attributes.getRemoteAddress().getIpv4Address() == null)) {
+                if (attributes.getRemoteAddress() == null
+                        || attributes.getRemoteAddress().getIpv4Address() == null) {
                     LOG.debug("No Ipv4 address");
                     return true;
                 }
                 break;
             case Ipv6:
-                if ((attributes.getRemoteAddress() == null)
-                        || (attributes.getRemoteAddress().getIpv6Address() == null)) {
+                if (attributes.getRemoteAddress() == null
+                        || attributes.getRemoteAddress().getIpv6Address() == null) {
                     LOG.debug("No Ipv6 address");
                     return true;
                 }
@@ -221,17 +219,17 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
 
         /* Check that Edge respect Loss constraint */
         if (constraints.getLoss() != null) {
-            if ((attributes.getLoss() == null)
-                    || (attributes.getLoss().getValue().intValue() > constraints.getLoss().getValue().intValue())) {
+            if (attributes.getLoss() == null
+                    || attributes.getLoss().getValue().intValue() > constraints.getLoss().getValue().intValue()) {
                 return true;
             }
         }
 
         /* Check that Edge meet Bandwidth constraint */
         if (constraints.getBandwidth() != null) {
-            if ((attributes.getMaxLinkBandwidth() == null) || (attributes.getMaxResvLinkBandwidth() == null)
-                    || (attributes.getUnreservedBandwidth() == null)
-                    || (attributes.getUnreservedBandwidth().get(constraints.getClassType().intValue()) == null)) {
+            if (attributes.getMaxLinkBandwidth() == null || attributes.getMaxResvLinkBandwidth() == null
+                    || attributes.getUnreservedBandwidth() == null
+                    || attributes.getUnreservedBandwidth().get(constraints.getClassType().intValue()) == null) {
                 return true;
             } else {
                 Long bandwidth = constraints.getBandwidth().getValue().longValue();
@@ -251,8 +249,8 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
         }
 
         /* Check that Edge belongs to admin group */
-        if ((constraints.getAdminGroup() != null)
-                && !(constraints.getAdminGroup().equals(attributes.getAdminGroup()))) {
+        if (constraints.getAdminGroup() != null
+                && !constraints.getAdminGroup().equals(attributes.getAdminGroup())) {
             LOG.debug("Not in the requested admin-group");
             return true;
         }
@@ -271,11 +269,11 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
      * @return MPLS Label if Connected Vertex is Segment Routing aware, Null
      *         otherwise
      */
-    protected @Nullable MplsLabel getIpv4NodeSid(ConnectedVertex cvertex) {
+    protected @Nullable MplsLabel getIpv4NodeSid(final ConnectedVertex cvertex) {
         /*
          * Check that Vertex is Segment Routing aware
          */
-        if ((cvertex.getVertex() == null) || (cvertex.getVertex().getSrgb() == null)) {
+        if (cvertex.getVertex() == null || cvertex.getVertex().getSrgb() == null) {
             return null;
         }
         /*
@@ -286,10 +284,10 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
             return null;
         }
         for (Prefix prefix : cvertex.getPrefixes()) {
-            if ((prefix.getPrefixSid() == null) || (prefix.isNodeSid() == null)) {
+            if (prefix.getPrefixSid() == null || prefix.getNodeSid() == null) {
                 continue;
             }
-            if (prefix.isNodeSid() && prefix.getPrefix().getIpv4Prefix() != null) {
+            if (prefix.getNodeSid() && prefix.getPrefix().getIpv4Prefix() != null) {
                 return new MplsLabel(Uint32.valueOf(prefix.getPrefixSid().intValue()));
             }
         }
@@ -303,11 +301,11 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
      * @return MPLS Label if Connected Vertex is Segment Routing aware, Null
      *         otherwise
      */
-    protected @Nullable MplsLabel getIpv6NodeSid(ConnectedVertex cvertex) {
+    protected @Nullable MplsLabel getIpv6NodeSid(final ConnectedVertex cvertex) {
         /*
          * Check that Vertex is Segment Routing aware
          */
-        if ((cvertex.getVertex() == null) || (cvertex.getVertex().getSrgb() == null)) {
+        if (cvertex.getVertex() == null || cvertex.getVertex().getSrgb() == null) {
             return null;
         }
         /*
@@ -318,10 +316,10 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
             return null;
         }
         for (Prefix prefix : cvertex.getPrefixes()) {
-            if ((prefix.getPrefixSid() == null) || (prefix.isNodeSid() == null)) {
+            if (prefix.getPrefixSid() == null || prefix.getNodeSid() == null) {
                 continue;
             }
-            if (prefix.isNodeSid() && prefix.getPrefix().getIpv6Prefix() != null) {
+            if (prefix.getNodeSid() && prefix.getPrefix().getIpv6Prefix() != null) {
                 return new MplsLabel(Uint32.valueOf(prefix.getPrefixSid().intValue()));
             }
         }
@@ -337,8 +335,8 @@ public abstract class AbstractPathComputation implements PathComputationAlgorith
      *
      * @return Path Description
      */
-    protected List<PathDescription> getPathDescription(List<ConnectedEdge> edges) {
-        ArrayList<PathDescription> list = new ArrayList<PathDescription>();
+    protected List<PathDescription> getPathDescription(final List<ConnectedEdge> edges) {
+        ArrayList<PathDescription> list = new ArrayList<>();
 
         for (ConnectedEdge edge : edges) {
             PathDescription pathDesc = null;
index 1d9e8d34ddf9b079b27a84869eab284f14595b6a..a79e515107a732d8bf58ebd76971053690c53aaa 100644 (file)
@@ -87,7 +87,7 @@ final class NeighborStateCliUtils {
                 .augmentation(NeighborAfiSafiStateAugmentation.class);
         addHeader(table, "AFI state");
         table.addRow().addContent("Family", afiSafi.getAfiSafiName().getSimpleName());
-        table.addRow().addContent("Active", state.isActive());
+        table.addRow().addContent("Active", state.getActive());
         final Prefixes prefixes = state.getPrefixes();
         if (prefixes == null) {
             return;
index d6e033e75ac97b1590e68e182e3a378121ca27a2..da525d1e0e302ea2368fb86cdce6262a6ed367fa 100644 (file)
@@ -42,7 +42,7 @@ public final class ESILabelExtCom extends AbstractExtendedCommunities {
             "The extended community %s is not EsiLabelExtendedCommunityCaseCase type.", extendedCommunity);
         final EsiLabelExtendedCommunity extCom = ((EsiLabelExtendedCommunityCase) extendedCommunity)
                 .getEsiLabelExtendedCommunity();
-        byteAggregator.writeBoolean(extCom.isSingleActiveMode());
+        byteAggregator.writeBoolean(extCom.getSingleActiveMode());
         byteAggregator.writeZero(RESERVED);
         byteAggregator.writeBytes(byteBufForMplsLabel(extCom.getEsiLabel()));
     }
index cfc1beb31e526a50f13daacdbdd0a289c5da4f6c..e7cd5e6ff68bd4a3a88d02b3d7aa2dc32926588b 100644 (file)
@@ -66,9 +66,9 @@ public class Layer2AttributesExtCom extends AbstractExtendedCommunities {
         final Layer2AttributesExtendedCommunity extCom = ((Layer2AttributesExtendedCommunityCase) extendedCommunity)
                 .getLayer2AttributesExtendedCommunity();
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(PRIMARY_PE_OFFSET, extCom.isPrimaryPe());
-        flags.set(BACKUP_PE_OFFSET, extCom.isBackupPe());
-        flags.set(CONTROL_WORD_OFFSET, extCom.isControlWord());
+        flags.set(PRIMARY_PE_OFFSET, extCom.getPrimaryPe());
+        flags.set(BACKUP_PE_OFFSET, extCom.getBackupPe());
+        flags.set(CONTROL_WORD_OFFSET, extCom.getControlWord());
 
         final byte[] res = flags.array();
         byte aux = 0;
index c788e765184f001e782c3577202034f4486887ea..a651a588724c405cc255fda70649acff6fc8e290 100644 (file)
@@ -41,7 +41,7 @@ public final class MACMobExtCom extends AbstractExtendedCommunities {
             "The extended community %s is not MacMobilityExtendedCommunityCase type.", extendedCommunity);
         final MacMobilityExtendedCommunity extCom = ((MacMobilityExtendedCommunityCase) extendedCommunity)
                 .getMacMobilityExtendedCommunity();
-        byteAggregator.writeBoolean(extCom.isStatic());
+        byteAggregator.writeBoolean(extCom.getStatic());
         byteAggregator.writeZero(RESERVED);
         byteAggregator.writeInt(extCom.getSeqNumber().intValue());
     }
index 7857e0e938e73a4527f234f6bfec066a6ef06a9f..6572a68bf98b982b1037c0a697f9021a00294153 100644 (file)
@@ -530,16 +530,16 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
 
     private static String stringFragment(final Fragment fragment) {
         final StringBuilder buffer = new StringBuilder();
-        if (fragment.isDoNot()) {
+        if (fragment.getDoNot()) {
             buffer.append("'DO NOT' ");
         }
-        if (fragment.isFirst()) {
+        if (fragment.getFirst()) {
             buffer.append("'IS FIRST' ");
         }
-        if (fragment.isLast()) {
+        if (fragment.getLast()) {
             buffer.append("'IS LAST' ");
         }
-        if (fragment.isIsA()) {
+        if (fragment.getIsA()) {
             buffer.append("'IS A' ");
         }
         return buffer.toString();
index a0b5d307576f01b242858c8b323771a7d8944c9e..b223d8f2d7b95c51fb1a41ff5998ba7043535d70 100644 (file)
@@ -30,14 +30,14 @@ public final class FSDestinationPortHandler implements FlowspecTypeParser, Flows
     public static final int DESTINATION_PORT_VALUE = 5;
 
     @Override
-    public void serializeType(FlowspecType fsType, ByteBuf output) {
+    public void serializeType(final FlowspecType fsType, final ByteBuf output) {
         Preconditions.checkArgument(fsType instanceof DestinationPortCase, "DestinationPortCase class is mandatory!");
         output.writeByte(DESTINATION_PORT_VALUE);
         NumericTwoByteOperandParser.INSTANCE.serialize(((DestinationPortCase) fsType).getDestinationPorts(), output);
     }
 
     @Override
-    public FlowspecType parseType(ByteBuf buffer) {
+    public FlowspecType parseType(final ByteBuf buffer) {
         requireNonNull(buffer, "input buffer is null, missing data to parse.");
         return new DestinationPortCaseBuilder().setDestinationPorts(parseDestinationPort(buffer)).build();
     }
@@ -53,7 +53,7 @@ public final class FSDestinationPortHandler implements FlowspecTypeParser, Flows
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToInt(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             ports.add(builder.build());
         }
         return ports;
index b8ec04aa522c00b0eb66395572d296a98b27fe84..22ed1e43f4773687f3ee7561323af6e70b9a7af5 100644 (file)
@@ -48,7 +48,7 @@ public final class FSDscpHandler implements FlowspecTypeParser, FlowspecTypeSeri
             final NumericOperand op = NumericOneByteOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(new Dscp(ByteBufUtils.readUint8(nlri)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             dscps.add(builder.build());
         }
         return dscps;
index 557ab3615a7e3386784ef35318882b624ca5af85..b26dca47da061a8b890adef71637eff61bdb3a47 100644 (file)
@@ -50,7 +50,7 @@ public final class FSIcmpCodeHandler implements FlowspecTypeParser, FlowspecType
             final NumericOperand op = NumericOneByteOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(ByteBufUtils.readUint8(nlri));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             codes.add(builder.build());
         }
         return codes;
index 040f8f8edde0886fd5cd298a48a865cd9006bad6..65511c07d15f66c298a5a435ae3bc4e7743c5dc0 100644 (file)
@@ -50,7 +50,7 @@ public final class FSIcmpTypeHandler implements FlowspecTypeParser, FlowspecType
             final NumericOperand op = NumericOneByteOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(ByteBufUtils.readUint8(nlri));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             icmps.add(builder.build());
         }
         return icmps;
index 152f74946a95634588091e6022d8b0e8ad8dd94b..42aaa75073483292c85e83f53e2ccc60a07eb6a3 100644 (file)
@@ -50,7 +50,7 @@ public final class FSIpProtocolHandler implements FlowspecTypeParser, FlowspecTy
             final NumericOperand op = NumericOneByteOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(ByteBufUtils.readUint8(nlri));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             ips.add(builder.build());
         }
         return ips;
index e5333c899d254e589778ee9e7fc8fbf90ab0c1c7..0264dff8acb5fefed37e6d8c2fe8b831ef5d0043 100644 (file)
@@ -63,7 +63,7 @@ public final class FSIpv6FlowLabelHandler implements FlowspecTypeParser, Flowspe
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToLong(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             labels.add(builder.build());
         }
         return labels;
index 95cd18c750d30ae0a83516a3deb0748ebbe2767d..204872e0a07781030618ba58924eb04f6b426795 100644 (file)
@@ -50,7 +50,7 @@ public final class FSIpv6NextHeaderHandler implements FlowspecTypeParser, Flowsp
             final NumericOperand op = NumericOneByteOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(ByteBufUtils.readUint8(nlri));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             headers.add(builder.build());
         }
         return headers;
index 83f1c47aaecd83c97af93e4f7cf7c80daac5e04d..6e8355ff9fd895fc48f2c7583168d670e61965cc 100644 (file)
@@ -30,14 +30,14 @@ public final class FSPacketLengthHandler implements FlowspecTypeParser, Flowspec
     public static final int PACKET_LENGTH_VALUE = 10;
 
     @Override
-    public void serializeType(FlowspecType fsType, ByteBuf output) {
+    public void serializeType(final FlowspecType fsType, final ByteBuf output) {
         Preconditions.checkArgument(fsType instanceof PacketLengthCase, "PacketLengthCase class is mandatory!");
         output.writeByte(PACKET_LENGTH_VALUE);
         NumericTwoByteOperandParser.INSTANCE.serialize(((PacketLengthCase) fsType).getPacketLengths(), output);
     }
 
     @Override
-    public FlowspecType parseType(ByteBuf buffer) {
+    public FlowspecType parseType(final ByteBuf buffer) {
         requireNonNull(buffer, "input buffer is null, missing data to parse.");
         return new PacketLengthCaseBuilder().setPacketLengths(parsePacketLength(buffer)).build();
     }
@@ -53,7 +53,7 @@ public final class FSPacketLengthHandler implements FlowspecTypeParser, Flowspec
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToInt(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             packetLengths.add(builder.build());
         }
         return packetLengths;
index eba1bd1d99bd6e69778d047f00247973dcdc15e8..c60e0f8512387c7973fc24a7df5735491706d200 100644 (file)
@@ -30,14 +30,14 @@ public final class FSPortHandler implements FlowspecTypeParser, FlowspecTypeSeri
     public static final int PORT_VALUE = 4;
 
     @Override
-    public void serializeType(FlowspecType fsType, ByteBuf output) {
+    public void serializeType(final FlowspecType fsType, final ByteBuf output) {
         Preconditions.checkArgument(fsType instanceof PortCase, "PortCase class is mandatory!");
         output.writeByte(PORT_VALUE);
         NumericTwoByteOperandParser.INSTANCE.serialize(((PortCase) fsType).getPorts(), output);
     }
 
     @Override
-    public FlowspecType parseType(ByteBuf buffer) {
+    public FlowspecType parseType(final ByteBuf buffer) {
         requireNonNull(buffer, "input buffer is null, missing data to parse.");
         return new PortCaseBuilder().setPorts(parsePort(buffer)).build();
     }
@@ -53,7 +53,7 @@ public final class FSPortHandler implements FlowspecTypeParser, FlowspecTypeSeri
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToInt(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             ports.add(builder.build());
         }
         return ports;
index b9fcf1f73f05d2b12e3cefbdc67ffbf2c7272a23..6fdf88e105ec2b558b91f0c5ad0fdbd2aaf2d53e 100644 (file)
@@ -30,14 +30,14 @@ public final class FSSourcePortHandler implements FlowspecTypeParser, FlowspecTy
     public static final int SOURCE_PORT_VALUE = 6;
 
     @Override
-    public void serializeType(FlowspecType fsType, ByteBuf output) {
+    public void serializeType(final FlowspecType fsType, final ByteBuf output) {
         Preconditions.checkArgument(fsType instanceof SourcePortCase, "SourcePortCase class is mandatory!");
         output.writeByte(SOURCE_PORT_VALUE);
         NumericTwoByteOperandParser.INSTANCE.serialize(((SourcePortCase) fsType).getSourcePorts(), output);
     }
 
     @Override
-    public FlowspecType parseType(ByteBuf buffer) {
+    public FlowspecType parseType(final ByteBuf buffer) {
         requireNonNull(buffer, "input buffer is null, missing data to parse.");
         return new SourcePortCaseBuilder().setSourcePorts(parseSourcePort(buffer)).build();
     }
@@ -53,7 +53,7 @@ public final class FSSourcePortHandler implements FlowspecTypeParser, FlowspecTy
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToInt(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             ports.add(builder.build());
         }
         return ports;
index f59661edadf617f3c0ac8870f7e0fb859cd0f338..fafecac2637d08311a130839a7b6990e18302c81 100644 (file)
@@ -66,7 +66,7 @@ public final class FSTcpFlagsHandler implements FlowspecTypeParser, FlowspecType
             builder.setOp(op);
             final short length = AbstractOperandParser.parseLength(b);
             builder.setValue(ByteArray.bytesToInt(ByteArray.readBytes(nlri, length)));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             flags.add(builder.build());
         }
         return flags;
index 6cde1946f8aab49a8f63cde6dab3fd2117e2f53e..8124f127fccefaeaafd27e680d89f705df592519 100644 (file)
@@ -40,7 +40,7 @@ public class RedirectIpNextHopEcHandler implements ExtendedCommunityParser, Exte
         } else {
             Ipv6Util.writeIpv6Address(nextHopAddress.getIpv6AddressNoZone(), byteAggregator);
         }
-        byteAggregator.writeShort(Boolean.TRUE.equals(redirect.isCopy()) ? 1 : 0);
+        byteAggregator.writeShort(Boolean.TRUE.equals(redirect.getCopy()) ? 1 : 0);
     }
 
     @Override
index c0967473b739bce13d795d468f1d106db7bdff9a..834fbdd13b504996fdd9c026675bf0820270a9ff 100644 (file)
@@ -42,8 +42,8 @@ public class TrafficActionEcHandler implements ExtendedCommunityParser, Extended
                 .getTrafficActionExtendedCommunity();
         byteAggregator.writeZero(RESERVED);
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(SAMPLE_BIT, trafficAction.isSample());
-        flags.set(TERMINAL_BIT, trafficAction.isTerminalAction());
+        flags.set(SAMPLE_BIT, trafficAction.getSample());
+        flags.set(TERMINAL_BIT, trafficAction.getTerminalAction());
         flags.toByteBuf(byteAggregator);
     }
 
index 9d06fad2bbc20fa796e3f23ca194414d123e3336..8aac28219ae66a855b106102bf7df06673fed13a 100644 (file)
@@ -66,7 +66,7 @@ public abstract class AbstractFSFragmentHandler implements FlowspecTypeParser, F
             final BitmaskOperand op = BitmaskOperandParser.INSTANCE.parse(b);
             builder.setOp(op);
             builder.setValue(parseFragment(nlri.readByte()));
-            end = op.isEndOfList();
+            end = op.getEndOfList();
             fragments.add(builder.build());
         }
         return fragments;
index ccbc505ffd53fdecdb59aa6cc9bbc36f0dc9b590..e882b97eb11c8c9fa2b6de16825176f220a4e669 100644 (file)
@@ -48,10 +48,10 @@ public abstract class AbstractNumericOperandParser<N> extends AbstractOperandPar
             final boolean endOfList, final ByteBuf buffer) {
         final BitArray operandValues = new BitArray(OPERAND_LENGTH);
         operandValues.set(END_OF_LIST, endOfList);
-        operandValues.set(AND_BIT, operand.isAndBit());
-        operandValues.set(LESS_THAN, operand.isLessThan());
-        operandValues.set(GREATER_THAN, operand.isGreaterThan());
-        operandValues.set(EQUAL, operand.isEquals());
+        operandValues.set(AND_BIT, operand.getAndBit());
+        operandValues.set(LESS_THAN, operand.getLessThan());
+        operandValues.set(GREATER_THAN, operand.getGreaterThan());
+        operandValues.set(EQUAL, operand.getEquals());
         final byte byteLength = (byte) (Integer.numberOfTrailingZeros(length) << LENGTH_SHIFT);
         buffer.writeByte(operandValues.toByte() | byteLength);
     }
@@ -79,26 +79,26 @@ public abstract class AbstractNumericOperandParser<N> extends AbstractOperandPar
     @Override
     public String toString(final NumericOperand operand, final boolean isFirst) {
         final StringBuilder buffer = new StringBuilder();
-        if (operand.isAndBit()) {
+        if (operand.getAndBit()) {
             buffer.append("and ");
         } else if (!isFirst) {
             buffer.append("or ");
         }
-        if (operand.isLessThan()) {
+        if (operand.getLessThan()) {
             buffer.append("is less than ");
-            if (operand.isEquals()) {
+            if (operand.getEquals()) {
                 buffer.append("or equals to ");
             }
             return buffer.toString();
         }
-        if (operand.isGreaterThan()) {
+        if (operand.getGreaterThan()) {
             buffer.append("is greater than ");
-            if (operand.isEquals()) {
+            if (operand.getEquals()) {
                 buffer.append("or equals to ");
             }
             return buffer.toString();
         }
-        if (operand.isEquals()) {
+        if (operand.getEquals()) {
             buffer.append("equals to ");
         }
         return buffer.toString();
index 6a483e62f0edaf0244957400d023086c1ae9ad26..d6311a3c703fd288c866cef5eadd72b4ef02ade4 100644 (file)
@@ -51,9 +51,9 @@ public final class BitmaskOperandParser extends AbstractOperandParser<BitmaskOpe
             final ByteBuf buffer) {
         final BitArray bs = new BitArray(OPERAND_LENGTH);
         bs.set(END_OF_LIST, endOfList);
-        bs.set(AND_BIT, op.isAndBit());
-        bs.set(MATCH, op.isMatch());
-        bs.set(NOT, op.isNot());
+        bs.set(AND_BIT, op.getAndBit());
+        bs.set(MATCH, op.getMatch());
+        bs.set(NOT, op.getNot());
         final byte len = (byte) (Integer.numberOfTrailingZeros(length) << LENGTH_SHIFT);
         buffer.writeByte(bs.toByte() | len);
     }
@@ -67,19 +67,19 @@ public final class BitmaskOperandParser extends AbstractOperandParser<BitmaskOpe
     @Override
     public String toString(final BitmaskOperand op, final boolean isFirst) {
         final StringBuilder buffer = new StringBuilder();
-        if (!op.isAndBit() && !isFirst) {
+        if (!op.getAndBit() && !isFirst) {
             buffer.append("or ");
         }
-        if (op.isAndBit()) {
+        if (op.getAndBit()) {
             buffer.append("and ");
         }
-        if (op.isMatch()) {
+        if (op.getMatch()) {
             buffer.append("does ");
-            if (op.isNot()) {
+            if (op.getNot()) {
                 buffer.append("not ");
             }
             buffer.append("match ");
-        } else if (op.isNot()) {
+        } else if (op.getNot()) {
             buffer.append("is not ");
         }
         return buffer.toString();
index 3a3f97b92fbf8b144b4d987448b2261f914beb56..a35ffe0dd6b938399cbe49d029a88bf86f6f989b 100644 (file)
@@ -22,10 +22,10 @@ public class FSIpv4FragmentHandler extends AbstractFSFragmentHandler {
     @Override
     protected final byte serializeFragment(final Fragment fragment) {
         final BitArray bs = new BitArray(Byte.SIZE);
-        bs.set(DONT_FRAGMENT, fragment.isDoNot());
-        bs.set(FIRST_FRAGMENT, fragment.isFirst());
-        bs.set(IS_A_FRAGMENT, fragment.isIsA());
-        bs.set(LAST_FRAGMENT, fragment.isLast());
+        bs.set(DONT_FRAGMENT, fragment.getDoNot());
+        bs.set(FIRST_FRAGMENT, fragment.getFirst());
+        bs.set(IS_A_FRAGMENT, fragment.getIsA());
+        bs.set(LAST_FRAGMENT, fragment.getLast());
         return bs.toByte();
     }
 }
index c7a72960afcc947739c67138ab4f1aae84aeb044..25e02f343ba4c39fef4f8988644b2c342f8081db 100644 (file)
@@ -22,9 +22,9 @@ public class FSIpv6FragmentHandler extends AbstractFSFragmentHandler {
     protected final byte serializeFragment(final Fragment fragment) {
         final BitArray bs = new BitArray(Byte.SIZE);
         bs.set(DONT_FRAGMENT, Boolean.FALSE);
-        bs.set(FIRST_FRAGMENT, fragment.isFirst());
-        bs.set(IS_A_FRAGMENT, fragment.isIsA());
-        bs.set(LAST_FRAGMENT, fragment.isLast());
+        bs.set(FIRST_FRAGMENT, fragment.getFirst());
+        bs.set(IS_A_FRAGMENT, fragment.getIsA());
+        bs.set(LAST_FRAGMENT, fragment.getLast());
         return bs.toByte();
     }
 }
index be86f283fb0b5149cb0c83787fdd0b9a1bc31e5a..1309aca80fe27c81152c65903f1311aa662f1af0 100644 (file)
@@ -29,7 +29,7 @@ public final class Ipv6BgpPrefixSidParser implements BgpPrefixSidTlvParser, BgpP
         final Ipv6SidTlv ipv6Tlv = (Ipv6SidTlv) tlv;
         bytes.writeZero(RESERVED);
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(PROCESS_IPV6_HEADER_FLAG, ipv6Tlv.isProcessIpv6HeadAbility());
+        flags.set(PROCESS_IPV6_HEADER_FLAG, ipv6Tlv.getProcessIpv6HeadAbility());
         flags.toByteBuf(bytes);
     }
 
index d643f7411b503d40b4d85a3bbf95a7b977dfd3d4..1507f3632c0b7ac66b9287be9ebf4dc787696edd 100644 (file)
@@ -36,7 +36,7 @@ public final class Ipv6BgpPrefixSidParserTest {
         final ByteBuf serialized = Unpooled.buffer(3);
         this.handler.serializeBgpPrefixSidTlv(tlv.build(), serialized);
         assertArrayEquals(this.expected, serialized.array());
-        assertTrue(this.handler.parseBgpPrefixSidTlv(serialized).isProcessIpv6HeadAbility());
+        assertTrue(this.handler.parseBgpPrefixSidTlv(serialized).getProcessIpv6HeadAbility());
     }
 
     @Test
index 6048a671c62bccbc89733e5a0aa8ed83afd037df..217cb49d2f04696f8515534d7bf51edb656c1208 100644 (file)
@@ -373,8 +373,8 @@ public final class LinkAttributesParser {
         if (mplsProtocolMask != null) {
             final ByteBuf mplsProtocolMaskBuf = Unpooled.buffer(1);
             final BitArray mask = new BitArray(FLAGS_SIZE);
-            mask.set(LDP_BIT, mplsProtocolMask.isLdp());
-            mask.set(RSVP_BIT, mplsProtocolMask.isRsvpte());
+            mask.set(LDP_BIT, mplsProtocolMask.getLdp());
+            mask.set(RSVP_BIT, mplsProtocolMask.getRsvpte());
             mask.toByteBuf(mplsProtocolMaskBuf);
             TlvUtil.writeTLV(MPLS_PROTOCOL, mplsProtocolMaskBuf, byteAggregator);
         }
index 6058f22a41129ad633f00af22a505c41431bd520..1aeea0b704f4011168796124c000a8815d82534a 100644 (file)
@@ -199,12 +199,12 @@ public final class NodeAttributesParser {
         if (nodeFlagBits != null) {
             final ByteBuf nodeFlagBuf = Unpooled.buffer(1);
             final BitArray flags = new BitArray(FLAGS_SIZE);
-            flags.set(OVERLOAD_BIT, nodeFlagBits.isOverload());
-            flags.set(ATTACHED_BIT, nodeFlagBits.isAttached());
-            flags.set(EXTERNAL_BIT, nodeFlagBits.isExternal());
-            flags.set(ABBR_BIT, nodeFlagBits.isAbr());
-            flags.set(ROUTER_BIT, nodeFlagBits.isRouter());
-            flags.set(V6_BIT, nodeFlagBits.isV6());
+            flags.set(OVERLOAD_BIT, nodeFlagBits.getOverload());
+            flags.set(ATTACHED_BIT, nodeFlagBits.getAttached());
+            flags.set(EXTERNAL_BIT, nodeFlagBits.getExternal());
+            flags.set(ABBR_BIT, nodeFlagBits.getAbr());
+            flags.set(ROUTER_BIT, nodeFlagBits.getRouter());
+            flags.set(V6_BIT, nodeFlagBits.getV6());
             flags.toByteBuf(nodeFlagBuf);
             TlvUtil.writeTLV(NODE_FLAG_BITS, nodeFlagBuf, byteAggregator);
         }
index 6a928544e11b0e3604e2e1b5914432e61e2b7b27..127649379128e1ae9a7013a3bcc073c957805a1a 100644 (file)
@@ -208,10 +208,10 @@ public final class PrefixAttributesParser {
         if (prefixAtrributes.getIgpBits() != null) {
             final BitArray igpBit = new BitArray(FLAGS_SIZE);
             final IgpBits igpBits = prefixAtrributes.getIgpBits();
-            igpBit.set(UP_DOWN_BIT, igpBits.getUpDown().isUpDown() || igpBits.isIsIsUpDown());
-            igpBit.set(OSPF_NO_UNICAST, igpBits.isOspfNoUnicast());
-            igpBit.set(OSPF_LOCAL_ADDRESS, igpBits.isOspfLocalAddress());
-            igpBit.set(OSPF_PROPAGATE_ADDRESS, igpBits.isOspfPropagateNssa());
+            igpBit.set(UP_DOWN_BIT, igpBits.getUpDown().getUpDown() || igpBits.getIsIsUpDown());
+            igpBit.set(OSPF_NO_UNICAST, igpBits.getOspfNoUnicast());
+            igpBit.set(OSPF_LOCAL_ADDRESS, igpBits.getOspfLocalAddress());
+            igpBit.set(OSPF_PROPAGATE_ADDRESS, igpBits.getOspfPropagateNssa());
             TlvUtil.writeTLV(IGP_FLAGS, Unpooled.wrappedBuffer(igpBit.array()), byteAggregator);
         }
         serializeRouteTags(prefixAtrributes.getRouteTags(), byteAggregator);
index 09673813a600964ecae74910f68f7d21968f6ec7..7dac77b088839ba6cb26791159217ac8c0a05982 100644 (file)
@@ -80,14 +80,14 @@ public final class BindingSidLabelParser {
         final BitArray bitFlags = new BitArray(FLAGS_SIZE);
         if (flags instanceof IsisBindingFlagsCase) {
             final IsisBindingFlagsCase isisFlags = (IsisBindingFlagsCase) flags;
-            bitFlags.set(AFI, isisFlags.isAddressFamily());
-            bitFlags.set(MIRROR_CONTEXT, isisFlags.isMirrorContext());
-            bitFlags.set(SPREAD_TLV, isisFlags.isSpreadTlv());
-            bitFlags.set(LEAKED, isisFlags.isLeakedFromLevel2());
-            bitFlags.set(ATTACHED, isisFlags.isAttachedFlag());
+            bitFlags.set(AFI, isisFlags.getAddressFamily());
+            bitFlags.set(MIRROR_CONTEXT, isisFlags.getMirrorContext());
+            bitFlags.set(SPREAD_TLV, isisFlags.getSpreadTlv());
+            bitFlags.set(LEAKED, isisFlags.getLeakedFromLevel2());
+            bitFlags.set(ATTACHED, isisFlags.getAttachedFlag());
         } else if (flags instanceof OspfBindingFlagsCase) {
             final OspfBindingFlagsCase ospfFlags = (OspfBindingFlagsCase) flags;
-            bitFlags.set(MIRROR_CONTEXT_OSPF, ospfFlags.isMirroring());
+            bitFlags.set(MIRROR_CONTEXT_OSPF, ospfFlags.getMirroring());
         }
         return bitFlags;
     }
index 17e86a6c70bbbf3465f0c1a60402170ee0fd86ba..00c417e2c686874132950d0b142e020913440b34 100644 (file)
@@ -102,7 +102,7 @@ public final class RangeTlvParser {
 
     public static void serializeSrRange(final SrRange srRange, final ByteBuf aggregator) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(INNER_AREA, srRange.isInterArea());
+        flags.set(INNER_AREA, srRange.getInterArea());
         flags.toByteBuf(aggregator);
         aggregator.writeZero(RESERVED);
         aggregator.writeShort(srRange.getRangeSize().toJava());
index c4f139f7ebc14d5bad2aab105174323b3e599bbe..b58189c06ef1cc20e86386a28be0fb5d98cde586 100644 (file)
@@ -246,14 +246,14 @@ public final class SrLinkAttributesParser {
         final BitArray bitFlags = new BitArray(FLAGS_BITS_SIZE);
         if (flags instanceof OspfAdjFlagsCase) {
             final OspfAdjFlags ospfFlags = ((OspfAdjFlagsCase) flags).getOspfAdjFlags();
-            bitFlags.set(BACKUP_OSPF, ospfFlags.isBackup());
-            bitFlags.set(SET_OSPF, ospfFlags.isSet());
+            bitFlags.set(BACKUP_OSPF, ospfFlags.getBackup());
+            bitFlags.set(SET_OSPF, ospfFlags.getSet());
             SidLabelIndexParser.setFlags(sidLabelIndex, bitFlags, VALUE_OSPF, LOCAL_OSPF);
         } else if (flags instanceof IsisAdjFlagsCase) {
             final IsisAdjFlags isisFlags = ((IsisAdjFlagsCase) flags).getIsisAdjFlags();
-            bitFlags.set(ADDRESS_FAMILY_FLAG, isisFlags.isAddressFamily());
-            bitFlags.set(BACKUP_ISIS, isisFlags.isBackup());
-            bitFlags.set(SET_ISIS, isisFlags.isSet());
+            bitFlags.set(ADDRESS_FAMILY_FLAG, isisFlags.getAddressFamily());
+            bitFlags.set(BACKUP_ISIS, isisFlags.getBackup());
+            bitFlags.set(SET_ISIS, isisFlags.getSet());
             SidLabelIndexParser.setFlags(sidLabelIndex, bitFlags, VALUE_ISIS, LOCAL_ISIS);
         } else if (flags == null) {
             SidLabelIndexParser.setFlags(sidLabelIndex, bitFlags, VALUE_EPE, LOCAL_EPE);
index 217938fcbb084b07bea1b247027e7b85c0acd7ca..e5f77c2db8ed2936f2001339d194595c1233e554 100644 (file)
@@ -59,9 +59,9 @@ public final class SrNodeAttributesParser {
 
     public static void serializeSrCapabilities(final SrCapabilities caps, final ByteBuf buffer) {
         final BitArray bs = new BitArray(FLAGS_SIZE);
-        bs.set(MPLS_IPV4, caps.isMplsIpv4());
-        bs.set(MPLS_IPV6, caps.isMplsIpv6());
-        bs.set(SR_IPV6, caps.isSrIpv6());
+        bs.set(MPLS_IPV4, caps.getMplsIpv4());
+        bs.set(MPLS_IPV6, caps.getMplsIpv6());
+        bs.set(SR_IPV6, caps.getSrIpv6());
         bs.toByteBuf(buffer);
         buffer.writeZero(RESERVERED);
         RFC8294ByteBufUtils.writeUint24(buffer, caps.getRangeSize());
index 746d68edc40e2f20540d4aa16f690cc8f2df02d3..d5bc2e614bc0de5bacfe12aac8257fe102673dcd 100644 (file)
@@ -100,15 +100,15 @@ public final class SrPrefixAttributesParser {
         SidLabelIndexParser.setFlags(sidLabelIndex, bitFlags, VALUE, LOCAL);
         if (flags instanceof OspfPrefixFlagsCase) {
             final OspfPrefixFlags ospfFlags = ((OspfPrefixFlagsCase) flags).getOspfPrefixFlags();
-            bitFlags.set(NO_PHP_OSPF, ospfFlags.isNoPhp());
-            bitFlags.set(MAPPING_SERVER, ospfFlags.isMappingServer());
-            bitFlags.set(EXPLICIT_NULL, ospfFlags.isExplicitNull());
+            bitFlags.set(NO_PHP_OSPF, ospfFlags.getNoPhp());
+            bitFlags.set(MAPPING_SERVER, ospfFlags.getMappingServer());
+            bitFlags.set(EXPLICIT_NULL, ospfFlags.getExplicitNull());
         } else if (flags instanceof IsisPrefixFlagsCase) {
             final IsisPrefixFlags isisFlags = ((IsisPrefixFlagsCase) flags).getIsisPrefixFlags();
-            bitFlags.set(RE_ADVERTISEMENT, isisFlags.isReadvertisement());
-            bitFlags.set(NODE_SID, isisFlags.isNodeSid());
-            bitFlags.set(NO_PHP, isisFlags.isNoPhp());
-            bitFlags.set(EXPLICIT_NULL, isisFlags.isExplicitNull());
+            bitFlags.set(RE_ADVERTISEMENT, isisFlags.getReadvertisement());
+            bitFlags.set(NODE_SID, isisFlags.getNodeSid());
+            bitFlags.set(NO_PHP, isisFlags.getNoPhp());
+            bitFlags.set(EXPLICIT_NULL, isisFlags.getExplicitNull());
         }
         return bitFlags;
     }
index 683aa7ab0a9d5e378a8a53c1c4e923d9467c46fc..1f950c10d24ab7e5eca0d10fcbe6718e509a95a2 100644 (file)
@@ -39,7 +39,7 @@ public final class BackupUnnumberedParser implements BindingSubTlvsParser, Bindi
             "Wrong BindingSubTlv instance expected", bindingSubTlv);
         final UnnumberedInterfaceIdBackupEro unnumberedBackup =
                 ((UnnumberedInterfaceIdBackupEroCase) bindingSubTlv).getUnnumberedInterfaceIdBackupEro();
-        TlvUtil.writeTLV(BACKUP_UNNUMBERED_ERO, serializeUnnumberedIdEro(unnumberedBackup.isLoose(),
+        TlvUtil.writeTLV(BACKUP_UNNUMBERED_ERO, serializeUnnumberedIdEro(unnumberedBackup.getLoose(),
             unnumberedBackup.getRouterId(), unnumberedBackup.getInterfaceId()), aggregator);
     }
 }
index 79f29bf420d7dda5e49f4536fa7da07e0609c2b5..c99268649d6753058825f363083effc10796c1ac 100644 (file)
@@ -36,7 +36,7 @@ public final class Ipv4BackupEro implements BindingSubTlvsParser, BindingSubTlvs
         checkArgument(bindingSubTlv instanceof Ipv4EroBackupCase, "Wrong BindingSubTlv instance expected",
             bindingSubTlv);
         final Ipv4EroBackup ipv4Backup = ((Ipv4EroBackupCase) bindingSubTlv).getIpv4EroBackup();
-        TlvUtil.writeTLV(getType(), Ipv4EroParser.serializeIpv4EroCase(ipv4Backup.isLoose(), ipv4Backup.getAddress()),
+        TlvUtil.writeTLV(getType(), Ipv4EroParser.serializeIpv4EroCase(ipv4Backup.getLoose(), ipv4Backup.getAddress()),
             aggregator);
     }
 }
index 09bad6423604942347ff8262588a498ea11cd19a..babb745d6e68236fc6be376d257476425bec0aa9 100644 (file)
@@ -48,7 +48,7 @@ public final class Ipv4EroParser implements BindingSubTlvsParser, BindingSubTlvs
         checkArgument(bindingSubTlv instanceof Ipv4EroCase, "Wrong BindingSubTlv instance expected",
             bindingSubTlv);
         final Ipv4Ero ipv4Ero = ((Ipv4EroCase) bindingSubTlv).getIpv4Ero();
-        TlvUtil.writeTLV(getType(), serializeIpv4EroCase(ipv4Ero.isLoose(), ipv4Ero.getAddress()), aggregator);
+        TlvUtil.writeTLV(getType(), serializeIpv4EroCase(ipv4Ero.getLoose(), ipv4Ero.getAddress()), aggregator);
     }
 
     static Ipv4EroCase parseIpv4EroCase(final ByteBuf buffer) {
index 495d70877cb552f6bc890f53be1c276a612652a8..04f8190fc2976f87fc360f2488ac6803a2f78b80 100644 (file)
@@ -36,7 +36,7 @@ public final class Ipv6BackupEro implements BindingSubTlvsParser, BindingSubTlvs
         checkArgument(bindingSubTlv instanceof Ipv6EroBackupCase, "Wrong BindingSubTlv instance expected",
             bindingSubTlv);
         final Ipv6EroBackup ipv6Backup = ((Ipv6EroBackupCase) bindingSubTlv).getIpv6EroBackup();
-        TlvUtil.writeTLV(getType(), Ipv6EroParser.serializeIpv6EroCase(ipv6Backup.isLoose(), ipv6Backup.getAddress()),
+        TlvUtil.writeTLV(getType(), Ipv6EroParser.serializeIpv6EroCase(ipv6Backup.getLoose(), ipv6Backup.getAddress()),
             aggregator);
     }
 }
index 50a027ae75159df3e81fb300cc0594ee21a26242..5e3a4679fdb66f0148e84df17da07cccc8e0b8e8 100644 (file)
@@ -45,7 +45,7 @@ public final class Ipv6EroParser implements BindingSubTlvsParser, BindingSubTlvs
         checkArgument(bindingSubTlv instanceof Ipv6EroCase, "Wrong BindingSubTlv instance expected",
             bindingSubTlv);
         final Ipv6Ero ipv6Ero = ((Ipv6EroCase) bindingSubTlv).getIpv6Ero();
-        TlvUtil.writeTLV(getType(), serializeIpv6EroCase(ipv6Ero.isLoose(), ipv6Ero.getAddress()), aggregator);
+        TlvUtil.writeTLV(getType(), serializeIpv6EroCase(ipv6Ero.getLoose(), ipv6Ero.getAddress()), aggregator);
     }
 
     public static Ipv6EroCase parseIpv6EroCase(final ByteBuf buffer) {
index a390d9742d3b0730747b45b51a42c28aa46b8896..d97a27b47b7b9b26882031b926986beefaa33dda 100644 (file)
@@ -46,7 +46,7 @@ public final class UnnumberedEroParser implements BindingSubTlvsParser, BindingS
             "Wrong BindingSubTlv instance expected", bindingSubTlv);
         final UnnumberedInterfaceIdEro unnumberedEro =
                 ((UnnumberedInterfaceIdEroCase) bindingSubTlv).getUnnumberedInterfaceIdEro();
-        TlvUtil.writeTLV(getType(), serializeUnnumberedIdEro(unnumberedEro.isLoose(), unnumberedEro.getRouterId(),
+        TlvUtil.writeTLV(getType(), serializeUnnumberedIdEro(unnumberedEro.getLoose(), unnumberedEro.getRouterId(),
             unnumberedEro.getInterfaceId()), aggregator);
     }
 
index c3040bc78b505d1b6eec99b61d828c6fc93ceb14..778eca0ea4318f254d594982f0bb36378a7a15a8 100644 (file)
@@ -256,8 +256,8 @@ public class LinkstateAttributeParserTest {
         assertNotNull(ls.getUnreservedBandwidth());
         assertEquals(8, ls.getUnreservedBandwidth().size());
         assertEquals(LinkProtectionType.Dedicated1to1, ls.getLinkProtection());
-        assertTrue(ls.getMplsProtocol().isLdp());
-        assertTrue(ls.getMplsProtocol().isRsvpte());
+        assertTrue(ls.getMplsProtocol().getLdp());
+        assertTrue(ls.getMplsProtocol().getRsvpte());
         assertEquals(Uint32.TEN, ls.getMetric().getValue());
         assertEquals(2, ls.getSharedRiskLinkGroups().size());
         assertEquals(305419896, ls.getSharedRiskLinkGroups().get(0).getValue().intValue());
@@ -316,12 +316,12 @@ public class LinkstateAttributeParserTest {
 
         assertEquals(2, ls.getTopologyIdentifier().size());
         assertEquals(42, ls.getTopologyIdentifier().get(0).getValue().intValue());
-        assertTrue(ls.getNodeFlags().isOverload());
-        assertFalse(ls.getNodeFlags().isAttached());
-        assertTrue(ls.getNodeFlags().isExternal());
-        assertTrue(ls.getNodeFlags().isAbr());
-        assertTrue(ls.getNodeFlags().isRouter());
-        assertTrue(ls.getNodeFlags().isV6());
+        assertTrue(ls.getNodeFlags().getOverload());
+        assertFalse(ls.getNodeFlags().getAttached());
+        assertTrue(ls.getNodeFlags().getExternal());
+        assertTrue(ls.getNodeFlags().getAbr());
+        assertTrue(ls.getNodeFlags().getRouter());
+        assertTrue(ls.getNodeFlags().getV6());
 
         assertEquals("12K-2", ls.getDynamicHostname());
         assertEquals(2, ls.getIsisAreaId().size());
@@ -346,15 +346,15 @@ public class LinkstateAttributeParserTest {
         assertNotNull(ls);
 
         assertNotNull(ls.getSrRange());
-        assertFalse(ls.getSrRange().isInterArea());
+        assertFalse(ls.getSrRange().getInterArea());
         assertEquals(1, ls.getSrRange().getSubTlvs().size());
         assertNotNull(ls.getSrBindingSidLabels());
         final IgpBits ispBits = ls.getIgpBits();
-        assertTrue(ispBits.getUpDown().isUpDown());
-        assertTrue(ispBits.isIsIsUpDown());
-        assertTrue(ispBits.isOspfNoUnicast());
-        assertTrue(ispBits.isOspfLocalAddress());
-        assertTrue(ispBits.isOspfPropagateNssa());
+        assertTrue(ispBits.getUpDown().getUpDown());
+        assertTrue(ispBits.getIsIsUpDown());
+        assertTrue(ispBits.getOspfNoUnicast());
+        assertTrue(ispBits.getOspfLocalAddress());
+        assertTrue(ispBits.getOspfPropagateNssa());
         assertEquals(2, ls.getRouteTags().size());
         assertArrayEquals(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }, ls.getRouteTags().get(0)
             .getValue());
index 5a65b126b8f3da217b4508c0e85287934b23daf8..ca367862b58a78b7c237eb48f21db07630779908 100644 (file)
@@ -54,7 +54,7 @@ public final class PMSITunnelAttributeHandler implements AttributeParser, Attrib
     }
 
     private static void serializeFlag(final PmsiTunnel pmsiTunnelAttribute, final ByteBuf body) {
-        body.writeBoolean(pmsiTunnelAttribute.isLeafInformationRequired());
+        body.writeBoolean(pmsiTunnelAttribute.getLeafInformationRequired());
     }
 
     @Override
index 22fcf977cdb4456081ae1b06c9242461bda6da6d..fcd3f4d6bac9a4bd75c7c735bab21304233ddf14 100644 (file)
@@ -64,6 +64,6 @@ public class AbstractExtCommunityHandler {
         }
         return result.get().getExtCommunityMember()
                 .stream().map(ge -> new ExtendedCommunitiesBuilder().setExtendedCommunity(ge.getExtendedCommunity())
-                        .setTransitive(ge.isTransitive()).build()).collect(Collectors.toList());
+                        .setTransitive(ge.getTransitive()).build()).collect(Collectors.toList());
     }
 }
index d25065da9ae7b1b7fc60196763eaae3158ce55b6..622b7509b95715a9c6b79d0df7bbebeb3165f985 100644 (file)
@@ -60,13 +60,13 @@ public final class NonTransitiveAttributesFilterHandler implements BgpActionAugP
             // TODO: consider using Maps.filterValues(attributes.getUnrecognizedAttributes(),
             //                                        UnrecognizedAttributes::isTransitive)) ?
             builder.setUnrecognizedAttributes(attributes.getUnrecognizedAttributes().values().stream()
-                    .filter(UnrecognizedAttributes::isTransitive)
+                    .filter(UnrecognizedAttributes::getTransitive)
                     .collect(ImmutableMap.toImmutableMap(UnrecognizedAttributes::key, Function.identity())));
         }
         final List<ExtendedCommunities> oldExt = attributes.getExtendedCommunities();
         if (oldExt != null) {
             builder.setExtendedCommunities(oldExt.stream()
-                    .filter(ExtendedCommunity::isTransitive)
+                    .filter(ExtendedCommunity::getTransitive)
                     .collect(Collectors.toList()));
         }
         return builder.build();
index c50813fafca39b96f9e164ba9c08ef88d6483406..961cd4eb4f8a1631631602f3cd999a1ea94d25e5 100644 (file)
@@ -62,7 +62,7 @@ public final class SetExtCommunityHandler extends AbstractExtCommunityHandler
             final Inline inline = (Inline) setExtCommunityMethod;
             final List<ExtendedCommunities> list = inline.getExtCommunityMember()
                     .stream().map(ge -> new ExtendedCommunitiesBuilder().setExtendedCommunity(ge.getExtendedCommunity())
-                            .setTransitive(ge.isTransitive()).build()).collect(Collectors.toList());
+                            .setTransitive(ge.getTransitive()).build()).collect(Collectors.toList());
             return inlineSetExtComm(attributes, list, options);
         }
         return referenceSetExtComm(attributes, ((Reference) setExtCommunityMethod).getExtCommunitySetRef(), options);
index 6af13cfe68d9b7959e0aabc109b389d11d9f21ea..aef42cf60b625a02dbb5cdb3df469c40356788d5 100644 (file)
@@ -83,7 +83,7 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi
             final Integer safival = this.safiReg.numberForClass(safi);
             Preconditions.checkArgument(safival != null, "Unhandled subsequent address family " + safi);
             bytes.writeByte(safival);
-            if (t.getAfiFlags() != null && t.getAfiFlags().isForwardingState()) {
+            if (t.getAfiFlags() != null && t.getAfiFlags().getForwardingState()) {
                 bytes.writeByte(AFI_FLAG_FORWARDING_STATE);
             } else {
                 bytes.writeByte(0);
@@ -102,7 +102,7 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi
         final int timeval = time.toJava();
         Preconditions.checkArgument(timeval >= 0 && timeval <= MAX_RESTART_TIME, "Restart time is " + time);
         final GracefulRestartCapability.RestartFlags flags = grace.getRestartFlags();
-        if (flags != null && flags.isRestartState()) {
+        if (flags != null && flags.getRestartState()) {
             bytes.writeShort(RESTART_FLAG_STATE | timeval);
         } else {
             bytes.writeShort(timeval);
index c0569a15c582141f0755df7914e1a29016ef12cc..b89903c2a5dbc7222cf14356a156cf3e17a56148 100644 (file)
@@ -86,7 +86,7 @@ public final class LlGracefulCapabilityHandler implements CapabilityParser, Capa
             final Tables table = new TablesBuilder()
                     .setAfi(afi)
                     .setSafi(safi)
-                    .setAfiFlags(new Tables.AfiFlags(Boolean.valueOf(afiFlags == AFI_FLAG_FORWARDING_STATE)))
+                    .setAfiFlags(new Tables.AfiFlags(afiFlags == AFI_FLAG_FORWARDING_STATE))
                     .setLongLivedStaleTime(new Uint24(Uint32.valueOf(staleTime)))
                     .build();
             tables.add(table);
@@ -127,7 +127,7 @@ public final class LlGracefulCapabilityHandler implements CapabilityParser, Capa
             final Integer safival = this.safiReg.numberForClass(safi);
             checkArgument(safival != null, "Unhandled subsequent address family %s", safi);
             buffer.writeByte(safival);
-            if (table.getAfiFlags() != null && table.getAfiFlags().isForwardingState()) {
+            if (table.getAfiFlags() != null && table.getAfiFlags().getForwardingState()) {
                 buffer.writeByte(AFI_FLAG_FORWARDING_STATE);
             } else {
                 buffer.writeByte(0);
index 40b0a6e05bcd67b5acd982411c7edb356086fa9e..dce40304498f35b8054f4ce5167ea928adcac355 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bgp.parser.impl.message.update;
 
 import io.netty.buffer.ByteBuf;
@@ -32,10 +31,10 @@ public class UnrecognizedAttributesSerializer implements AttributeSerializer {
         for (final UnrecognizedAttributes unrecognizedAttr : unrecognizedAttrs.values()) {
             LOG.trace("Serializing unrecognized attribute of type {}", unrecognizedAttr.getType());
             int flags = AttributeUtil.OPTIONAL;
-            if (unrecognizedAttr.isPartial()) {
+            if (unrecognizedAttr.getPartial()) {
                 flags |= AttributeUtil.PARTIAL;
             }
-            if (unrecognizedAttr.isTransitive()) {
+            if (unrecognizedAttr.getTransitive()) {
                 flags |= AttributeUtil.TRANSITIVE;
             }
             AttributeUtil.formatAttribute(flags, unrecognizedAttr.getType().toJava(),
index 6a5226621d58588542acaf2a66abe99338ba791f..8c275195238fe925a158709ca70bb4bbe4146473 100644 (file)
@@ -61,7 +61,7 @@ public class ComplementaryTest {
         final CParameters tlv4 = new CParametersBuilder().setAs4BytesCapability(
             new As4BytesCapabilityBuilder().setAsNumber(new AsNumber(Uint32.valueOf(40))).build()).build();
 
-        assertFalse(tlv3.getRestartFlags().isRestartState());
+        assertFalse(tlv3.getRestartFlags().getRestartState());
 
         assertEquals(0, tlv3.getRestartTime().intValue());
 
index 14a0fc877d7a5d6afca543ccef6b2d21a8080c6e..df92532edd777ae9caa9f2428633ed991f5241d6 100644 (file)
@@ -63,7 +63,7 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry
         if (serializer == null) {
             return;
         }
-        byteAggregator.writeByte(Shorts.checkedCast(serializer.getType(extendedCommunity.isTransitive())));
+        byteAggregator.writeByte(Shorts.checkedCast(serializer.getType(extendedCommunity.getTransitive())));
         byteAggregator.writeByte(Shorts.checkedCast(serializer.getSubType()));
         serializer.serializeExtendedCommunity(extendedCommunity.getExtendedCommunity(), byteAggregator);
     }
index 16088189c4ccd549920e80ee45edd187865e7f46..3cce76280001ec4f5dc87b62ff712d75d8f19da9 100644 (file)
@@ -66,7 +66,7 @@ public class SimpleExtendedCommunityRegistryTest {
         final ExtendedCommunities parsedExtendedCommunity =
                 this.register.parseExtendedCommunity(Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0, 0, 0, 0}));
         verify(this.parser).parseExtendedCommunity(any(ByteBuf.class));
-        Assert.assertTrue(parsedExtendedCommunity.isTransitive());
+        Assert.assertTrue(parsedExtendedCommunity.getTransitive());
         //no value parser
         assertNull(parsedExtendedCommunity.getExtendedCommunity());
     }
index f319059380260390bff1bd2e3ea1c22156d07ce5..0c14b137d311baccaf62f0d057fd3cc202bad741 100644 (file)
@@ -50,8 +50,8 @@ public class UnrecognizedAttributesTest {
         final UnrecognizedAttributesKey expectedAttribKey =
             new UnrecognizedAttributesKey(unrecogAttrib.getType());
 
-        assertTrue(unrecogAttrib.isPartial());
-        assertTrue(unrecogAttrib.isTransitive());
+        assertTrue(unrecogAttrib.getPartial());
+        assertTrue(unrecogAttrib.getTransitive());
         assertArrayEquals(ByteArray.cutBytes(attributeBytes, NON_VALUE_BYTES), unrecogAttrib.getValue());
         assertEquals(NON_EXISTENT_TYPE, unrecogAttrib.getType().shortValue());
         assertEquals(expectedAttribKey, unrecogAttrib.key());
index 71babe4036ae16dbf927524e103e9dde8bf16cb7..aba1fb011ff7c694826b0769942929c355e81fd0 100644 (file)
@@ -406,7 +406,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
             } else {
                 forwardingTables = advertisedTables.values().stream()
                         .filter(table -> table.getAfiFlags() != null)
-                        .filter(table -> table.getAfiFlags().isForwardingState())
+                        .filter(table -> table.getAfiFlags().getForwardingState())
                         .map(table -> new TablesKey(table.getAfi(), table.getSafi()))
                         .collect(Collectors.toSet());
             }
index 15b0f551203cee13c3515872fd6ca7ecb6728681..feb9c867e55b3a166ed58cdde6b4c0fecb567a37 100644 (file)
@@ -97,7 +97,7 @@ public final class GracefulRestartUtil {
             final GracefulRestart gr = afiSafi.getGracefulRestart();
             if (gr != null) {
                 final Config config = gr.getConfig();
-                if (config != null && Boolean.TRUE.equals(config.isEnabled())) {
+                if (config != null && Boolean.TRUE.equals(config.getEnabled())) {
                     final Class<? extends AfiSafiType> afiSafiName = afiSafi.getAfiSafiName();
                     if (afiSafiName != null) {
                         final TablesKey tablesKey = tableTypeRegistry.getTableKey(afiSafiName);
index 7023869078aed37b242cb8c483c232c21d6ac950..ab15612058bf551541787fb5f8ecfbc12e2c91d5 100644 (file)
@@ -232,7 +232,7 @@ final class OpenConfigMappingUtil {
     }
 
     private static SendReceive toSendReceiveMode(final BgpNeighborAddPathsConfig addPath) {
-        if (addPath.isReceive() && addPath.getSendMax() != null) {
+        if (addPath.getReceive() && addPath.getSendMax() != null) {
             return SendReceive.Both;
         }
         if (addPath.getSendMax() != null) {
@@ -244,7 +244,7 @@ final class OpenConfigMappingUtil {
     private static boolean isRrClient(final BgpNeighborGroup neighbor) {
         final RouteReflector routeReflector = neighbor.getRouteReflector();
         if (routeReflector != null && routeReflector.getConfig() != null) {
-            return routeReflector.getConfig().isRouteReflectorClient();
+            return routeReflector.getConfig().getRouteReflectorClient();
         }
         return false;
     }
@@ -277,7 +277,7 @@ final class OpenConfigMappingUtil {
         if (transport != null) {
             final Config config = transport.getConfig();
             if (config != null) {
-                final Boolean passive = config.isPassiveMode();
+                final Boolean passive = config.getPassiveMode();
                 if (passive != null) {
                     return Optional.of(!passive);
                 }
@@ -509,6 +509,6 @@ final class OpenConfigMappingUtil {
         }
         final org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.error.handling
             .Config config = errorHandling.getConfig();
-        return config == null ? Optional.empty() : Optional.of(config.isTreatAsWithdraw());
+        return config == null ? Optional.empty() : Optional.of(config.getTreatAsWithdraw());
     }
 }
index 2cd0c5c975ad47675111d640585f14b54b25dde4..5402f1a8d577eede04c6530be4917eb655a2aa0b 100644 (file)
@@ -151,7 +151,7 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest {
                 for (final Tables table : tables.values()) {
                     if (table.getAfi().equals(tableType.getAfi()) && table.getSafi().equals(tableType.getSafi())) {
                         found = true;
-                        assertEquals(Boolean.TRUE, table.getAttributes().isUptodate());
+                        assertEquals(Boolean.TRUE, table.getAttributes().getUptodate());
                     }
                 }
                 assertTrue(found);
index dec7120430bd799e05986972f888a98c0d9fc616..92cf5cffe80682d5d95fd1c73a1d510a3c3a2433 100644 (file)
@@ -104,14 +104,14 @@ public class GracefulRestartUtilTest {
         assertNotNull(params);
         final GracefulRestartCapability gracefulCapability = params.getGracefulRestartCapability();
         assertNotNull(gracefulCapability);
-        assertTrue(gracefulCapability.getRestartFlags().isRestartState());
+        assertTrue(gracefulCapability.getRestartFlags().getRestartState());
         assertEquals(RESTART_TIME, gracefulCapability.getRestartTime().intValue());
         final var tables = gracefulCapability.getTables();
         assertNotNull(tables);
         assertEquals(2, tables.size());
         tables.values().forEach(table -> {
-            assertTrue(isSameKey(IPV4_KEY, table.key()) && table.getAfiFlags().isForwardingState()
-                || isSameKey(IPV6_KEY, table.key()) && !table.getAfiFlags().isForwardingState());
+            assertTrue(isSameKey(IPV4_KEY, table.key()) && table.getAfiFlags().getForwardingState()
+                || isSameKey(IPV6_KEY, table.key()) && !table.getAfiFlags().getForwardingState());
         });
     }
 
@@ -175,8 +175,8 @@ public class GracefulRestartUtilTest {
         assertEquals(2, tables.size());
         assertEquals(STALE_TIME, tables.values().iterator().next().getLongLivedStaleTime().getValue().intValue());
         tables.values().forEach(table -> {
-            assertTrue(isSameKey(IPV4_KEY, table.key()) && table.getAfiFlags().isForwardingState()
-                || isSameKey(IPV6_KEY, table.key()) && !table.getAfiFlags().isForwardingState());
+            assertTrue(isSameKey(IPV4_KEY, table.key()) && table.getAfiFlags().getForwardingState()
+                || isSameKey(IPV6_KEY, table.key()) && !table.getAfiFlags().getForwardingState());
         });
     }
 
index 807528fe6213e411d560b1a0416beb423cde4b8b..7c3f4e83a4b4cd2a9d8bda8ce68436e7c6ff454b 100644 (file)
@@ -369,21 +369,19 @@ public class LinkstateGraphBuilder extends AbstractTopologyBuilder<LinkstateRout
             }
             builder.setSrlgs(srlgs);
         }
-        if (la.getSrAdjIds() != null) {
-            for (SrAdjIds adj : la.getSrAdjIds()) {
-                if (adj.getSidLabelIndex() instanceof LocalLabelCase) {
-                    boolean backup = false;
-                    if (adj.getFlags() instanceof OspfAdjFlags) {
-                        backup = ((OspfAdjFlags) adj.getFlags()).isBackup();
-                    }
-                    if (adj.getFlags() instanceof IsisAdjFlags) {
-                        backup = ((IsisAdjFlags) adj.getFlags()).isBackup();
-                    }
-                    if (!backup) {
-                        builder.setAdjSid(((LocalLabelCase) adj.getSidLabelIndex()).getLocalLabel().getValue());
-                    } else {
-                        builder.setBackupAdjSid(((LocalLabelCase) adj.getSidLabelIndex()).getLocalLabel().getValue());
-                    }
+        for (SrAdjIds adj : la.nonnullSrAdjIds()) {
+            if (adj.getSidLabelIndex() instanceof LocalLabelCase) {
+                boolean backup = false;
+                if (adj.getFlags() instanceof OspfAdjFlags) {
+                    backup = ((OspfAdjFlags) adj.getFlags()).getBackup();
+                }
+                if (adj.getFlags() instanceof IsisAdjFlags) {
+                    backup = ((IsisAdjFlags) adj.getFlags()).getBackup();
+                }
+                if (!backup) {
+                    builder.setAdjSid(((LocalLabelCase) adj.getSidLabelIndex()).getLocalLabel().getValue());
+                } else {
+                    builder.setBackupAdjSid(((LocalLabelCase) adj.getSidLabelIndex()).getLocalLabel().getValue());
                 }
             }
         }
@@ -448,10 +446,10 @@ public class LinkstateGraphBuilder extends AbstractTopologyBuilder<LinkstateRout
                     .build());
         }
         if (na.getNodeFlags() != null) {
-            if (na.getNodeFlags().isAbr()) {
+            if (na.getNodeFlags().getAbr()) {
                 builder.setVertexType(VertexType.Abr);
             }
-            if (na.getNodeFlags().isExternal()) {
+            if (na.getNodeFlags().getExternal()) {
                 builder.setVertexType(VertexType.AsbrOut);
             }
         } else {
@@ -541,7 +539,7 @@ public class LinkstateGraphBuilder extends AbstractTopologyBuilder<LinkstateRout
             builder.setPrefixSid(((SidCase) pa.getSrPrefix().getSidLabelIndex()).getSid());
             if (pa.getSrPrefix().getFlags() instanceof IsisPrefixFlagsCase) {
                 builder.setNodeSid(
-                        ((IsisPrefixFlagsCase) pa.getSrPrefix().getFlags()).getIsisPrefixFlags().isNodeSid());
+                        ((IsisPrefixFlagsCase) pa.getSrPrefix().getFlags()).getIsisPrefixFlags().getNodeSid());
             } else {
                 /*
                  * Seems that OSPF Flags are not accessible. Assuming that the
index 8f6509f33caff7aed3e01a00f30858e1cd34571d..caeb4c2a6a81b63f9c064ea39da269233c4dfe96 100644 (file)
@@ -451,7 +451,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             }
             final Flags prefixFlags = srPrefix.getFlags();
             if (prefixFlags instanceof IsisPrefixFlagsCase) {
-                return !Boolean.FALSE.equals(((IsisPrefixFlagsCase) prefixFlags).getIsisPrefixFlags().isNodeSid());
+                return !Boolean.FALSE.equals(((IsisPrefixFlagsCase) prefixFlags).getIsisPrefixFlags().getNodeSid());
             }
             return true;
         }
index e134b5077258e5eee229e04f6a369164a10ad44e..4bc16355351d955266520f0736c80892828981d5 100644 (file)
@@ -190,10 +190,10 @@ public final class ProtocolUtil {
                 // TODO: what should we do with in.getOspfRouterId()?
 
                 final NodeFlagBits nf = na.getNodeFlags();
-                if (nf.isAbr() != null) {
-                    ab.setRouterType(new AbrBuilder().setAbr(nf.isAbr() ? Empty.getInstance() : null).build());
-                } else if (nf.isExternal() != null) {
-                    ab.setRouterType(new InternalBuilder().setInternal(nf.isExternal() ? null : Empty.getInstance())
+                if (nf.getAbr() != null) {
+                    ab.setRouterType(new AbrBuilder().setAbr(nf.getAbr() ? Empty.getInstance() : null).build());
+                } else if (nf.getExternal() != null) {
+                    ab.setRouterType(new InternalBuilder().setInternal(nf.getExternal() ? null : Empty.getInstance())
                         .build());
                 }
             }
index bb31c0914ca389140f5ddde0225d3718de8862e3..789f64bd22fb61995e2dcdf2b63469eba4f623e8 100644 (file)
@@ -38,7 +38,7 @@ public final class BmpDispatcherUtil {
     public static ChannelInitializer<AbstractChannel> createChannelWithDecoder(
             final @NonNull BmpSessionFactory sessionFactory, final @NonNull BmpHandlerFactory hf,
             final @NonNull BmpSessionListenerFactory slf) {
-        return new ChannelInitializer<AbstractChannel>() {
+        return new ChannelInitializer<>() {
             @Override
             protected void initChannel(final AbstractChannel ch) throws Exception {
                 ch.pipeline().addLast(hf.getDecoders());
@@ -50,7 +50,7 @@ public final class BmpDispatcherUtil {
     public static ChannelInitializer<AbstractChannel> createChannelWithEncoder(
             final @NonNull BmpSessionFactory sessionFactory, final @NonNull BmpHandlerFactory hf,
             final @NonNull BmpSessionListenerFactory slf) {
-        return new ChannelInitializer<AbstractChannel>() {
+        return new ChannelInitializer<>() {
             @Override
             protected void initChannel(final AbstractChannel ch) throws Exception {
                 ch.pipeline().addLast(hf.getEncoders());
@@ -72,7 +72,7 @@ public final class BmpDispatcherUtil {
     public static ServerBootstrap createServerBootstrap(final @NonNull BmpSessionFactory sessionFactory,
             final @NonNull BmpHandlerFactory hf, final @NonNull BmpSessionListenerFactory slf,
             final @NonNull CreateChannel createChannel, final @NonNull EventLoopGroup bossGroup,
-            final @NonNull EventLoopGroup workerGroup, final @NonNull KeyMapping keys, boolean tryEpollSocket) {
+            final @NonNull EventLoopGroup workerGroup, final @NonNull KeyMapping keys, final boolean tryEpollSocket) {
 
         final ServerBootstrap serverBootstrap = new ServerBootstrap();
         serverBootstrap.childHandler(createChannel.create(sessionFactory, hf, slf));
@@ -116,7 +116,8 @@ public final class BmpDispatcherUtil {
             final @NonNull BmpHandlerFactory hf, final @NonNull CreateChannel createChannel,
             final @NonNull BmpSessionListenerFactory slf, final @NonNull InetSocketAddress remoteAddress,
             final @Nullable SocketAddress localAddress, final @NonNull EventLoopGroup workerGroup,
-            final int connectTimeout, final @NonNull KeyMapping keys, boolean reuseAddress, boolean tryEpollSocket) {
+            final int connectTimeout, final @NonNull KeyMapping keys, final boolean reuseAddress,
+            final boolean tryEpollSocket) {
         final Bootstrap bootstrap = new Bootstrap();
         bootstrap.option(ChannelOption.SO_REUSEADDR, reuseAddress);
         bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
index d0f61387b3ecf909b0e46da5d7413c9d445ca5bf..43b1ab2bbe2d0f74d4ecd7ed2131c76856f1e71b 100644 (file)
@@ -130,7 +130,7 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation, Clu
     private void connectMonitoredRouters(final BmpDispatcher pdispatcher) {
         if (this.monitoredRouters != null) {
             for (final MonitoredRouter mr : this.monitoredRouters) {
-                if (mr.isActive()) {
+                if (mr.getActive()) {
                     requireNonNull(mr.getAddress());
                     requireNonNull(mr.getPort());
                     final String s = mr.getAddress().getIpv4AddressNoZone().getValue();
index 46ae95479ad1cbe87e9d0238e7ad23826dc35445..3090e8d3ca4bbeac1bfae05c9cdd648126021b04 100644 (file)
@@ -332,14 +332,14 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
             final Tables prePolicyTable = peer.getPrePolicyRib().nonnullTables().values().iterator().next();
             assertEquals(Ipv4AddressFamily.class, prePolicyTable.getAfi());
             assertEquals(UnicastSubsequentAddressFamily.class, prePolicyTable.getSafi());
-            assertFalse(prePolicyTable.getAttributes().isUptodate());
+            assertFalse(prePolicyTable.getAttributes().getUptodate());
 
             assertNotNull(peer.getPostPolicyRib());
             assertEquals(1, peer.getPostPolicyRib().nonnullTables().size());
             final Tables postPolicyTable = peer.getPrePolicyRib().nonnullTables().values().iterator().next();
             assertEquals(Ipv4AddressFamily.class, postPolicyTable.getAfi());
             assertEquals(UnicastSubsequentAddressFamily.class, postPolicyTable.getSafi());
-            assertFalse(postPolicyTable.getAttributes().isUptodate());
+            assertFalse(postPolicyTable.getAttributes().getUptodate());
 
             assertNotNull(peer.getPeerSession());
             final PeerSession peerSession = peer.getPeerSession();
@@ -397,7 +397,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
         readDataOperational(getDataBroker(), peerIId.child(PrePolicyRib.class), prePolicyRib -> {
             assertFalse(prePolicyRib.getTables().isEmpty());
             final Tables tables = prePolicyRib.getTables().values().iterator().next();
-            assertTrue(tables.getAttributes().isUptodate());
+            assertTrue(tables.getAttributes().getUptodate());
             assertEquals(3, ((Ipv4RoutesCase) tables.getRoutes()).getIpv4Routes().getIpv4Route().size());
             return tables;
         });
@@ -410,7 +410,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
         readDataOperational(getDataBroker(), peerIId.child(PostPolicyRib.class), postPolicyRib -> {
             assertFalse(postPolicyRib.getTables().isEmpty());
             final Tables tables = postPolicyRib.getTables().values().iterator().next();
-            assertTrue(tables.getAttributes().isUptodate());
+            assertTrue(tables.getAttributes().getUptodate());
             assertEquals(3, ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet
                     .rev180329.bmp.monitor.monitor.router.peer.post.policy.rib.tables.routes.Ipv4RoutesCase)
                     tables.getRoutes()).getIpv4Routes().getIpv4Route().size());
index f62c0cd1dbe8d0606fa33e72f3c3efec30a5f734..b1890e85bf273ddbe46471cf23d21923f8945119 100644 (file)
@@ -47,7 +47,7 @@ public class PeerDownHandler extends AbstractBmpPerPeerMessageParser<PeerDownNot
         Preconditions.checkArgument(message instanceof PeerDownNotification,
                 "An instance of PeerDownNotification is required");
         final PeerDownNotification peerDown = (PeerDownNotification) message;
-        if (peerDown.isLocalSystemClosed()) {
+        if (peerDown.getLocalSystemClosed()) {
             if (peerDown.getData() instanceof FsmEventCode) {
                 buffer.writeByte(REASON_TWO.getValue());
                 ByteBufUtils.writeOrZero(buffer, ((FsmEventCode) peerDown.getData()).getFsmEventCode());
index 64a8d9ae521506014b2f2c57bd3e718267608fb6..19035d43283960effb3366d32f79777cdd048da1 100644 (file)
@@ -83,7 +83,7 @@ public class PeerUpHandler extends AbstractBmpPerPeerMessageParser<InformationBu
         final PeerUpNotificationBuilder peerUpNot = new PeerUpNotificationBuilder()
                 .setPeerHeader(parsePerPeerHeader(bytes));
 
-        if (peerUpNot.getPeerHeader().isIpv4()) {
+        if (peerUpNot.getPeerHeader().getIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
             peerUpNot.setLocalAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(bytes)));
         } else {
index 0a349042c203199d9e15ec3a18283e6acb8e6158..55efedf6d18ce97ade13cc1a7cd94f0059cd68b4 100644 (file)
@@ -82,7 +82,7 @@ public abstract class AbstractBmpPerPeerMessageParser<T extends Builder<?>> exte
                 bytes.skipBytes(PEER_DISTINGUISHER_SIZE);
                 break;
         }
-        if (phBuilder.isIpv4()) {
+        if (phBuilder.getIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
             phBuilder.setAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(bytes)));
         } else {
@@ -101,7 +101,7 @@ public abstract class AbstractBmpPerPeerMessageParser<T extends Builder<?>> exte
         output.writeByte(peerType.getIntValue());
         final BitArray flags = new BitArray(FLAGS_SIZE);
         flags.set(L_FLAG_POS, peerHeader.getAdjRibInType().getIntValue() != 0);
-        flags.set(V_FLAG_POS, !peerHeader.isIpv4());
+        flags.set(V_FLAG_POS, !peerHeader.getIpv4());
         flags.toByteBuf(output);
         final PeerDistinguisher peerDistinguisher = peerHeader.getPeerDistinguisher();
         switch (peerType) {
@@ -116,7 +116,7 @@ public abstract class AbstractBmpPerPeerMessageParser<T extends Builder<?>> exte
                 output.writeZero(PEER_DISTINGUISHER_SIZE);
                 break;
         }
-        if (peerHeader.isIpv4()) {
+        if (peerHeader.getIpv4()) {
             output.writeZero(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
             Ipv4Util.writeIpv4Address(peerHeader.getAddress().getIpv4AddressNoZone(), output);
         } else {
index 2d7f8485e790bf8c776763b75d433c2dbc7cc300..25f56e4e0b7d14f9273b6650ffbf8578ae63ec62 100644 (file)
@@ -44,9 +44,9 @@ public final class BandwidthUsageObjectCodec extends CommonObjectParser implemen
             throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.readableBytes()
                     + "; Expected multiple of " + BW_LENGTH + ".");
         }
-        final BandwidthUsageBuilder builder = new BandwidthUsageBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        final BandwidthUsageBuilder builder = new BandwidthUsageBuilder()
+            .setIgnore(header.getIgnore())
+            .setProcessingRule(header.getProcessingRule());
         final List<Bandwidth> bwSamples = new ArrayList<>(bytes.readableBytes() / BW_LENGTH);
         while (bytes.isReadable()) {
             bwSamples.add(new Bandwidth(ByteArray.readBytes(bytes, BW_LENGTH)));
@@ -64,7 +64,7 @@ public final class BandwidthUsageObjectCodec extends CommonObjectParser implemen
         for (final Bandwidth bw : bwSample) {
             writeFloat32(bw, body);
         }
-        ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.isProcessingRule(), object.isIgnore(),
+        ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.getProcessingRule(), object.getIgnore(),
             body, buffer);
     }
 }
index b8edf3fff2fa489ddddfd6112a7b109a8f05a32b..136acb7b3ba41cbe4f6964fda5604b2598a5de20 100644 (file)
@@ -55,11 +55,11 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
                 "Wrong instance of Message. Passed instance of %s. Need PcerrMessage.", message.getClass());
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message
             .PcerrMessage err = ((PcerrMessage) message).getPcerrMessage();
-        Preconditions.checkArgument(err.getErrors() != null && !err.getErrors().isEmpty(),
+        Preconditions.checkArgument(err.getErrors() != null && !err.nonnullErrors().isEmpty(),
                 "Errors should not be empty.");
         final ByteBuf buffer = Unpooled.buffer();
         serializeCases(err, buffer);
-        for (final Errors e : err.getErrors()) {
+        for (final Errors e : err.nonnullErrors()) {
             serializeObject(e.getErrorObject(), buffer);
         }
 
@@ -76,8 +76,7 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
             final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message
                 .PcerrMessage err, final ByteBuf buffer) {
         if (err.getErrorType() instanceof RequestCase) {
-            final List<Rps> rps = ((RequestCase) err.getErrorType()).getRequest().getRps();
-            for (final Rps r : rps) {
+            for (final Rps r : ((RequestCase) err.getErrorType()).getRequest().nonnullRps()) {
                 serializeObject(r.getRp(), buffer);
             }
         }
@@ -103,7 +102,7 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
             state = State.ERROR_IN;
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
-            if (o.isProcessingRule()) {
+            if (o.getProcessingRule()) {
                 errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
                 return null;
             }
index 886b20023adb323a36ec2042458b7a4a151c600f..e1f69d72ba26a1b1ca08cb89a451200abd8e5a60 100644 (file)
@@ -61,21 +61,15 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser {
         serializeObject(monRepMsg.getPccIdReq(), body);
         if (monRepMsg.getMonitoringMetricsList() instanceof GeneralMetricsList) {
             final GeneralMetricsList gml = (GeneralMetricsList) monRepMsg.getMonitoringMetricsList();
-            if (gml.getMetricPce() != null) {
-                for (final MetricPce metricPce : gml.getMetricPce()) {
-                    serializeMetricPce(metricPce, body);
-                }
+            for (final MetricPce metricPce : gml.nonnullMetricPce()) {
+                serializeMetricPce(metricPce, body);
             }
         } else if (monRepMsg.getMonitoringMetricsList() instanceof SpecificMetricsList) {
             final SpecificMetricsList sml = (SpecificMetricsList) monRepMsg.getMonitoringMetricsList();
-            if (sml.getSpecificMetrics() != null) {
-                for (final SpecificMetrics specificMetrics : sml.getSpecificMetrics()) {
-                    serializeObject(specificMetrics.getRp(), body);
-                    if (specificMetrics.getMetricPce() != null) {
-                        for (final MetricPce metricPce : specificMetrics.getMetricPce()) {
-                            serializeMetricPce(metricPce, body);
-                        }
-                    }
+            for (final SpecificMetrics specificMetrics : sml.nonnullSpecificMetrics()) {
+                serializeObject(specificMetrics.getRp(), body);
+                for (final MetricPce metricPce : specificMetrics.nonnullMetricPce()) {
+                    serializeMetricPce(metricPce, body);
                 }
             }
         }
index f0eda243e9411928a0a047f8f9800215ae11cc32..3c9e4621d359433abf97ba66ad2251f53e666f37 100644 (file)
@@ -123,7 +123,7 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
             case INIT:
                 if (obj instanceof Rp) {
                     final Rp rp = (Rp) obj;
-                    if (rp.isProcessingRule()) {
+                    if (rp.getProcessingRule()) {
                         errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
                         return null;
                     }
index 8e8fa94fbbc45f0d8663f4d1c906d80803b6ee24..e83b792618f167de8f4a703e409822476015703e 100644 (file)
@@ -101,10 +101,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         serializeObject(failure.getNoPath(), buffer);
         serializeObject(failure.getLspa(), buffer);
         serializeObject(failure.getBandwidth(), buffer);
-        if (failure.getMetrics() != null) {
-            for (final Metrics m : failure.getMetrics()) {
-                serializeObject(m.getMetric(), buffer);
-            }
+        for (final Metrics m : failure.nonnullMetrics()) {
+            serializeObject(m.getMetric(), buffer);
         }
         serializeObject(failure.getIro(), buffer);
     }
@@ -113,15 +111,13 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (success == null || success.getSuccess() == null) {
             return;
         }
-        for (final Paths p : success.getSuccess().getPaths()) {
+        for (final Paths p : success.getSuccess().nonnullPaths()) {
             serializeObject(p.getEro(), buffer);
             serializeObject(p.getLspa(), buffer);
             serializeObject(p.getOf(), buffer);
             serializeObject(p.getBandwidth(), buffer);
-            if (p.getMetrics() != null) {
-                for (final Metrics m : p.getMetrics()) {
-                    serializeObject(m.getMetric(), buffer);
-                }
+            for (final Metrics m : p.nonnullMetrics()) {
+                serializeObject(m.getMetric(), buffer);
             }
             serializeObject(p.getIro(), buffer);
         }
@@ -134,10 +130,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     }
 
     private void serializeMonitoringMetrics(final Replies reply, final ByteBuf buffer) {
-        if (reply.getMetricPce() != null) {
-            for (final MetricPce metricPce : reply.getMetricPce()) {
-                serializeMetricPce(metricPce, buffer);
-            }
+        for (final MetricPce metricPce : reply.nonnullMetricPce()) {
+            serializeMetricPce(metricPce, buffer);
         }
     }
 
index 911554a7287b173d8dfaaf614f5464d53cc8ca77..567cb91b455f1b13b83dbb8f1f95fae3298bdea5 100644 (file)
@@ -131,14 +131,14 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     }
 
     protected void serializeSvec(final PcreqMessage msg, final ByteBuf buffer) {
-        for (final Svec s : msg.getSvec()) {
+        for (final Svec s : msg.nonnullSvec()) {
             serializeObject(s.getSvec(), buffer);
             serializeObject(s.getOf(), buffer);
             serializeObject(s.getGc(), buffer);
             serializeObject(s.getXro(), buffer);
             if (s.getMetric() != null) {
                 for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcreq
-                        .message.pcreq.message.svec.Metric m : s.getMetric()) {
+                        .message.pcreq.message.svec.Metric m : s.nonnullMetric()) {
                     serializeObject(m.getMetric(), buffer);
                 }
             }
@@ -159,10 +159,8 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         serializeObject(p2p.getLoadBalancing(), buffer);
         serializeObject(p2p.getLspa(), buffer);
         serializeObject(p2p.getBandwidth(), buffer);
-        if (p2p.getMetrics() != null) {
-            for (final Metrics m : p2p.getMetrics()) {
-                serializeObject(m.getMetric(), buffer);
-            }
+        for (final Metrics m : p2p.nonnullMetrics()) {
+            serializeObject(m.getMetric(), buffer);
         }
         serializeObject(p2p.getIro(), buffer);
         serializeObject(p2p.getRro(), buffer);
@@ -190,11 +188,9 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         serializeObject(p2mp.getOf(), buffer);
         serializeObject(p2mp.getLspa(), buffer);
         serializeObject(p2mp.getBandwidth(), buffer);
-        if (p2mp.getMetric() != null) {
-            for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcreq
-                    .message.pcreq.message.requests.segment.computation.p2mp.Metric m : p2mp.getMetric()) {
-                serializeObject(m.getMetric(), buffer);
-            }
+        for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcreq
+                .message.pcreq.message.requests.segment.computation.p2mp.Metric m : p2mp.nonnullMetric()) {
+            serializeObject(m.getMetric(), buffer);
         }
         if (p2mp.getIroBncChoice() instanceof IroCase) {
             serializeObject(((IroCase) p2mp.getIroBncChoice()).getIro(), buffer);
@@ -212,10 +208,8 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     protected void serializeMonitoringRequest(final MonitoringRequest monReq, final ByteBuf out) {
         serializeObject(monReq.getMonitoring(), out);
         serializeObject(monReq.getPccIdReq(), out);
-        if (monReq.getPceIdList() != null) {
-            for (final PceIdList pceId : monReq.getPceIdList()) {
-                serializeObject(pceId.getPceId(), out);
-            }
+        for (final PceIdList pceId : monReq.nonnullPceIdList()) {
+            serializeObject(pceId.getPceId(), out);
         }
     }
 
@@ -268,7 +262,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             }
             rpObj = (Rp) objects.get(0);
             objects.remove(0);
-            if (!rpObj.isProcessingRule()) {
+            if (!rpObj.getProcessingRule()) {
                 errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
             } else {
                 rBuilder.setRp(rpObj);
@@ -278,7 +272,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                 rBuilder.setVendorInformationObject(vendorInfo);
             }
             // expansion
-            if (rpObj.isPathKey() && objects.get(0) instanceof PathKey) {
+            if (rpObj.getPathKey() && objects.get(0) instanceof PathKey) {
                 rBuilder.setPathKeyExpansion(
                         new PathKeyExpansionBuilder().setPathKey((PathKey) objects.get(0)).build());
             }
@@ -288,12 +282,12 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                 return null;
             }
 
-            if (!rpObj.isP2mp()) {
+            if (!rpObj.getP2mp()) {
                 // p2p
                 final P2pBuilder p2pBuilder = new P2pBuilder();
                 final EndpointsObj ep = (EndpointsObj) objects.get(0);
                 objects.remove(0);
-                if (!ep.isProcessingRule()) {
+                if (!ep.getProcessingRule()) {
                     errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.of(rpObj)));
                 } else {
                     p2pBuilder.setEndpointsObj(ep);
@@ -336,7 +330,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             builder.setVendorInformationObject(viObjects);
         }
 
-        if (rp.isReoptimization() && builder.getBandwidth() != null
+        if (rp.getReoptimization() && builder.getBandwidth() != null
                 && !builder.getReportedRoute().getReoptimizationBandwidth().getBandwidth().equals(
                         new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network
                             .concepts.rev131125.Bandwidth(new byte[] { 0 }))
@@ -427,7 +421,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             case OF_IN:
                 if (obj instanceof ClassType) {
                     final ClassType classType = (ClassType) obj;
-                    if (!classType.isProcessingRule()) {
+                    if (!classType.getProcessingRule()) {
                         errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.of(rp)));
                     } else {
                         builder.setClassType(classType);
@@ -520,7 +514,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             builder.setMetric(metrics);
         }
 
-        if (rp.isReoptimization() && builder.getBandwidth() != null) {
+        if (rp.getReoptimization() && builder.getBandwidth() != null) {
             if (!isValidReoptimizationRro(epRros) || !isValidReoptimizationBandwidth(epRros)) {
                 errors.add(createErrorMsg(PCEPErrors.RRO_MISSING, Optional.of(rp)));
             }
@@ -529,7 +523,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         return new SegmentComputationBuilder().setP2mp(builder.build()).build();
     }
 
-    private boolean isValidReoptimizationRro(final List<EndpointRroPair> epRros) {
+    private static boolean isValidReoptimizationRro(final List<EndpointRroPair> epRros) {
         for (EndpointRroPair epRro : epRros) {
             if (epRro.getRros() == null || epRro.getRros().isEmpty()) {
                 return false;
@@ -538,7 +532,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         return true;
     }
 
-    private boolean isValidReoptimizationBandwidth(final List<EndpointRroPair> epRros) {
+    private static boolean isValidReoptimizationBandwidth(final List<EndpointRroPair> epRros) {
         for (EndpointRroPair epRro : epRros) {
             if (epRro.getReoptimizationBandwidth() == null) {
                 return false;
@@ -557,7 +551,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             case RP:
                 if (obj instanceof EndpointsObj) {
                     final EndpointRroPairBuilder rroPairBuilder = new EndpointRroPairBuilder();
-                    if (obj.isProcessingRule()) {
+                    if (obj.getProcessingRule()) {
                         rroPairBuilder.setEndpointsObj((EndpointsObj) obj);
                     } else {
                         errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.of(rp)));
@@ -568,7 +562,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                 // fallthrough
             case ENDPOINT:
                 if (obj instanceof Rro || obj instanceof Srro) {
-                    if (obj.isProcessingRule()) {
+                    if (obj.getProcessingRule()) {
                         final int lastIndex = epRros.size() - 1;
                         final EndpointRroPair endpointRroPair = epRros.get(lastIndex);
                         List<Rros> rros = endpointRroPair.getRros();
index a1ae5985d8dca4fb05049b6da18073a0206248f8..c7091d96b4b9ea63c03c77eafdd7791d6e288ea9 100644 (file)
@@ -34,13 +34,13 @@ public abstract class AbstractPccIdReqObjectParser extends CommonObjectParser im
         if (pccIdReq.getIpAddress().getIpv4AddressNoZone() != null) {
             final ByteBuf body = Unpooled.buffer(Ipv4Util.IP4_LENGTH);
             Ipv4Util.writeIpv4Address(pccIdReq.getIpAddress().getIpv4AddressNoZone(), body);
-            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.isProcessingRule(), object.isIgnore(),
-                    body, buffer);
+            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.getProcessingRule(),
+                object.getIgnore(), body, buffer);
         } else if (pccIdReq.getIpAddress().getIpv6AddressNoZone() != null) {
             final ByteBuf body = Unpooled.buffer(Ipv6Util.IPV6_LENGTH);
             Ipv6Util.writeIpv6Address(pccIdReq.getIpAddress().getIpv6AddressNoZone(), body);
-            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.isProcessingRule(), object.isIgnore(),
-                    body, buffer);
+            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.getProcessingRule(),
+                object.getIgnore(), body, buffer);
         }
     }
 }
index 08a0cb5e86f5eb367d252e7a2e898f9039510f2a..f71ecb90d061ad776510baf441f60e87642082d5 100644 (file)
@@ -34,13 +34,13 @@ public abstract class AbstractPceIdObjectParser extends CommonObjectParser imple
         if (pceId.getIpAddress().getIpv4AddressNoZone() != null) {
             final ByteBuf body = Unpooled.buffer(Ipv4Util.IP4_LENGTH);
             Ipv4Util.writeIpv4Address(pceId.getIpAddress().getIpv4AddressNoZone(), body);
-            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.isProcessingRule(), object.isIgnore(),
-                body, buffer);
+            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.getProcessingRule(),
+                object.getIgnore(), body, buffer);
         } else if (pceId.getIpAddress().getIpv6AddressNoZone() != null) {
             final ByteBuf body = Unpooled.buffer(Ipv6Util.IPV6_LENGTH);
             Ipv6Util.writeIpv6Address(pceId.getIpAddress().getIpv6AddressNoZone(), body);
-            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.isProcessingRule(), object.isIgnore(),
-                body, buffer);
+            ObjectUtil.formatSubobject(getObjectType(), getObjectClass(), object.getProcessingRule(),
+                object.getIgnore(), body, buffer);
         }
     }
 }
index 7a5df2b5ef013abf1136cdfe5ed4a22235009828..6933b2b1a3f046b2f7bd16a7e6783e8b3188f39d 100644 (file)
@@ -49,7 +49,6 @@ public abstract class AbstractVendorInformationObjectParser extends CommonObject
         serializeEnterpriseSpecificInformation(((VendorInformationObject) object).getEnterpriseSpecificInformation(),
                 body);
         ObjectUtil.formatSubobject(VENDOR_INFORMATION_OBJECT_TYPE, VENDOR_INFORMATION_OBJECT_CLASS,
-                object.isProcessingRule(), object.isIgnore(), body, buffer);
+                object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
-
 }
index 24cf0b99d087e02425be9b436d1b40c3624e75c0..13ed96c34df47283ea13233e7a89b41c65af643a 100644 (file)
@@ -44,13 +44,13 @@ public final class PCEPBandwidthObjectParser extends CommonObjectParser implemen
                 "Wrong length of array of bytes. Passed: " + bytes.readableBytes()
                 + "; Expected: " + BANDWIDTH_F_LENGTH + ".");
         }
-        final BandwidthBuilder builder = new BandwidthBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+        return new BandwidthBuilder()
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setBandwidth(
                     new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125
-                    .Bandwidth(ByteArray.getAllBytes(bytes)));
-        return builder.build();
+                    .Bandwidth(ByteArray.getAllBytes(bytes)))
+                .build();
     }
 
     @Override
@@ -60,6 +60,6 @@ public final class PCEPBandwidthObjectParser extends CommonObjectParser implemen
             "Wrong instance of PCEPObject. Passed %s. Needed BandwidthObject.", object.getClass());
         final ByteBuf body = Unpooled.buffer();
         writeFloat32(((Bandwidth) object).getBandwidth(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index d880153ae8347bdc237e64cf54c096a570c12032..cd9f9d46121330f65bbdbe8e5c7e987cd6d50b9d 100644 (file)
@@ -54,7 +54,7 @@ public final class PCEPClassTypeObjectParser extends CommonObjectParser implemen
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Cannot be null or empty.");
-        if (!header.isProcessingRule()) {
+        if (!header.getProcessingRule()) {
             LOG.debug("Processed bit not set on CLASS TYPE OBJECT, ignoring it");
             return null;
         }
@@ -64,8 +64,8 @@ public final class PCEPClassTypeObjectParser extends CommonObjectParser implemen
         }
         final short ct = (short) bytes.readUnsignedInt();
         final ClassTypeBuilder builder = new ClassTypeBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setClassType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                         .ClassType(Uint8.valueOf(ct)));
 
@@ -86,6 +86,6 @@ public final class PCEPClassTypeObjectParser extends CommonObjectParser implemen
             .ClassType classType = ((ClassType) object).getClassType();
         checkArgument(classType != null, "ClassType is mandatory.");
         ByteBufUtils.write(body, classType.getValue());
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index dec46c3389c00a6d5d30e1961d12df1a5525f051..ef19b084c13fc4186659b599b783843343234c37 100644 (file)
@@ -54,12 +54,12 @@ public final class PCEPCloseObjectParser extends AbstractObjectWithTlvsParser<Tl
         final Uint8 reason = ByteBufUtils.readUint8(bytes);
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
-        final CCloseBuilder builder = new CCloseBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
-                .setReason(reason)
-                .setTlvs(tlvsBuilder.build());
-        return builder.build();
+        return new CCloseBuilder()
+            .setIgnore(header.getIgnore())
+            .setProcessingRule(header.getProcessingRule())
+            .setReason(reason)
+            .setTlvs(tlvsBuilder.build())
+            .build();
     }
 
     @Override
@@ -71,7 +71,7 @@ public final class PCEPCloseObjectParser extends AbstractObjectWithTlvsParser<Tl
         body.writeZero(RESERVED + FLAGS_F_LENGTH);
         ByteBufUtils.writeMandatory(body, obj.getReason(), "Reason");
         serializeTlvs(obj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index 51c16ae6b4120a6a69466f6806621f5dc9389a6e..72baf064e18963229e1fcfb387591999cf6b281f 100644 (file)
@@ -47,8 +47,8 @@ public final class PCEPErrorObjectParser extends AbstractObjectWithTlvsParser<Er
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         bytes.skipBytes(FLAGS_F_LENGTH + RESERVED);
         final ErrorObjectBuilder builder = new ErrorObjectBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setType(ByteBufUtils.readUint8(bytes))
                 .setValue(ByteBufUtils.readUint8(bytes));
         parseTlvs(builder, bytes.slice());
@@ -73,7 +73,7 @@ public final class PCEPErrorObjectParser extends AbstractObjectWithTlvsParser<Er
         ByteBufUtils.writeMandatory(body, errObj.getType(), "Type");
         ByteBufUtils.writeMandatory(body, errObj.getValue(), "Value");
         serializeTlvs(errObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index b93bb87cf0c5ea8c2ec4d6b4cee46920de869721..2e1a2e52d56719be5f2b1ed3caec9b089dd86308 100644 (file)
@@ -37,8 +37,8 @@ public final class PCEPExcludeRouteObjectParser extends AbstractXROWithSubobject
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         bytes.skipBytes(FLAGS_OFFSET);
         return new XroBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setFlags(new Flags(bytes.readBoolean()))
                 .setSubobject(parseSubobjects(bytes.slice()))
                 .build();
@@ -52,8 +52,8 @@ public final class PCEPExcludeRouteObjectParser extends AbstractXROWithSubobject
         final ByteBuf body = Unpooled.buffer();
         body.writeZero(FLAGS_OFFSET);
         final Flags flags = obj.getFlags();
-        body.writeBoolean(flags != null && Boolean.TRUE.equals(flags.isFail()));
+        body.writeBoolean(flags != null && Boolean.TRUE.equals(flags.getFail()));
         serializeSubobject(obj.getSubobject(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index fe4b726803d4b1cae4b23ae24c6e08e74fe6cb3c..3ba6b39fc9c4d014e02459792399b46a2a33925e 100644 (file)
@@ -44,8 +44,8 @@ public class PCEPExistingBandwidthObjectParser extends CommonObjectParser implem
                     + "; Expected: " + PCEPBandwidthObjectParser.BANDWIDTH_F_LENGTH + ".");
         }
         final ReoptimizationBandwidthBuilder builder = new ReoptimizationBandwidthBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setBandwidth(
                     new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125
                         .Bandwidth(ByteArray.getAllBytes(bytes)));
@@ -61,6 +61,6 @@ public class PCEPExistingBandwidthObjectParser extends CommonObjectParser implem
                 object.getClass());
         final ByteBuf body = Unpooled.buffer();
         writeFloat32(((ReoptimizationBandwidth) object).getBandwidth(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index e34391c759a078a5e4ffdad5a0a9dcef20d898c9..89e8be945a89e45b9694d95c950b868c348cad97 100644 (file)
@@ -33,20 +33,20 @@ public final class PCEPExplicitRouteObjectParser extends AbstractEROWithSubobjec
     public Ero parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {
         // Explicit approval of empty ERO
         Preconditions.checkArgument(buffer != null, "Array of bytes is mandatory. Can't be null.");
-        final EroBuilder builder = new EroBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
-                .setSubobject(parseSubobjects(buffer));
-        return builder.build();
+        return new EroBuilder()
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
+                .setSubobject(parseSubobjects(buffer))
+                .build();
     }
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof Ero,
             "Wrong instance of PCEPObject. Passed %s. Needed EroObject.", object.getClass());
-        final Ero ero = ((Ero) object);
+        final Ero ero = (Ero) object;
         final ByteBuf body = Unpooled.buffer();
         serializeSubobject(ero.getSubobject(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 709f61a560d1f2a44ecbcf5cab0ed4e5cbfa0a04..ebe0428caa79d924f834c9a631d9461c6653dbfc 100644 (file)
@@ -41,8 +41,8 @@ public class PCEPGlobalConstraintsObjectParser extends AbstractObjectWithTlvsPar
     public Gc parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Cannot be null or empty.");
         final GcBuilder builder = new GcBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setMaxHop(ByteBufUtils.readUint8(bytes))
                 .setMaxUtilization(ByteBufUtils.readUint8(bytes))
                 .setMinUtilization(ByteBufUtils.readUint8(bytes))
@@ -63,7 +63,7 @@ public class PCEPGlobalConstraintsObjectParser extends AbstractObjectWithTlvsPar
         ByteBufUtils.writeOrZero(body, specObj.getMinUtilization());
         ByteBufUtils.writeOrZero(body, specObj.getOverBookingFactor());
         serializeTlvs(specObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index 141fe4a6559af67982b996e59de792a19a3cb92f..896d89d20dbc1066a15785f9340f4e8a5892f41c 100644 (file)
@@ -42,34 +42,34 @@ public final class PCEPIncludeRouteObjectParser extends AbstractEROWithSubobject
         for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit
                 .route.object.ero.Subobject s : parseSubobjects(bytes)) {
             subs.add(new SubobjectBuilder()
-                .setLoose(s.isLoose())
+                .setLoose(s.getLoose())
                 .setSubobjectType(s.getSubobjectType())
                 .build());
         }
-        final IroBuilder builder = new IroBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
-                .setSubobject(subs);
-        return builder.build();
+        return new IroBuilder()
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
+                .setSubobject(subs)
+                .build();
     }
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof Iro,
             "Wrong instance of PCEPObject. Passed %s. Needed IroObject.", object.getClass());
-        final Iro iro = ((Iro) object);
+        final Iro iro = (Iro) object;
         final ByteBuf body = Unpooled.buffer();
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit
             .route.object.ero.Subobject> subs = new ArrayList<>();
-        for (final Subobject s : iro.getSubobject()) {
+        for (final Subobject s : iro.nonnullSubobject()) {
             subs.add(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                     .explicit.route.object.ero.SubobjectBuilder()
-                        .setLoose(s.isLoose())
+                        .setLoose(s.getLoose())
                         .setSubobjectType(s.getSubobjectType())
                         .build());
         }
         serializeSubobject(subs, body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 906307c4a883265a7140e16ead5490583ab77b48..ffdd4d90172e6210ad47f1742c70b54c5c8f70d1 100644 (file)
@@ -47,8 +47,8 @@ public final class PCEPLoadBalancingObjectParser extends CommonObjectParser impl
         }
         bytes.skipBytes(RESERVED + FLAGS_F_LENGTH);
         return new LoadBalancingBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setMaxLsp(ByteBufUtils.readUint8(bytes))
                 .setMinBandwidth(new Bandwidth(ByteArray.readAllBytes(bytes)))
                 .build();
@@ -63,6 +63,6 @@ public final class PCEPLoadBalancingObjectParser extends CommonObjectParser impl
         body.writeZero(RESERVED + FLAGS_F_LENGTH);
         ByteBufUtils.writeOrZero(body, specObj.getMaxLsp());
         writeFloat32(specObj.getMinBandwidth(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index f8edc250bb8ae61e81a3b544b4903c3ba0977c53..113ef8e81ffc90f37b3b7e2267c4708aab51d9c4 100644 (file)
@@ -53,8 +53,8 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
     public Lspa parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Cannot be null or empty.");
         final LspaBuilder builder = new LspaBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setExcludeAny(new AttributeFilter(ByteBufUtils.readUint32(bytes)))
                 .setIncludeAll(new AttributeFilter(ByteBufUtils.readUint32(bytes)))
                 .setIncludeAny(new AttributeFilter(ByteBufUtils.readUint32(bytes)))
@@ -81,11 +81,11 @@ public class PCEPLspaObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         ByteBufUtils.writeOrZero(body, lspaObj.getSetupPriority());
         ByteBufUtils.writeOrZero(body, lspaObj.getHoldPriority());
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(L_FLAG_OFFSET, lspaObj.isLocalProtectionDesired());
+        flags.set(L_FLAG_OFFSET, lspaObj.getLocalProtectionDesired());
         flags.toByteBuf(body);
         body.writeZero(RESERVED);
         serializeTlvs(lspaObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index 438ad68d467f0c9d3de3398dc62af80194a0dbb1..58aa8ad4feb25a78e74705e2e2068c68f581d124 100644 (file)
@@ -63,8 +63,8 @@ public final class PCEPMetricObjectParser extends CommonObjectParser implements
         bytes.skipBytes(RESERVED);
         final BitArray flags = BitArray.valueOf(bytes.readByte());
         return new MetricBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setBound(flags.get(B_FLAG_OFFSET))
                 .setComputed(flags.get(C_FLAG_OFFSET))
                 .setMetricType(ByteBufUtils.readUint8(bytes))
@@ -80,11 +80,11 @@ public final class PCEPMetricObjectParser extends CommonObjectParser implements
         final ByteBuf body = Unpooled.buffer(SIZE);
         body.writeZero(RESERVED);
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(C_FLAG_OFFSET, mObj.isComputed());
-        flags.set(B_FLAG_OFFSET, mObj.isBound());
+        flags.set(C_FLAG_OFFSET, mObj.getComputed());
+        flags.set(B_FLAG_OFFSET, mObj.getBound());
         flags.toByteBuf(body);
         ByteBufUtils.writeMandatory(body, mObj.getMetricType(), "MetricType");
         writeFloat32(mObj.getValue(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 493c4c13618fc4bcb5711b3edd594550c52f0e53..ee37bfd31a770a7944d6f020bb6a7a68fa8942bc 100644 (file)
@@ -76,15 +76,15 @@ public class PCEPMonitoringObjectParser extends AbstractObjectWithTlvsParser<Tlv
         body.writeZero(RESERVED);
         final Flags flags = monitoring.getFlags();
         final BitArray flagBits = new BitArray(FLAGS_SIZE);
-        flagBits.set(I_FLAG_POS, flags.isIncomplete());
-        flagBits.set(C_FLAG_POS, flags.isOverload());
-        flagBits.set(P_FLAG_POS, flags.isProcessingTime());
-        flagBits.set(G_FLAG_POS, flags.isGeneral());
-        flagBits.set(L_FLAG_POS, flags.isLiveness());
+        flagBits.set(I_FLAG_POS, flags.getIncomplete());
+        flagBits.set(C_FLAG_POS, flags.getOverload());
+        flagBits.set(P_FLAG_POS, flags.getProcessingTime());
+        flagBits.set(G_FLAG_POS, flags.getGeneral());
+        flagBits.set(L_FLAG_POS, flags.getLiveness());
         flagBits.toByteBuf(body);
         ByteBufUtils.writeOrZero(body, monitoring.getMonitoringId());
         serializeTlvs(monitoring.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     @Override
index 374ce2a6df567cbe14ce24b10ab2001b7b07cd5c..fb5355082c6c976621116f5eac926d19a72fa4c0 100644 (file)
@@ -62,8 +62,8 @@ public class PCEPNoPathObjectParser extends AbstractObjectWithTlvsParser<TlvsBui
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
         return new NoPathBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setNatureOfIssue(issue)
                 .setUnsatisfiedConstraints(flags.get(C_FLAG_OFFSET))
                 .setTlvs(tlvsBuilder.build())
@@ -85,11 +85,11 @@ public class PCEPNoPathObjectParser extends AbstractObjectWithTlvsParser<TlvsBui
         final ByteBuf body = Unpooled.buffer();
         ByteBufUtils.writeMandatory(body, nPObj.getNatureOfIssue(), "NatureOfIssue");
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(C_FLAG_OFFSET, nPObj.isUnsatisfiedConstraints());
+        flags.set(C_FLAG_OFFSET, nPObj.getUnsatisfiedConstraints());
         flags.toByteBuf(body);
         body.writeZero(RESERVED_F_LENGTH);
         serializeTlvs(nPObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index df8c1922c297db5963456041e84c750ec556edc2..2d504107837072a54fa8cf99a03d57a5d5572c58 100644 (file)
@@ -49,8 +49,8 @@ public final class PCEPNotificationObjectParser extends AbstractObjectWithTlvsPa
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         bytes.skipBytes(NT_F_OFFSET);
         final CNotificationBuilder builder = new CNotificationBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setType(ByteBufUtils.readUint8(bytes))
                 .setValue(ByteBufUtils.readUint8(bytes));
         parseTlvs(builder, bytes.slice());
@@ -74,7 +74,7 @@ public final class PCEPNotificationObjectParser extends AbstractObjectWithTlvsPa
         ByteBufUtils.writeMandatory(body, notObj.getType(), "Type");
         ByteBufUtils.writeMandatory(body, notObj.getValue(), "Value");
         serializeTlvs(notObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index 969bf5c8e366f97328275266f9b87a550b0ca880..e6e8f418f022927bda200cc9ce791de79d70aa12 100644 (file)
@@ -48,8 +48,8 @@ public final class PCEPObjectiveFunctionObjectParser extends AbstractObjectWithT
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
         return new OfBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setCode(new OfId(ofId))
                 .setTlvs(tlvsBuilder.build())
                 .build();
@@ -67,7 +67,7 @@ public final class PCEPObjectiveFunctionObjectParser extends AbstractObjectWithT
         ByteBufUtils.write(body, code.getValue());
         body.writeZero(RESERVED);
         serializeTlvs(specObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index bd1099d1bccb6928a31dd09caacc99f29147f66f..0f282cbef4150de3b6cd3a2f2d82fb856024f537 100644 (file)
@@ -72,8 +72,8 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         parseTlvs(tbuilder, bytes.slice());
         final OpenBuilder builder = new OpenBuilder()
                 .setVersion(new ProtocolVersion(Uint8.valueOf(versionValue)))
-                .setProcessingRule(header.isProcessingRule())
-                .setIgnore(header.isIgnore())
+                .setProcessingRule(header.getProcessingRule())
+                .setIgnore(header.getIgnore())
                 .setKeepalive(Uint8.valueOf(keepalive))
                 .setSessionId(sessionId)
                 .setTlvs(tbuilder.build());
@@ -111,7 +111,7 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         ByteBufUtils.writeOrZero(body, open.getDeadTimer());
         ByteBufUtils.writeMandatory(body, open.getSessionId(), "SessionId");
         serializeTlvs(open.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index 2daae370100feab6c1c7331b2178dff47e86980b..4333957c937dfc59271934faf2d509d18448a583 100644 (file)
@@ -40,7 +40,7 @@ public class PCEPOverloadObjectParser extends CommonObjectParser implements Obje
         final ByteBuf body = Unpooled.buffer(BODY_SIZE);
         body.writeZero(RESERVED + FLAGS);
         ByteBufUtils.writeOrZero(body, overload.getDuration());
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     @Override
index 7e365bef6bed1ffde82224b8bca9679adf50663c..b7561fdef9f5593791ffb352829014e26095ec3a 100644 (file)
@@ -45,14 +45,14 @@ public final class PCEPPathKeyObjectParser extends AbstractEROWithSubobjectsPars
         final List<Subobject> subs = parseSubobjects(bytes);
         for (final Subobject sub : subs) {
             final PathKeyCase pkc = (PathKeyCase) sub.getSubobjectType();
-            pk.add(new PathKeysBuilder().setLoose(sub.isLoose()).setPceId(pkc.getPathKey().getPceId())
+            pk.add(new PathKeysBuilder().setLoose(sub.getLoose()).setPceId(pkc.getPathKey().getPceId())
                 .setPathKey(pkc.getPathKey().getPathKey()).build());
         }
-        final PathKeyBuilder builder = new PathKeyBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
-                .setPathKeys(pk);
-        return builder.build();
+        return new PathKeyBuilder()
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
+                .setPathKeys(pk)
+                .build();
     }
 
     @Override
@@ -61,11 +61,10 @@ public final class PCEPPathKeyObjectParser extends AbstractEROWithSubobjectsPars
             "Wrong instance of PCEPObject. Passed %s. Needed PathKeyObject.", object.getClass());
         final PathKey pkey = (PathKey) object;
         final ByteBuf body = Unpooled.buffer();
-        final List<PathKeys> pks = pkey.getPathKeys();
         final List<Subobject> subs = new ArrayList<>();
-        for (final PathKeys pk : pks) {
+        for (final PathKeys pk : pkey.nonnullPathKeys()) {
             subs.add(new SubobjectBuilder()
-                    .setLoose(pk.isLoose())
+                    .setLoose(pk.getLoose())
                     .setSubobjectType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp
                         .rev150820.explicit.route.subobjects.subobject.type.PathKeyCaseBuilder()
                         .setPathKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp
@@ -77,6 +76,6 @@ public final class PCEPPathKeyObjectParser extends AbstractEROWithSubobjectsPars
                     .build());
         }
         serializeSubobject(subs, body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index b2f0b23faa164b20610b2a34041658c3fa32d07f..e8da9c76e0e12b70d00c2a4d561261dd5e814db4 100644 (file)
@@ -47,14 +47,14 @@ public class PCEPProcTimeObjectParser extends CommonObjectParser implements Obje
         final ByteBuf body = Unpooled.buffer(BODY_SIZE);
         body.writeZero(RESERVED);
         final BitArray flagBits = new BitArray(FLAGS);
-        flagBits.set(E_FLAG_POSITION, procTime.isEstimated());
+        flagBits.set(E_FLAG_POSITION, procTime.getEstimated());
         flagBits.toByteBuf(body);
         ByteBufUtils.writeOrZero(body, procTime.getCurrentProcTime());
         ByteBufUtils.writeOrZero(body, procTime.getMinProcTime());
         ByteBufUtils.writeOrZero(body, procTime.getMaxProcTime());
         ByteBufUtils.writeOrZero(body, procTime.getAverageProcTime());
         ByteBufUtils.writeOrZero(body, procTime.getVarianceProcTime());
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     @Override
index 88d6cba445eaace3a736d91b72890f34077c4fde..01aee5a255ab5c10327f3f44cebf194bc05a60e3 100644 (file)
@@ -33,11 +33,11 @@ public final class PCEPReportedRouteObjectParser extends AbstractRROWithSubobjec
     public Rro parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         Preconditions.checkArgument(bytes != null && bytes.isReadable(),
             "Array of bytes is mandatory. Can't be null or empty.");
-        final RroBuilder builder = new RroBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
-                .setSubobject(parseSubobjects(bytes.slice()));
-        return builder.build();
+        return new RroBuilder()
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
+                .setSubobject(parseSubobjects(bytes.slice()))
+                .build();
     }
 
     @Override
@@ -47,6 +47,6 @@ public final class PCEPReportedRouteObjectParser extends AbstractRROWithSubobjec
         final Rro obj = (Rro) object;
         final ByteBuf body = Unpooled.buffer();
         serializeSubobject(obj.getSubobject(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 7d8ffc243acf9b46f846563dae433266ff924478..7eefa33e6c2e366c15078b54881a6c200d4c2883 100644 (file)
@@ -96,8 +96,8 @@ public class PCEPRequestParameterObjectParser extends AbstractObjectWithTlvsPars
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
         parseTlvs(tlvsBuilder, bytes.slice());
         final RpBuilder builder = new RpBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setFragmentation(flags.get(F_FLAG_OFFSET))
                 .setP2mp(flags.get(N_FLAG_OFFSET))
                 .setEroCompression(flags.get(E_FLAG_OFFSET))
@@ -139,16 +139,16 @@ public class PCEPRequestParameterObjectParser extends AbstractObjectWithTlvsPars
         final ByteBuf body = Unpooled.buffer();
         final Rp rpObj = (Rp) object;
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(R_FLAG_OFFSET, rpObj.isReoptimization());
-        flags.set(B_FLAG_OFFSET, rpObj.isBiDirectional());
-        flags.set(O_FLAG_OFFSET, rpObj.isLoose());
-        flags.set(M_FLAG_OFFSET, rpObj.isMakeBeforeBreak());
-        flags.set(D_FLAG_OFFSET, rpObj.isOrder());
-        flags.set(P_FLAG_OFFSET, rpObj.isPathKey());
-        flags.set(S_FLAG_OFFSET, rpObj.isSupplyOf());
-        flags.set(F_FLAG_OFFSET, rpObj.isFragmentation());
-        flags.set(N_FLAG_OFFSET, rpObj.isP2mp());
-        flags.set(E_FLAG_OFFSET, rpObj.isEroCompression());
+        flags.set(R_FLAG_OFFSET, rpObj.getReoptimization());
+        flags.set(B_FLAG_OFFSET, rpObj.getBiDirectional());
+        flags.set(O_FLAG_OFFSET, rpObj.getLoose());
+        flags.set(M_FLAG_OFFSET, rpObj.getMakeBeforeBreak());
+        flags.set(D_FLAG_OFFSET, rpObj.getOrder());
+        flags.set(P_FLAG_OFFSET, rpObj.getPathKey());
+        flags.set(S_FLAG_OFFSET, rpObj.getSupplyOf());
+        flags.set(F_FLAG_OFFSET, rpObj.getFragmentation());
+        flags.set(N_FLAG_OFFSET, rpObj.getP2mp());
+        flags.set(E_FLAG_OFFSET, rpObj.getEroCompression());
         final byte[] res = flags.array();
         if (rpObj.getPriority() != null) {
             final byte p = rpObj.getPriority().byteValue();
@@ -159,7 +159,7 @@ public class PCEPRequestParameterObjectParser extends AbstractObjectWithTlvsPars
         checkArgument(requestId != null, "RequestId is mandatory");
         ByteBufUtils.write(body, requestId.getValue());
         serializeTlvs(rpObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     public void serializeTlvs(final Tlvs tlvs, final ByteBuf body) {
index cdc0edfffff1904014564e82a6cda70b9350e4d4..7b2a0c3e5587a6cfc7408001b045ab398895ae9a 100644 (file)
@@ -37,12 +37,12 @@ public final class PCEPSecondaryExplicitRouteObjecParser extends AbstractEROWith
         Preconditions.checkArgument(buffer != null && buffer.isReadable(), EMPTY_ARRAY_ERROR);
 
         final SeroBuilder builder = new SeroBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         final List<Subobject> subObjects = parseSubobjects(buffer);
 
         builder.setSubobject(subObjects.stream()
-            .map(so -> new SubobjectBuilder().setLoose(so.isLoose()).setSubobjectType(so.getSubobjectType()).build())
+            .map(so -> new SubobjectBuilder().setLoose(so.getLoose()).setSubobjectType(so.getSubobjectType()).build())
             .collect(Collectors.toList()));
 
         return builder.build();
@@ -52,16 +52,16 @@ public final class PCEPSecondaryExplicitRouteObjecParser extends AbstractEROWith
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof Sero,
             "Wrong instance of PCEPObject. Passed %s. Needed EroObject.", object.getClass());
-        final Sero sero = ((Sero) object);
+        final Sero sero = (Sero) object;
         final ByteBuf body = Unpooled.buffer();
-        final List<Subobject> subObjects = sero.getSubobject().stream()
+        final List<Subobject> subObjects = sero.nonnullSubobject().stream()
             .map(so -> new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                 .explicit.route.object.ero.SubobjectBuilder()
-                    .setLoose(so.isLoose())
+                    .setLoose(so.getLoose())
                     .setSubobjectType(so.getSubobjectType())
                     .build())
             .collect(Collectors.toList());
         serializeSubobject(subObjects, body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index b7b555f9dd66602cb81b393a4c6ac542ec37931e..e7d521a046ea7f854ad10b8cadf2b02abaf23c18 100644 (file)
@@ -37,15 +37,15 @@ public final class PCEPSecondaryRecordRouteObjectParser extends AbstractRROWithS
         Preconditions.checkArgument(buffer != null && buffer.isReadable(), EMPTY_ARRAY_ERROR);
 
         final SrroBuilder builder = new SrroBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         final List<Subobject> subObjects = parseSubobjects(buffer);
 
         builder.setSubobject(subObjects.stream()
             .map(so -> new SubobjectBuilder()
                     .setSubobjectType(so.getSubobjectType())
-                    .setProtectionAvailable(so.isProtectionAvailable())
-                    .setProtectionInUse(so.isProtectionInUse())
+                    .setProtectionAvailable(so.getProtectionAvailable())
+                    .setProtectionInUse(so.getProtectionInUse())
                     .build())
             .collect(Collectors.toList()));
 
@@ -56,17 +56,17 @@ public final class PCEPSecondaryRecordRouteObjectParser extends AbstractRROWithS
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof Srro,
             "Wrong instance of PCEPObject. Passed %s. Needed EroObject.", object.getClass());
-        final Srro sero = ((Srro) object);
+        final Srro sero = (Srro) object;
         final ByteBuf body = Unpooled.buffer();
-        final List<Subobject> subObjects = sero.getSubobject().stream()
+        final List<Subobject> subObjects = sero.nonnullSubobject().stream()
             .map(so -> new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                 .reported.route.object.rro.SubobjectBuilder()
                     .setSubobjectType(so.getSubobjectType())
-                    .setProtectionAvailable(so.isProtectionAvailable())
-                    .setProtectionInUse(so.isProtectionInUse())
+                    .setProtectionAvailable(so.getProtectionAvailable())
+                    .setProtectionInUse(so.getProtectionInUse())
                     .build())
             .collect(Collectors.toList());
         serializeSubobject(subObjects, body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 6b32e78ffe0cf723a417f7372e0d5698e21e2ae8..c3548a25a1a7730f50915fb50b054619619dbac5 100644 (file)
@@ -78,8 +78,8 @@ public final class PCEPSvecObjectParser extends CommonObjectParser implements Ob
             throw new PCEPDeserializerException("Empty Svec Object - no request ids.");
         }
         return new SvecBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setLinkDiverse(flags.get(L_FLAG_OFFSET))
                 .setNodeDiverse(flags.get(N_FLAG_OFFSET))
                 .setSrlgDiverse(flags.get(S_FLAG_OFFSET))
@@ -97,11 +97,11 @@ public final class PCEPSvecObjectParser extends CommonObjectParser implements Ob
         final ByteBuf body = Unpooled.buffer();
         body.writeZero(FLAGS_F_OFFSET);
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(L_FLAG_OFFSET, svecObj.isLinkDiverse());
-        flags.set(N_FLAG_OFFSET, svecObj.isNodeDiverse());
-        flags.set(S_FLAG_OFFSET, svecObj.isSrlgDiverse());
-        flags.set(D_FLAG_OFFSET, svecObj.isLinkDirectionDiverse());
-        flags.set(P_FLAG_OFFSET, svecObj.isPartialPathDiverse());
+        flags.set(L_FLAG_OFFSET, svecObj.getLinkDiverse());
+        flags.set(N_FLAG_OFFSET, svecObj.getNodeDiverse());
+        flags.set(S_FLAG_OFFSET, svecObj.getSrlgDiverse());
+        flags.set(D_FLAG_OFFSET, svecObj.getLinkDirectionDiverse());
+        flags.set(P_FLAG_OFFSET, svecObj.getPartialPathDiverse());
         flags.toByteBuf(body);
 
         final List<RequestId> requestIDs = svecObj.getRequestsIds();
@@ -110,6 +110,6 @@ public final class PCEPSvecObjectParser extends CommonObjectParser implements Ob
         for (final RequestId requestId : requestIDs) {
             ByteBufUtils.write(body, requestId.getValue());
         }
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 8f080e40231ffce42dddd2a4eb0ecacaaad73b53..20775daad9a0fac88dbc20ab41b998d699884645 100644 (file)
@@ -30,7 +30,7 @@ public final class BNCUtil {
                 Preconditions.checkArgument(type instanceof IpPrefixCase,
                     "Wrong instance of PCEPObject. Passed %s. Needed IpPrefixCase.", type.getClass());
                 return new SubobjectBuilder().setIpPrefix(((IpPrefixCase) type).getIpPrefix().getIpPrefix())
-                    .setLoose(sob.isLoose()).build();
+                    .setLoose(sob.getLoose()).build();
             }).collect(Collectors.toList());
     }
 
@@ -45,7 +45,7 @@ public final class BNCUtil {
                 return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                     .explicit.route.object.ero.SubobjectBuilder()
                     .setSubobjectType(subObjType)
-                    .setLoose(sob.isLoose())
+                    .setLoose(sob.getLoose())
                     .build();
             }).collect(Collectors.toList());
     }
index a22925d1f83f6a99efa584d7820f43c8a005e001..0bc2280446ca2da6411e9d3f8b0fd8418df3ce7e 100644 (file)
@@ -33,20 +33,20 @@ public final class BranchNodeListObjectParser extends AbstractEROWithSubobjectsP
         throws PCEPDeserializerException {
         Preconditions.checkArgument(bytes != null && bytes.isReadable(),
             "Array of bytes is mandatory. Can't be null or empty.");
-        final BranchNodeListBuilder builder = new BranchNodeListBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
-        builder.setSubobject(BNCUtil.toBncSubobject(parseSubobjects(bytes))).build();
-        return builder.build();
+        return new BranchNodeListBuilder()
+            .setIgnore(header.getIgnore())
+            .setProcessingRule(header.getProcessingRule())
+            .setSubobject(BNCUtil.toBncSubobject(parseSubobjects(bytes)))
+            .build();
     }
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof BranchNodeList,
             "Wrong instance of PCEPObject. Passed %s. Needed BranchNodeList.", object.getClass());
-        final BranchNodeList nbnc = ((BranchNodeList) object);
+        final BranchNodeList nbnc = (BranchNodeList) object;
         final ByteBuf body = Unpooled.buffer();
         serializeSubobject(BNCUtil.toIroSubject(nbnc.getSubobject()), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 6d67ee0da160f96e18902741f4cc9401e724a7f2..fd3609c35cb94c711ee1f0440850b343861ef4b7 100644 (file)
@@ -32,20 +32,20 @@ public final class NonBranchNodeListObjectParser extends AbstractEROWithSubobjec
         throws PCEPDeserializerException {
         Preconditions.checkArgument(bytes != null && bytes.isReadable(),
             "Array of bytes is mandatory. Can't be null or empty.");
-        final NonBranchNodeListBuilder builder = new NonBranchNodeListBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
-        builder.setSubobject(BNCUtil.toBncSubobject(parseSubobjects(bytes)));
-        return builder.build();
+        return new NonBranchNodeListBuilder()
+            .setIgnore(header.getIgnore())
+            .setProcessingRule(header.getProcessingRule())
+            .setSubobject(BNCUtil.toBncSubobject(parseSubobjects(bytes)))
+            .build();
     }
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof NonBranchNodeList,
             "Wrong instance of PCEPObject. Passed %s. Needed NonBranchNodeList.", object.getClass());
-        final NonBranchNodeList nbnc = ((NonBranchNodeList) object);
+        final NonBranchNodeList nbnc = (NonBranchNodeList) object;
         final ByteBuf body = Unpooled.buffer();
         serializeSubobject(BNCUtil.toIroSubject(nbnc.getSubobject()), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 }
index 2261938be562b505dfc982a202cda464257d9b05..b54b9059ad3fba6e9dbe0ae9a14b499fad27578a 100644 (file)
@@ -57,7 +57,7 @@ public class PCEPEndPointsIpv4ObjectParser extends CommonObjectParser {
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         final EndpointsObjBuilder builder = new EndpointsObjBuilder();
-        if (!header.isProcessingRule()) {
+        if (!header.getProcessingRule()) {
             LOG.debug("Processed bit not set on Endpoints OBJECT, ignoring it.");
             return new UnknownObject(PCEPErrors.P_FLAG_NOT_SET, builder.build());
         }
@@ -67,8 +67,8 @@ public class PCEPEndPointsIpv4ObjectParser extends CommonObjectParser {
         final Ipv4Builder ipv4bldr = new Ipv4Builder()
                 .setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes))
                 .setDestinationIpv4Address(Ipv4Util.addressForByteBuf(bytes));
-        builder.setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+        builder.setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setAddressFamily(new Ipv4CaseBuilder().setIpv4(ipv4bldr.build()).build());
         return builder.build();
     }
index 0dcd4174dfac077203384a06c86565eacd4bf12d..7c907738665a8fa81c6af89bbc89de8ede4484f2 100644 (file)
@@ -57,7 +57,7 @@ public final class PCEPEndPointsIpv6ObjectParser extends CommonObjectParser {
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         final EndpointsObjBuilder builder = new EndpointsObjBuilder();
-        if (!header.isProcessingRule()) {
+        if (!header.getProcessingRule()) {
             LOG.debug("Processed bit not set on Endpoints OBJECT, ignoring it.");
             return new UnknownObject(PCEPErrors.P_FLAG_NOT_SET, builder.build());
         }
@@ -67,8 +67,8 @@ public final class PCEPEndPointsIpv6ObjectParser extends CommonObjectParser {
         final Ipv6Builder ipv6bldr = new Ipv6Builder()
                 .setSourceIpv6Address(Ipv6Util.addressForByteBuf(bytes))
                 .setDestinationIpv6Address(Ipv6Util.addressForByteBuf(bytes));
-        return builder.setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+        return builder.setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setAddressFamily(new Ipv6CaseBuilder().setIpv6(ipv6bldr.build()).build())
                 .build();
     }
index 76c4319eaff8027ae5079dd54769140ad0c3806c..e94b05dabe287b3613ce6fc8aeea0ba66a4be135 100644 (file)
@@ -30,8 +30,8 @@ public final class PCEPEndPointsObjectSerializer implements ObjectSerializer {
             "Wrong instance of PCEPObject. Passed %s. Needed EndpointsObject.", object.getClass());
         final EndpointsObj ePObj = (EndpointsObj) object;
         final AddressFamily afi = ePObj.getAddressFamily();
-        final Boolean processing = object.isProcessingRule();
-        final Boolean ignore = object.isIgnore();
+        final Boolean processing = object.getProcessingRule();
+        final Boolean ignore = object.getIgnore();
         if (afi instanceof Ipv6Case) {
             final Ipv6 ipv6 = ((Ipv6Case) afi).getIpv6();
             PCEPEndPointsIpv6ObjectParser.serializeObject(processing, ignore, ipv6, buffer);
index 24815858d91eede2e8fe110f1eb41170b32bf30a..1598b8e10eff8398969a44aceb39f40417fb23f4 100644 (file)
@@ -59,15 +59,15 @@ public class PCEPP2MPEndPointsIpv4ObjectParser extends CommonObjectParser {
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         final EndpointsObjBuilder builder = new EndpointsObjBuilder();
-        if (!header.isProcessingRule()) {
+        if (!header.getProcessingRule()) {
             LOG.debug("Processed bit not set on Endpoints OBJECT, ignoring it.");
             return new UnknownObject(PCEPErrors.P_FLAG_NOT_SET, builder.build());
         }
         if (bytes.readableBytes() % Ipv4Util.IP4_LENGTH != 0) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         final P2mpIpv4Builder p2mpIpv4Builder = new P2mpIpv4Builder();
         p2mpIpv4Builder.setP2mpLeaves(P2mpLeaves.forValue(bytes.readInt()));
         p2mpIpv4Builder.setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes));
index 15dadb1da40812288b99442dae7225addda9cfdf..3709a63277a0dc668f25336bbfdbb51c1e12367c 100644 (file)
@@ -59,7 +59,7 @@ public class PCEPP2MPEndPointsIpv6ObjectParser extends CommonObjectParser {
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
-        if (!header.isProcessingRule()) {
+        if (!header.getProcessingRule()) {
             LOG.debug("Processed bit not set on Endpoints OBJECT, ignoring it.");
             return new UnknownObject(PCEPErrors.P_FLAG_NOT_SET, new EndpointsObjBuilder().build());
         }
@@ -76,8 +76,8 @@ public class PCEPP2MPEndPointsIpv6ObjectParser extends CommonObjectParser {
         }
         p2mpIpv6Builder.setDestinationIpv6Address(dest);
         return new EndpointsObjBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule())
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule())
                 .setAddressFamily(new P2mpIpv6CaseBuilder().setP2mpIpv6(p2mpIpv6Builder.build()).build())
                 .build();
     }
index fc8b70be92cec5d52beaca48cd47c1f61067f36e..aa633240a579cf06f25d543b98fc74109ae6b4f9 100644 (file)
@@ -52,8 +52,8 @@ public final class PCEPIpv4UnreachDestinationParser extends CommonObjectParser {
         if (bytes.readableBytes() % Ipv4Util.IP4_LENGTH != 0) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         List<Ipv4AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
             dest.add(Ipv4Util.addressForByteBuf(bytes));
index f81a7a8c58eb6e682f54fe033d064a4b9b5fdfb8..96e9091bb0785a2152d5890ac56a93df247e562d 100644 (file)
@@ -52,8 +52,8 @@ public final class PCEPIpv6UnreachDestinationParser extends CommonObjectParser {
         if (bytes.readableBytes() % Ipv6Util.IPV6_LENGTH != 0) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         List<Ipv6AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
             dest.add(Ipv6Util.addressForByteBuf(bytes));
index ccc7155a3be79f1ef0847dcb9ba5c574a48f1272..071a9f9f55b0fd49d5fca34f486f431911c3d0d9 100644 (file)
@@ -23,13 +23,13 @@ public final class PCEPUnreachDestinationSerializer implements ObjectSerializer
             "Wrong instance of PCEPObject. Passed %s. Needed UnreachDestinationObj.", object.getClass());
         final UnreachDestinationObj uPObj = (UnreachDestinationObj) object;
         final Destination destination = uPObj.getDestination();
-        final Boolean processing = object.isProcessingRule();
-        final Boolean ignore = object.isIgnore();
+        final Boolean processing = object.getProcessingRule();
+        final Boolean ignore = object.getIgnore();
         if (destination instanceof Ipv6DestinationCase) {
-            final Ipv6DestinationCase ipv6 = ((Ipv6DestinationCase) destination);
+            final Ipv6DestinationCase ipv6 = (Ipv6DestinationCase) destination;
             PCEPIpv6UnreachDestinationParser.serializeObject(processing, ignore, ipv6, buffer);
         } else if (destination instanceof Ipv4DestinationCase) {
-            final Ipv4DestinationCase ipv4 = ((Ipv4DestinationCase) destination);
+            final Ipv4DestinationCase ipv4 = (Ipv4DestinationCase) destination;
             PCEPIpv4UnreachDestinationParser.serializeObject(processing, ignore, ipv4, buffer);
         }
     }
index d3acad146b7e4b782a142296b82f5c87422984e7..bcdc5d38f969cdffa6929487b5cf6af258a9dff5 100644 (file)
@@ -35,6 +35,6 @@ public class EROAsNumberSubobjectParser implements EROSubobjectParser, EROSubobj
         Preconditions.checkArgument(subobject.getSubobjectType() instanceof AsNumberCase,
                 "Unknown subobject instance. Passed %s. Needed AsNumberCase.", subobject.getSubobjectType().getClass());
         final ByteBuf body = AsNumberCaseParser.serializeSubobject((AsNumberCase) subobject.getSubobjectType());
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 7511bafdaca60c3b798caa73535d07b4f85914d1..039f12d9d0503a6d5dc65cedb8a6709510cd07bc 100644 (file)
@@ -52,7 +52,7 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820
                     .explicit.route.subobjects.subobject.type.exrs._case.exrs.ExrsBuilder()
                         .setAttribute(xro.getAttribute())
-                        .setMandatory(xro.isMandatory())
+                        .setMandatory(xro.getMandatory())
                         .setSubobjectType(xro.getSubobjectType());
             exrss.add(exrsBuilder.build());
         }
@@ -70,9 +70,9 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
             .route.object.xro.Subobject> xros = new ArrayList<>();
         while (buffer.isReadable()) {
             final boolean mandatory =
-                    ((buffer.getByte(buffer.readerIndex()) & (1 << Values.FIRST_BIT_OFFSET)) != 0) ? true : false;
+                    (buffer.getByte(buffer.readerIndex()) & 1 << Values.FIRST_BIT_OFFSET) != 0 ? true : false;
             final int type =
-                    (buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~(1 << Values.FIRST_BIT_OFFSET);
+                    buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES & ~(1 << Values.FIRST_BIT_OFFSET);
             final int length = buffer.readUnsignedByte() - HEADER_LENGTH;
             if (length > buffer.readableBytes()) {
                 throw new PCEPDeserializerException("Wrong length specified. Passed: " + length + "; Expected: <= "
@@ -91,19 +91,19 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.exclude
             .route.object.xro.Subobject> xros = new ArrayList<>();
         for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit
-                .route.subobjects.subobject.type.exrs._case.exrs.Exrs exr : exrs.getExrs()) {
+                .route.subobjects.subobject.type.exrs._case.exrs.Exrs exr : exrs.nonnullExrs()) {
             final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                 .exclude.route.object.xro.SubobjectBuilder xroBuilder =
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
                     .exclude.route.object.xro.SubobjectBuilder()
                         .setAttribute(exr.getAttribute())
-                        .setMandatory(exr.isMandatory())
+                        .setMandatory(exr.getMandatory())
                         .setSubobjectType(exr.getSubobjectType());
             xros.add(xroBuilder.build());
         }
         final ByteBuf body = Unpooled.buffer();
         serializeSubobject(xros, body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 
     private void serializeSubobject(
index 29a58f09c1edc92b444b5a805e4c2799ad0333cf..279e666284d78b05a585e60afe95c617104af930 100644 (file)
@@ -68,6 +68,6 @@ public class EROIpv4PrefixSubobjectParser implements EROSubobjectParser, EROSubo
         checkArgument(prefix.getIpv4Prefix() != null, "Ipv4Prefix is mandatory.");
         Ipv4Util.writeIpv4Prefix(prefix.getIpv4Prefix(), body);
         body.writeZero(RESERVED);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 274e1a3769a993e3732f557deedd5b49826f8c55..9e775c905eef911a2bbdff33e0c78829c8f6e871 100644 (file)
@@ -66,6 +66,6 @@ public class EROIpv6PrefixSubobjectParser implements EROSubobjectParser, EROSubo
         final ByteBuf body = Unpooled.buffer();
         Ipv6Util.writeIpv6Prefix(ipv6prefix, body);
         body.writeZero(RESERVED);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 3a0f1a20a6d98019eb6f537337ec458164987c21..c75fa148557eb2cfee186a06bcc90a7a54ced36e 100644 (file)
@@ -81,7 +81,7 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject
                 "Unknown subobject instance. Passed %s. Needed LabelCase.", subobject.getSubobjectType().getClass());
         final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel();
         final ByteBuf body = Unpooled.buffer();
-        this.registry.serializeLabel(label.isUniDirectional(), false, label.getLabelType(), body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        this.registry.serializeLabel(label.getUniDirectional(), false, label.getLabelType(), body);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index b51e412bbc0922dc63c3c9f22b0a625ca9512222..bc9a0e022cc2d877179f8128661aaff98e7410d9 100644 (file)
@@ -60,6 +60,6 @@ public class EROUnnumberedInterfaceSubobjectParser implements EROSubobjectParser
         body.writeZero(RESERVED);
         ByteBufUtils.writeMandatory(body, specObj.getRouterId(), "RouterId");
         ByteBufUtils.writeMandatory(body, specObj.getInterfaceId(), "InterfaceId");
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 636107d23a718622835d4ea641b54cec4e182997..4682c56a518138e513f585486c8b3f95e3389b1e 100644 (file)
@@ -58,11 +58,11 @@ public class RROIpv4PrefixSubobjectParser implements RROSubobjectParser, RROSubo
                 .build();
         buffer.skipBytes(PREFIX_F_LENGTH);
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_SIZE);
-        final SubobjectBuilder builder = new SubobjectBuilder()
+        return new SubobjectBuilder()
                 .setProtectionAvailable(flags.get(LPA_F_OFFSET))
                 .setProtectionInUse(flags.get(LPIU_F_OFFSET))
-                .setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(prefix).build());
-        return builder.build();
+                .setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(prefix).build())
+                .build();
     }
 
     @Override
@@ -78,8 +78,8 @@ public class RROIpv4PrefixSubobjectParser implements RROSubobjectParser, RROSubo
         }
 
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT4_LENGTH);
         checkArgument(prefix.getIpv4Prefix() != null, "Ipv4Prefix is mandatory.");
         Ipv4Util.writeIpv4Prefix(prefix.getIpv4Prefix(), body);
index d82c3fce73f1540ce22c86d46d0d02f7b02a4b42..e8e5d3b16a231d45b470e48067f3bafddc9a990e 100644 (file)
@@ -75,8 +75,8 @@ public class RROIpv6PrefixSubobjectParser implements RROSubobjectParser, RROSubo
 
     static void serializeSubobject(final ByteBuf buffer, final Subobject subobject, final Ipv6Prefix ipv6prefix) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         Ipv6Util.writeIpv6Prefix(ipv6prefix, body);
         flags.toByteBuf(body);
index 09523ccbe66974d4b233cce93fe1460d57ada079..26eadf76ff4851d36f850e900386a74fe5e3ee6a 100644 (file)
@@ -82,7 +82,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject
         requireNonNull(subobject.getSubobjectType(), "Subobject type cannot be empty.");
         final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel();
         final ByteBuf body = Unpooled.buffer();
-        this.registry.serializeLabel(label.isUniDirectional(), label.isGlobal(), label.getLabelType(), body);
+        this.registry.serializeLabel(label.getUniDirectional(), label.getGlobal(), label.getLabelType(), body);
         RROSubobjectUtil.formatSubobject(TYPE, body, buffer);
     }
 }
index 57f8820d90a02c1e5a10b484404d075cf07e4406..41b553e3343e6bccdefb5bfa0c12cf89aecf8c2b 100644 (file)
@@ -65,8 +65,8 @@ public class RROUnnumberedInterfaceSubobjectParser implements RROSubobjectParser
             "Unknown subobject instance. Passed %s. Needed UnnumberedCase.", subobject.getSubobjectType().getClass());
         final UnnumberedSubobject specObj = ((UnnumberedCase) subobject.getSubobjectType()).getUnnumbered();
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         flags.toByteBuf(body);
         body.writeZero(RESERVED);
index 00acaaa0f57a1d84c2c981619c26ce00976c4c86..b6e333fa5ff22af522814707247627c950233cc2 100644 (file)
@@ -27,7 +27,8 @@ public class XROAsNumberSubobjectParser implements XROSubobjectParser, XROSubobj
     @Override
     public Subobject parseSubobject(final ByteBuf buffer, final boolean mandatory) throws PCEPDeserializerException {
         return new SubobjectBuilder().setMandatory(mandatory)
-                .setSubobjectType(AsNumberCaseParser.parseSubobject(buffer)).build();
+                .setSubobjectType(AsNumberCaseParser.parseSubobject(buffer))
+                .build();
     }
 
     @Override
@@ -35,6 +36,6 @@ public class XROAsNumberSubobjectParser implements XROSubobjectParser, XROSubobj
         Preconditions.checkArgument(subobject.getSubobjectType() instanceof AsNumberCase,
                 "Unknown subobject instance. Passed %s. Needed AsNumberCase.", subobject.getSubobjectType().getClass());
         final ByteBuf body = AsNumberCaseParser.serializeSubobject((AsNumberCase) subobject.getSubobjectType());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index d6b903d1d91a465cdf2c8a5a1b0ed0ef67408c92..911c0810dc3d77e3a51d4c40b3ca0797194fc6dd 100644 (file)
@@ -77,6 +77,6 @@ public class XROIpv4PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final Attribute attribute = subobject.getAttribute();
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 69c09127c4afcaa6855165c37f771b379f643dce..856f72f8f389aacb889d9bae6f58b8e063df1824 100644 (file)
@@ -71,6 +71,6 @@ public class XROIpv6PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final Attribute attribute = subobject.getAttribute();
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 80829a2a03aa9a6e1e10ea8b32e2a8b2ab14bab2..5d4a792860bb10dbc7fcb1c76b26999491e02512 100644 (file)
@@ -66,6 +66,6 @@ public class XROPathKey128SubobjectParser implements XROSubobjectParser {
         final PceId pceId = pk.getPceId();
         checkArgument(pceId != null, "PceId is mandatory.");
         body.writeBytes(pceId.getValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 620e1862272cd3e0615172d52169612da7ebf025..d751a9ffdacdfc428aa88dc3d27dcab37a8c658b 100644 (file)
@@ -72,6 +72,6 @@ public class XROPathKey32SubobjectParser implements XROSubobjectParser, XROSubob
         ByteBufUtils.write(body, pathKey.getValue());
         checkArgument(pceId.length == PCE_ID_F_LENGTH, "PceId 32 Bit required.");
         body.writeBytes(pceId);
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 8f65a808a58250103710fbe6e3f7929116789dfc..52eba0323d5faaf319085e0cc4ab9c9fc3e581e1 100644 (file)
@@ -68,6 +68,6 @@ public class XROSrlgSubobjectParser implements XROSubobjectParser, XROSubobjectS
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(0);
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 920789e5c74655f82a5136a04f96d3a4e4b643cc..4757202db428a815e8d408dd85ee24bb3e262d62 100644 (file)
@@ -45,11 +45,11 @@ public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser
         final UnnumberedBuilder ubuilder = new UnnumberedBuilder()
                 .setRouterId(ByteBufUtils.readUint32(buffer))
                 .setInterfaceId(ByteBufUtils.readUint32(buffer));
-        final SubobjectBuilder builder = new SubobjectBuilder()
+        return new SubobjectBuilder()
                 .setMandatory(mandatory)
                 .setAttribute(attr)
-                .setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build());
-        return builder.build();
+                .setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build())
+                .build();
     }
 
     @Override
@@ -65,6 +65,6 @@ public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser
 
         ByteBufUtils.writeMandatory(body, specObj.getRouterId(), "RouterId");
         ByteBufUtils.writeMandatory(body, specObj.getInterfaceId(), "InterfaceId");
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 042175fe13ea9984c3807290ff3ca9cb13cf3ee2..909a61641b6c30a285ade44d3a8e3ae396223e14 100644 (file)
@@ -61,14 +61,14 @@ public class NoPathVectorTlvParser implements TlvParser, TlvSerializer {
         final ByteBuf body = Unpooled.buffer();
         final BitArray flags = new BitArray(FLAGS_SIZE);
         final Flags f = noPath.getFlags();
-        flags.set(REACHABLITY_PROBLEM, f.isP2mpUnreachable());
-        flags.set(NO_GCO_SOLUTION, f.isNoGcoSolution());
-        flags.set(NO_GCO_MIGRATION_PATH, f.isNoGcoMigration());
-        flags.set(PATH_KEY, f.isPathKey());
-        flags.set(CHAIN_UNAVAILABLE, f.isChainUnavailable());
-        flags.set(UNKNOWN_SRC, f.isUnknownSource());
-        flags.set(UNKNOWN_DEST, f.isUnknownDestination());
-        flags.set(PCE_UNAVAILABLE, f.isPceUnavailable());
+        flags.set(REACHABLITY_PROBLEM, f.getP2mpUnreachable());
+        flags.set(NO_GCO_SOLUTION, f.getNoGcoSolution());
+        flags.set(NO_GCO_MIGRATION_PATH, f.getNoGcoMigration());
+        flags.set(PATH_KEY, f.getPathKey());
+        flags.set(CHAIN_UNAVAILABLE, f.getChainUnavailable());
+        flags.set(UNKNOWN_SRC, f.getUnknownSource());
+        flags.set(UNKNOWN_DEST, f.getUnknownDestination());
+        flags.set(PCE_UNAVAILABLE, f.getPceUnavailable());
         flags.toByteBuf(body);
         TlvUtil.formatTlv(TYPE, body, buffer);
     }
index 9eb56aff5b507b193e8c5436bb770f4675897757..cedacb9d8eda286e36091dcbf48f736d2a3500b6 100644 (file)
@@ -47,12 +47,13 @@ public class InitiatedLspObjectParser extends StatefulLspObjectParser {
     @Override
     protected BitArray serializeFlags(final Lsp specObj) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(DELEGATE, specObj.isDelegate());
-        flags.set(REMOVE, specObj.isRemove());
-        flags.set(SYNC, specObj.isSync());
-        flags.set(ADMINISTRATIVE, specObj.isAdministrative());
-        if (specObj.augmentation(Lsp1.class) != null) {
-            flags.set(CREATE_FLAG_OFFSET, specObj.augmentation(Lsp1.class).isCreate());
+        flags.set(DELEGATE, specObj.getDelegate());
+        flags.set(REMOVE, specObj.getRemove());
+        flags.set(SYNC, specObj.getSync());
+        flags.set(ADMINISTRATIVE, specObj.getAdministrative());
+        final Lsp1 aug = specObj.augmentation(Lsp1.class);
+        if (aug != null) {
+            flags.set(CREATE_FLAG_OFFSET, aug.getCreate());
         }
         return flags;
     }
index 482ca66f22ad2b3c370d7da49e2308406bf83d19..2bc7c4429fd242d0bfab49deeec8a6c289078ae4 100644 (file)
@@ -65,10 +65,8 @@ public class InitiatedPCInitiateMessageParser extends AbstractMessageParser {
         serializeObject(req.getEro(), buffer);
         serializeObject(req.getLspa(), buffer);
         serializeObject(req.getBandwidth(), buffer);
-        if (req.getMetrics() != null) {
-            for (final Metrics m : req.getMetrics()) {
-                serializeObject(m.getMetric(), buffer);
-            }
+        for (final Metrics m : req.nonnullMetrics()) {
+            serializeObject(m.getMetric(), buffer);
         }
         serializeObject(req.getIro(), buffer);
     }
index 1dfe790fb013d8f1ef9fb7ad0704bbdb30afd423..bd4a9e638226293215cca873bc360c8ab536d84c 100644 (file)
@@ -37,8 +37,9 @@ public class InitiatedSrpObjectParser extends StatefulSrpObjectParser {
     @Override
     protected void serializeFlags(final Srp srp, final ByteBuf body) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        if (srp.augmentation(Srp1.class) != null) {
-            flags.set(REMOVE_FLAG, srp.augmentation(Srp1.class).isRemove());
+        final Srp1 aug = srp.augmentation(Srp1.class);
+        if (aug != null) {
+            flags.set(REMOVE_FLAG, aug.getRemove());
         }
         flags.toByteBuf(body);
     }
index 6078a5f6b0b1b5b9e72bee8a21761797424dbb5d..7db7944e3351977116256e15d7baf29071a3ba78 100644 (file)
@@ -36,9 +36,9 @@ public class InitiatedStatefulCapabilityTlvParser extends StatefulStatefulCapabi
         final BitArray flags = new BitArray(FLAGS_F_LENGTH);
         final Stateful1 sfi = sct.augmentation(Stateful1.class);
         if (sfi != null) {
-            flags.set(I_FLAG_OFFSET, sfi.isInitiation());
+            flags.set(I_FLAG_OFFSET, sfi.getInitiation());
         }
-        flags.set(U_FLAG_OFFSET, sct.isLspUpdateCapability());
+        flags.set(U_FLAG_OFFSET, sct.getLspUpdateCapability());
         return flags;
     }
 }
index bdb0a21906748b1aacf313ed2dceb7bc907ad57e..937498fdcb88cab4f0aee441476fb999bf30a379 100644 (file)
@@ -43,8 +43,8 @@ public final class PCEPStatefulCapability implements PCEPCapability {
     }
 
     public PCEPStatefulCapability(final PcepIetfStatefulConfig config) {
-        this(config.isStateful(), config.isActive(), config.isInitiated(), config.isTriggeredInitialSync(),
-                config.isTriggeredResync(), config.isDeltaLspSyncCapability(), config.isIncludeDbVersion());
+        this(config.getStateful(), config.getActive(), config.getInitiated(), config.getTriggeredInitialSync(),
+                config.getTriggeredResync(), config.getDeltaLspSyncCapability(), config.getIncludeDbVersion());
     }
 
     @Override
index e366f19b66a17a8edda90fe17f092617a760d94b..5ac756063697bc45502a04c27d0b5757b502e9e4 100644 (file)
@@ -130,7 +130,7 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer {
             final MplsLabelEntry mplsEntry = (MplsLabelEntry) bindingValue;
             final long entry = getMplsStackEntry(mplsEntry.getLabel())
                     | mplsEntry.getTrafficClass().toJava() << TC_SHIFT
-                    | (mplsEntry.isBottomOfStack() ? 1 : 0) << S_SHIFT
+                    | (mplsEntry.getBottomOfStack() ? 1 : 0) << S_SHIFT
                     | mplsEntry.getTimeToLive().toJava();
             ByteBufUtils.write(buf, Uint32.valueOf(entry));
         }
index aa1d7e184f81fc2eb13586ef82a18de9f1d57a85..bc07451bca0c6d60bade7ae3a8f06186e0034336 100644 (file)
@@ -87,7 +87,7 @@ public final class StatefulErrorMessageParser extends PCEPErrorMessageParser {
             state = State.ERROR_IN;
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
-            if (o.isProcessingRule()) {
+            if (o.getProcessingRule()) {
                 errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
                 return null;
             }
index 24f1e7aa8e0f468a23f887eb8881dd9b3d816de5..04cf4fd4cc8dd77ee10d1bef82fc62022210daac 100644 (file)
@@ -65,9 +65,9 @@ public class StatefulLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBu
     @Override
     public Lsp parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
         checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
-        final LspBuilder builder = new LspBuilder();
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        final LspBuilder builder = new LspBuilder()
+            .setIgnore(header.getIgnore())
+            .setProcessingRule(header.getProcessingRule());
         final int[] plspIdRaw
             = new int[] { bytes.readUnsignedByte(), bytes.readUnsignedByte(), bytes.getUnsignedByte(2), };
         builder.setPlspId(new PlspId(Uint32.valueOf(plspIdRaw[0] << FLAGS_SIZE | plspIdRaw[1] << FOUR_BITS_SHIFT
@@ -128,15 +128,15 @@ public class StatefulLspObjectParser extends AbstractObjectWithTlvsParser<TlvsBu
         res[res.length - 1] = (byte) (res[res.length - 1] | op);
         body.writeByte(res[res.length - 1]);
         serializeTlvs(specObj.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     protected BitArray serializeFlags(final Lsp specObj) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(DELEGATE, specObj.isDelegate());
-        flags.set(REMOVE, specObj.isRemove());
-        flags.set(SYNC, specObj.isSync());
-        flags.set(ADMINISTRATIVE, specObj.isAdministrative());
+        flags.set(DELEGATE, specObj.getDelegate());
+        flags.set(REMOVE, specObj.getRemove());
+        flags.set(SYNC, specObj.getSync());
+        flags.set(ADMINISTRATIVE, specObj.getAdministrative());
         return flags;
     }
 
index ad33eff7a0d538742290f0a0ef9354f4d0b31999..ec7c93aba4041ec501470d19e6d667699e663bc2 100644 (file)
@@ -76,10 +76,8 @@ public class StatefulPCReportMessageParser extends AbstractMessageParser {
             serializeObject(p.getLspa(), buffer);
             serializeObject(p.getBandwidth(), buffer);
             serializeObject(p.getReoptimizationBandwidth(), buffer);
-            if (p.getMetrics() != null) {
-                for (final Metrics m : p.getMetrics()) {
-                    serializeObject(m.getMetric(), buffer);
-                }
+            for (final Metrics m : p.nonnullMetrics()) {
+                serializeObject(m.getMetric(), buffer);
             }
             serializeObject(p.getIro(), buffer);
             serializeObject(p.getRro(), buffer);
index 31043d139f8be4b44e6a336c0cdc4d8011de1618..0ae4ed1a5fe13879b634b5b6f8454b79a96fb51b 100644 (file)
@@ -71,10 +71,8 @@ public class StatefulPCUpdateRequestMessageParser extends AbstractMessageParser
             serializeObject(p.getLspa(), buffer);
             serializeObject(p.getBandwidth(), buffer);
             serializeObject(p.getReoptimizationBandwidth(), buffer);
-            if (p.getMetrics() != null) {
-                for (final Metrics m : p.getMetrics()) {
-                    serializeObject(m.getMetric(), buffer);
-                }
+            for (final Metrics m : p.nonnullMetrics()) {
+                serializeObject(m.getMetric(), buffer);
             }
             serializeObject(p.getIro(), buffer);
         }
index 97b62cbb1eba58cfadf7bf55b495c837f6181c89..2fa942cd3f60e1a1321513be48bcf797679852e6 100644 (file)
@@ -132,8 +132,8 @@ public final class StatefulRSVPErrorSpecTlvParser implements TlvParser, TlvSeria
 
     private static void serializeRsvp(final RsvpError rsvp, final ByteBuf body) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(IN_PLACE, rsvp.getFlags().isInPlace());
-        flags.set(NOT_GUILTY, rsvp.getFlags().isNotGuilty());
+        flags.set(IN_PLACE, rsvp.getFlags().getInPlace());
+        flags.set(NOT_GUILTY, rsvp.getFlags().getNotGuilty());
         final IpAddressNoZone node = rsvp.getNode();
         checkArgument(node != null, "Node is mandatory.");
         final ByteBuf rsvpObjBuf = Unpooled.buffer();
index 4703f0e38f906a79b5b32cf125a72c06b45eb6a7..cade4dbad675f9454324e8ba758d323216447f9b 100644 (file)
@@ -53,8 +53,8 @@ public class StatefulSrpObjectParser extends AbstractObjectWithTlvsParser<TlvsBu
                 + "; Expected: >=" + MIN_SIZE + ".");
         }
         final SrpBuilder builder = new SrpBuilder()
-                .setIgnore(header.isIgnore())
-                .setProcessingRule(header.isProcessingRule());
+                .setIgnore(header.getIgnore())
+                .setProcessingRule(header.getProcessingRule());
         parseFlags(builder, bytes);
         builder.setOperationId(new SrpIdNumber(ByteBufUtils.readUint32(bytes)));
         final TlvsBuilder tlvsBuilder = new TlvsBuilder();
@@ -87,7 +87,7 @@ public class StatefulSrpObjectParser extends AbstractObjectWithTlvsParser<TlvsBu
         checkArgument(srpId != null, "SrpId is mandatory.");
         ByteBufUtils.write(body, srpId.getValue());
         serializeTlvs(srp.getTlvs(), body);
-        ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
+        ObjectUtil.formatSubobject(TYPE, CLASS, object.getProcessingRule(), object.getIgnore(), body, buffer);
     }
 
     protected void serializeFlags(final Srp srp, final ByteBuf body) {
index bf584266b09a4ef1ee4d9886c079c8dc3f921176..ccbfc00f9168b9fdb2f2317a73622ad441d14fc9 100644 (file)
@@ -58,7 +58,7 @@ public class StatefulStatefulCapabilityTlvParser implements TlvParser, TlvSerial
 
     protected BitArray serializeFlags(final Stateful sct) {
         final BitArray flags = new BitArray(FLAGS_F_LENGTH);
-        flags.set(U_FLAG_OFFSET, sct.isLspUpdateCapability());
+        flags.set(U_FLAG_OFFSET, sct.getLspUpdateCapability());
         return flags;
     }
 }
index 9d6b51259dba63e894e90cce777caaadd98c0f07..051d349876e5d7b11706e8d0ff001a1fcce22c86 100644 (file)
@@ -55,15 +55,15 @@ public class SyncOptimizationsCapabilityTlvParser extends InitiatedStatefulCapab
             .rev200720.Stateful1 sf2 = sct.augmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
                 .controller.pcep.sync.optimizations.rev200720.Stateful1.class);
         if (sf2 != null) {
-            flags.set(F_FLAG_OFFSET, sf2.isTriggeredInitialSync());
-            flags.set(D_FLAG_OFFSET, sf2.isDeltaLspSyncCapability());
-            flags.set(T_FLAG_OFFSET, sf2.isTriggeredResync());
-            flags.set(S_FLAG_OFFSET, sf2.isIncludeDbVersion());
+            flags.set(F_FLAG_OFFSET, sf2.getTriggeredInitialSync());
+            flags.set(D_FLAG_OFFSET, sf2.getDeltaLspSyncCapability());
+            flags.set(T_FLAG_OFFSET, sf2.getTriggeredResync());
+            flags.set(S_FLAG_OFFSET, sf2.getIncludeDbVersion());
         }
         if (sfi != null) {
-            flags.set(I_FLAG_OFFSET, sfi.isInitiation());
+            flags.set(I_FLAG_OFFSET, sfi.getInitiation());
         }
-        flags.set(U_FLAG_OFFSET, sct.isLspUpdateCapability());
+        flags.set(U_FLAG_OFFSET, sct.getLspUpdateCapability());
         return flags;
     }
 }
index 01691339f9a03ca5612307bc526357ba2fc82e9e..f31442ad689d3d87009e9bb343e0877dbbfd11c6 100644 (file)
@@ -28,8 +28,8 @@ public class PCCEndPointIpv4ObjectParser extends PCEPEndPointsIpv4ObjectParser {
         if (bytes.readableBytes() != Ipv4Util.IP4_LENGTH * 2) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
-        builder.setIgnore(header.isIgnore());
-        builder.setProcessingRule(header.isProcessingRule());
+        builder.setIgnore(header.getIgnore());
+        builder.setProcessingRule(header.getProcessingRule());
         final Ipv4Builder b = new Ipv4Builder();
         b.setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes));
         b.setDestinationIpv4Address(Ipv4Util.addressForByteBuf(bytes));
index ddd9d9b1cf27d54c4f87630d7ae0d088fd796a9a..c408ccda07691da8a9ae5930332857e101d1f12c 100644 (file)
@@ -27,8 +27,9 @@ final class PCCSyncOptimization {
     private final boolean isTriggeredReSyncEnable;
     private final LspDbVersion localLspDbVersion;
     private final LspDbVersion remoteLspDbVersion;
+
     private Uint64 lspDBVersion = Uint64.ONE;
-    private Boolean resynchronizing = Boolean.FALSE;
+    private boolean resynchronizing = false;
 
     PCCSyncOptimization(final @NonNull PCCSession session) {
         requireNonNull(session);
@@ -108,34 +109,22 @@ final class PCCSyncOptimization {
 
     private static boolean isSyncAvoidance(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isIncludeDbVersion() != null) {
-            return stateful1.isIncludeDbVersion();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getIncludeDbVersion());
     }
 
     private static boolean isDeltaSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isDeltaLspSyncCapability() != null) {
-            return stateful1.isDeltaLspSyncCapability();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getDeltaLspSyncCapability());
     }
 
     private static boolean isTriggeredInitialSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isTriggeredInitialSync() != null) {
-            return stateful1.isTriggeredInitialSync();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getTriggeredInitialSync());
     }
 
     private static boolean isTriggeredReSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isTriggeredResync() != null) {
-            return stateful1.isTriggeredResync();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getTriggeredResync());
     }
 
     public Optional<Uint64> incrementLspDBVersion() {
@@ -156,7 +145,7 @@ final class PCCSyncOptimization {
         return !doesLspDbMatch() || this.resynchronizing;
     }
 
-    public void setResynchronizingState(final Boolean resync) {
+    void setResynchronizingState(final boolean resync) {
         this.resynchronizing = resync;
     }
 }
index 952d76aacff036e0e0f12fccd0adc24ee5cb9cc4..1b4002bbeb27efac2717414c6a388fff1c8cfdf8 100644 (file)
@@ -236,7 +236,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
             }
         } else if (isReSyncTriggered(lsp)) {
             handledDbTriggeredResync(update, session);
-        } else if (lsp.isDelegate() != null && lsp.isDelegate()) {
+        } else if (Boolean.TRUE.equals(lsp.getDelegate())) {
             //regular LSP update
             reportToAll(update, session);
         } else {
@@ -247,12 +247,11 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
 
     @Override
     public void onMessagePcInitiate(final Requests request, final PCCSession session) {
-        if (request.getSrp().augmentation(Srp1.class) != null
-                && request.getSrp().augmentation(Srp1.class).isRemove()) {
+        final Srp1 aug = request.getSrp().augmentation(Srp1.class);
+        if (aug != null && aug.getRemove()) {
             //remove LSP
             removeTunnel(request, session);
-        } else if (request.getLsp().isDelegate() != null && request.getLsp().isDelegate()
-                && request.getEndpointsObj() == null) {
+        } else if (Boolean.TRUE.equals(request.getLsp().getDelegate()) && request.getEndpointsObj() == null) {
             //take LSP delegation
             takeDelegation(request, session);
         } else {
@@ -283,16 +282,16 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
     }
 
     private boolean isReSyncTriggered(final Lsp lsp) {
-        return this.syncOptimization.isTriggeredReSyncEnabled() && lsp.isSync();
+        return this.syncOptimization.isTriggeredReSyncEnabled() && lsp.getSync();
     }
 
     private boolean isInitialSyncTriggered(final Lsp lsp) {
-        return lsp.getPlspId().getValue().toJava() == 0 && lsp.isSync()
+        return lsp.getPlspId().getValue().toJava() == 0 && lsp.getSync()
                 && this.syncOptimization.isTriggeredInitSyncEnabled();
     }
 
     private void handledDbTriggeredResync(final Updates update, final PCCSession session) {
-        this.syncOptimization.setResynchronizingState(Boolean.TRUE);
+        this.syncOptimization.setResynchronizingState(true);
         final SrpIdNumber operationId = update.getSrp().getOperationId();
         if (update.getLsp().getPlspId().getValue().toJava() == 0) {
             reportAllKnownLsp(Optional.of(operationId), session);
@@ -300,7 +299,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
             reportLsp(update.getLsp().getPlspId(), operationId, session);
         }
         sendEndOfSynchronization(session, Optional.of(operationId));
-        this.syncOptimization.setResynchronizingState(Boolean.FALSE);
+        this.syncOptimization.setResynchronizingState(false);
     }
 
     private void lspReport(final PCCSession session) {
index 2188744bafde459345a455e875d0a5786eeb3ffc..aa710b27aa81917abd3561e718ba4d4bd96ff22e 100644 (file)
@@ -44,8 +44,8 @@ public class PCCEndPointIpv4ObjectParserTest {
 
         assertEquals(IP1, ((Ipv4Case) output.getAddressFamily()).getIpv4().getSourceIpv4Address().getValue());
         assertEquals(IP2, ((Ipv4Case) output.getAddressFamily()).getIpv4().getDestinationIpv4Address().getValue());
-        assertFalse(output.isIgnore());
-        assertFalse(output.isProcessingRule());
+        assertFalse(output.getIgnore());
+        assertFalse(output.getProcessingRule());
     }
 
     @Test(expected = IllegalArgumentException.class)
index 97d217909ab62aabe8288bb3a2e4b495baf20b08..93acc0bfde28ff6d16e420a7f0967044bfec245d 100644 (file)
@@ -148,7 +148,7 @@ public abstract class PCCMockCommon {
         checkSession(session, DEAD_TIMER, KEEP_ALIVE);
 
         assertTrue(session.getRemoteTlvs().augmentation(Tlvs1.class).getStateful()
-                .augmentation(Stateful1.class).isInitiation());
+                .augmentation(Stateful1.class).getInitiation());
         assertNull(session.getLocalTlvs().augmentation(Tlvs3.class)
                 .getLspDbVersion().getLspDbVersionValue());
     }
@@ -173,7 +173,7 @@ public abstract class PCCMockCommon {
         checkSession(session, DEAD_TIMER, KEEP_ALIVE);
 
         assertTrue(session.getRemoteTlvs().augmentation(Tlvs1.class).getStateful()
-                .augmentation(Stateful1.class).isInitiation());
+                .augmentation(Stateful1.class).getInitiation());
         final Uint64 pceDBVersion = session.getLocalTlvs().augmentation(Tlvs3.class)
                 .getLspDbVersion().getLspDbVersionValue();
         assertEquals(startingDBVersion, pceDBVersion);
@@ -186,7 +186,7 @@ public abstract class PCCMockCommon {
         assertEquals(expectedKeepAlive, session.getPeerPref().getKeepalive().shortValue());
         final Stateful1 stateful = session.getRemoteTlvs().augmentation(Tlvs1.class)
                 .getStateful().augmentation(Stateful1.class);
-        assertTrue(stateful.isInitiation());
+        assertTrue(stateful.getInitiation());
     }
 
     protected static void checkSequequenceDBVersionSync(final TestingSessionListener pceSessionListener,
@@ -196,9 +196,9 @@ public abstract class PCCMockCommon {
             for (final Reports report : pcrt) {
                 final Lsp lsp = report.getLsp();
                 if (lsp.getPlspId().getValue().toJava() == 0) {
-                    assertEquals(false, lsp.isSync());
+                    assertEquals(false, lsp.getSync());
                 } else {
-                    assertEquals(true, lsp.isSync());
+                    assertEquals(true, lsp.getSync());
                 }
                 final Uint64 actuaLspDBVersion = lsp.getTlvs()
                         .augmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
index fe31ac440fdd4a1646b10e0bb7b626e1edff74b3..b3f552b811183e98b65437d9d7168c2b92a0365d 100644 (file)
@@ -99,12 +99,12 @@ public abstract class AbstractSrSubobjectParser {
 
         /* Flags set according to RFC8664#section 4.3.1 */
         final BitArray bits = new BitArray(BITSET_LENGTH);
-        bits.set(M_FLAG_POSITION, srSubobject.isMFlag());
+        bits.set(M_FLAG_POSITION, srSubobject.getMFlag());
         /* C flag MUST be set to 0 if M flag is set to 0 */
-        if (!srSubobject.isMFlag()) {
+        if (!srSubobject.getMFlag()) {
             bits.set(C_FLAG_POSITION, Boolean.FALSE);
         } else {
-            bits.set(C_FLAG_POSITION, srSubobject.isCFlag());
+            bits.set(C_FLAG_POSITION, srSubobject.getCFlag());
         }
         /* M & C flags MUST be set to 0 if S flag is set to 1 */
         if (srSubobject.getSid() == null) {
@@ -113,7 +113,7 @@ public abstract class AbstractSrSubobjectParser {
             bits.set(S_FLAG_POSITION, Boolean.TRUE);
         }
         /* F flag MUST be set if NT=0 or NAI is absent */
-        if ((srSubobject.getNai() == null) || (srSubobject.getNaiType().getIntValue() == 0)) {
+        if (srSubobject.getNai() == null || srSubobject.getNaiType().getIntValue() == 0) {
             bits.set(F_FLAG_POSITION, Boolean.TRUE);
         }
         /* Write Flags */
@@ -121,7 +121,7 @@ public abstract class AbstractSrSubobjectParser {
 
         /* Write SID */
         if (srSubobject.getSid() != null) {
-            if (srSubobject.isMFlag()) {
+            if (srSubobject.getMFlag()) {
                 buffer.writeInt(srSubobject.getSid().intValue() << MPLS_LABEL_OFFSET);
             } else {
                 ByteBufUtils.writeOrZero(buffer, srSubobject.getSid());
index c7ee5d50427898df5a6d72e65932f0bdee6775dc..040be8a2f4235575bb16511da42ee00c010082c0 100644 (file)
@@ -45,7 +45,7 @@ public class SrEroSubobjectParser extends AbstractSrSubobjectParser implements E
 
         final SrSubobject srSubobject = (SrSubobject) subobject.getSubobjectType();
         final ByteBuf body = serializeSubobject(srSubobject);
-        EROSubobjectUtil.formatSubobject(this.type, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(this.type, subobject.getLoose(), body, buffer);
     }
 
     @Override
index 4d3d83722cec1336be45a4db2a18e34397e73cf8..29445f7e31e25b9e0fd29fcb33d71e40e46efb46 100644 (file)
@@ -41,8 +41,8 @@ public class SrPceCapabilityTlvParser implements TlvParser, TlvSerializer {
         /* Flags */
         final SrPceCapability srPceCapability = (SrPceCapability) tlv;
         final BitArray bits = new BitArray(BITSET_LENGTH);
-        bits.set(N_FLAG_POSITION, srPceCapability.isNFlag());
-        bits.set(X_FLAG_POSITION, srPceCapability.isXFlag());
+        bits.set(N_FLAG_POSITION, srPceCapability.getNFlag());
+        bits.set(X_FLAG_POSITION, srPceCapability.getXFlag());
         bits.toByteBuf(body);
 
         /* MSD */
index 3116c25cecc09cc7bcda2ff572fac0fe0e6e95d0..c49a203a65c1395ac433ac5bb65e80be4032b7ea 100644 (file)
@@ -68,7 +68,7 @@ public abstract class AbstractEROPathKeySubobjectParser implements EROSubobjectP
         final ByteBuf body = Unpooled.buffer();
         ByteBufUtils.write(body, pathKey.getValue());
         body.writeBytes(pceID);
-        EROSubobjectUtil.formatSubobject(pceID.length == PCE_ID_F_LENGTH ? TYPE_32 : TYPE_128, subobject.isLoose(),
+        EROSubobjectUtil.formatSubobject(pceID.length == PCE_ID_F_LENGTH ? TYPE_32 : TYPE_128, subobject.getLoose(),
                 body, buffer);
     }
 }
index 918d219d9af181db42694b0edbe6b7f697c2fe38..127fe3683600df0ff8f2608ea65464fe1d54037e 100644 (file)
@@ -65,7 +65,7 @@ public final class SimpleObjectRegistry implements ObjectRegistry {
         final ObjectParser parser = this.handlers.getParser(createKey(objectClass, objectType));
 
         if (parser == null) {
-            if (!header.isProcessingRule()) {
+            if (!header.getProcessingRule()) {
                 return null;
             }
             for (int type = 1; type <= MAX_OBJECT_TYPE; type++) {
index 081f53915f070d76d8c1eb055ee4274189c633ba..9597d0f757624ba3aac2f13fa2e1c0d601c14ae6 100644 (file)
@@ -44,7 +44,7 @@ public class SimpleVendorInformationObjectRegistry implements VendorInformationO
             throws PCEPDeserializerException {
         final ObjectParser parser = this.handlers.getParser(enterpriseNumber.getValue().intValue());
         if (parser == null) {
-            if (!header.isProcessingRule()) {
+            if (!header.getProcessingRule()) {
                 return Optional.empty();
             }
             return Optional.of(new UnknownObject(PCEPErrors.UNRECOGNIZED_OBJ_CLASS));
index db59dfb9cfeb8dfd9a5e40c087b1d4708620ab72..320e08657c1888c0b23c6c3ddd046b4bc21a116f 100644 (file)
@@ -33,8 +33,8 @@ public class APITest {
     public void testObjectHeader() {
         ObjectHeaderImpl header = new ObjectHeaderImpl(null, true);
         assertEquals("ObjectHeader [objClass=, processed=null, ignored=true]", header.toString());
-        assertTrue(header.isIgnore());
-        assertNull(header.isProcessingRule());
+        assertTrue(header.getIgnore());
+        assertNull(header.getProcessingRule());
 
         assertEquals(new ObjectHeaderImpl(null, true).hashCode(),  header.hashCode());
         assertEquals(new ObjectHeaderImpl(null, true), header);
@@ -43,8 +43,8 @@ public class APITest {
     @Test
     public void testUnknownObject() {
         UnknownObject un = new UnknownObject(PCEPErrors.CT_AND_SETUP_PRIORITY_DO_NOT_FORM_TE_CLASS);
-        assertFalse(un.isIgnore());
-        assertFalse(un.isProcessingRule());
+        assertFalse(un.getIgnore());
+        assertFalse(un.getProcessingRule());
         assertEquals(PCEPErrors.CT_AND_SETUP_PRIORITY_DO_NOT_FORM_TE_CLASS, un.getError());
         assertEquals(PCEPErrors.CT_AND_SETUP_PRIORITY_DO_NOT_FORM_TE_CLASS.getErrorType(),
             un.getErrors().get(0).getErrorObject().getType());
index 9985d1a5b6213554f0255a152a3e689fd6914e46..39694328c011f0af26d61081a620a01a4f16ede4 100644 (file)
@@ -118,7 +118,7 @@ public final class PcepStateUtils {
         table.addRow().addContent("Topology Id", topologyId);
         table.addRow().addContent("Node Id", nodeId);
         table.addRow().addContent("Session duration", pcepSessionState.getSessionDuration());
-        table.addRow().addContent("Synchronized", pcepSessionState.isSynchronized());
+        table.addRow().addContent("Synchronized", pcepSessionState.getSynchronized());
         table.addRow().addContent("Delegated Lsp Count", pcepSessionState.getDelegatedLspsCount());
     }
 
@@ -129,9 +129,9 @@ public final class PcepStateUtils {
         final StatefulCapabilitiesStatsAug stateFulCapa = capa.augmentation(StatefulCapabilitiesStatsAug.class);
         if (stateFulCapa != null) {
             addHeader(table, "Stateful Capabilities");
-            table.addRow().addContent("Stateful", stateFulCapa.isStateful());
-            table.addRow().addContent("Active", stateFulCapa.isActive());
-            table.addRow().addContent("Instantiation", stateFulCapa.isInstantiation());
+            table.addRow().addContent("Stateful", stateFulCapa.getStateful());
+            table.addRow().addContent("Active", stateFulCapa.getActive());
+            table.addRow().addContent("Instantiation", stateFulCapa.getInstantiation());
         }
 
     }
index 3fc79687117a3637878167850afbf0c7cf6ca17a..a85730af250a2b05b5eabbd4779c02d7bd420e76 100644 (file)
@@ -10,6 +10,7 @@ package org.opendaylight.bgpcep.pcep.topology.provider;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -63,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.ReportedLspBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.ReportedLspKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.reported.lsp.Path;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.reported.lsp.PathKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -428,7 +430,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
         final ReportedLsp previous = this.lspData.get(name);
         // if no previous report about the lsp exist, just proceed
         if (previous != null) {
-            final List<Path> updatedPaths = makeBeforeBreak(rlb, previous, name, remove);
+            final Map<PathKey, Path> updatedPaths = makeBeforeBreak(rlb, previous, name, remove);
             // if all paths or the last path were deleted, delete whole tunnel
             if (updatedPaths.isEmpty()) {
                 LOG.debug("All paths were removed, removing LSP with {}.", id);
@@ -454,7 +456,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
         this.lspData.put(name, rl);
     }
 
-    private static List<Path> makeBeforeBreak(final ReportedLspBuilder rlb, final ReportedLsp previous,
+    private static Map<PathKey, Path> makeBeforeBreak(final ReportedLspBuilder rlb, final ReportedLsp previous,
             final String name, final boolean remove) {
         // just one path should be reported
         final Path path = Iterables.getOnlyElement(rlb.getPath().values());
@@ -499,7 +501,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
             }
         }
         LOG.debug("Setting new paths {} to lsp {}", updatedPaths, name);
-        return updatedPaths;
+        return Maps.uniqueIndex(updatedPaths, Path::key);
     }
 
     /**
@@ -618,7 +620,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
             .map(pathList -> pathList.values().iterator().next())
             .map(path -> path.augmentation(Path1.class)).filter(Objects::nonNull)
             .map(LspObject::getLsp).filter(Objects::nonNull)
-            .filter(Lsp::isDelegate)
+            .filter(Lsp::getDelegate)
             .count());
     }
 
index 98829d6dba750391b8b6969e94a2c4bfa99bc9e6..cf6b3c661eeb61703932459197be3c82a8216764 100644 (file)
@@ -105,6 +105,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.pcep.client.attributes.path.computation.client.reported.lsp.Path;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -299,7 +300,7 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
         final PlspId plspid = lsp.getPlspId();
         final Srp srp = report.getSrp();
 
-        if (!lsp.isSync() && (plspid == null || plspid.getValue().toJava() == 0)) {
+        if (!lsp.getSync() && (plspid == null || plspid.getValue().toJava() == 0)) {
             purgeStaleLsps(ctx);
             if (isTriggeredSyncInProcess()) {
                 if (srp == null) {
@@ -320,14 +321,14 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
         solicited = isSolicited(srp, lsp, ctx, rlb);
 
         // if remove flag is set in SRP object, remove the tunnel immediately
-        if (solicited && srp.augmentation(Srp1.class) != null) {
+        if (solicited) {
             final Srp1 initiatedSrp = srp.augmentation(Srp1.class);
-            if (initiatedSrp.isRemove()) {
+            if (initiatedSrp != null && initiatedSrp.getRemove()) {
                 super.removeLsp(ctx, plspid);
                 return false;
             }
         }
-        rlb.setPath(Collections.singletonList(buildPath(report, srp, lsp)));
+        rlb.setPath(BindingMap.of(buildPath(report, srp, lsp)));
 
         String name = lookupLspName(plspid);
         if (lsp.getTlvs() != null && lsp.getTlvs().getSymbolicPathName() != null) {
@@ -340,7 +341,7 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
             updatePccNode(ctx, new PathComputationClientBuilder()
                 .addAugmentation(new PathComputationClient1Builder().setLspDbVersion(lspDbVersion).build()).build());
         }
-        updateLsp(ctx, plspid, name, rlb, solicited, lsp.isRemove());
+        updateLsp(ctx, plspid, name, rlb, solicited, lsp.getRemove());
         unmarkStaleLsp(plspid);
 
         LOG.debug("LSP {} updated", lsp);
@@ -482,7 +483,7 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
         }
         rb.setSrp(srpBuilder.build());
         rb.setLsp(new LspBuilder().setRemove(Boolean.FALSE).setPlspId(reportedLsp.getPlspId())
-                .setDelegate(reportedLsp.isDelegate()).build());
+                .setDelegate(reportedLsp.getDelegate()).build());
         return rb.build();
     }
 
@@ -491,9 +492,9 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
     private ListenableFuture<OperationResult> redelegate(final Lsp reportedLsp, final Srp srp, final Lsp lsp,
             final UpdateLspArgs input) {
         // the D bit that was reported decides the type of PCE message sent
-        requireNonNull(reportedLsp.isDelegate());
+        final boolean isDelegate = requireNonNull(reportedLsp.getDelegate());
         final Message msg;
-        if (reportedLsp.isDelegate()) {
+        if (isDelegate) {
             // we already have delegation, send update
             final UpdatesBuilder rb = new UpdatesBuilder();
             rb.setSrp(srp);
@@ -507,7 +508,7 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
         } else {
             final Lsp1 lspCreateFlag = reportedLsp.augmentation(Lsp1.class);
             // we only retake delegation for PCE initiated tunnels
-            if (lspCreateFlag != null && !lspCreateFlag.isCreate()) {
+            if (lspCreateFlag != null && !lspCreateFlag.getCreate()) {
                 LOG.warn("Unable to retake delegation of PCC-initiated tunnel: {}", reportedLsp);
                 return OperationResults.createUnsent(PCEPErrors.UPDATE_REQ_FOR_NON_LSP).future();
             }
@@ -674,12 +675,12 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
 
     private synchronized void setStatefulCapabilities(final Stateful stateful) {
         this.statefulCapability.set(true);
-        if (stateful.isLspUpdateCapability() != null) {
-            this.lspUpdateCapability.set(stateful.isLspUpdateCapability());
+        if (stateful.getLspUpdateCapability() != null) {
+            this.lspUpdateCapability.set(stateful.getLspUpdateCapability());
         }
         final Stateful1 stateful1 = stateful.augmentation(Stateful1.class);
-        if (stateful1 != null && stateful1.isInitiation() != null) {
-            this.initiationCapability.set(stateful1.isInitiation());
+        if (stateful1 != null && stateful1.getInitiation() != null) {
+            this.initiationCapability.set(stateful1.getInitiation());
         }
     }
 
@@ -808,8 +809,8 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
             rb.setSrp(srpBuilder.build());
 
             rb.setLsp(new LspBuilder()
-                .setAdministrative(inputLsp.isAdministrative())
-                .setDelegate(inputLsp.isDelegate())
+                .setAdministrative(inputLsp.getAdministrative())
+                .setDelegate(inputLsp.getDelegate())
                 .setPlspId(PLSPID_ZERO)
                 .setTlvs(tlvsBuilder.build())
                 .build());
@@ -863,9 +864,9 @@ class PCEPTopologySessionListener extends AbstractTopologySessionListener<SrpIdN
             final Lsp inputLsp = args != null ? args.getLsp() : null;
             final LspBuilder lspBuilder = new LspBuilder().setPlspId(reportedLsp.getPlspId());
             if (inputLsp != null) {
-                lspBuilder.setDelegate(inputLsp.isDelegate() != null && inputLsp.isDelegate())
+                lspBuilder.setDelegate(Boolean.TRUE.equals(inputLsp.getDelegate()))
                         .setTlvs(inputLsp.getTlvs())
-                        .setAdministrative(inputLsp.isAdministrative() != null && inputLsp.isAdministrative());
+                        .setAdministrative(Boolean.TRUE.equals(inputLsp.getAdministrative()));
             }
             return redelegate(reportedLsp, srp, lspBuilder.build(), this.input);
         }
index e1e9ded5807542f04bb63b370b03a1418e4be870..eaa343a295560f4dece1d21127cdea09212ad5ad 100644 (file)
@@ -16,7 +16,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -103,11 +102,14 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology
         final TopologyKey key = InstanceIdentifier.keyOf(this.topology);
         final TopologyId topologyId = key.getTopologyId();
         final WriteTransaction tx = this.dependenciesProvider.getDataBroker().newWriteOnlyTransaction();
-        tx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder().withKey(key)
-                .setTopologyId(topologyId).setTopologyTypes(new TopologyTypesBuilder()
-                        .addAugmentation(new TopologyTypes1Builder().setTopologyPcep(new TopologyPcepBuilder().build())
-                            .build()).build())
-                .setNode(new ArrayList<>()).build());
+        tx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder()
+            .withKey(key)
+            .setTopologyId(topologyId).setTopologyTypes(new TopologyTypesBuilder()
+                .addAugmentation(new TopologyTypes1Builder()
+                    .setTopologyPcep(new TopologyPcepBuilder().build())
+                    .build())
+                .build())
+            .build());
         try {
             tx.commit().get();
             LOG.info("PCEP Topology {} created successfully.", topologyId.getValue());
index 7177b6ed2114c8fa800212eb36c3fa4d4ee99d44..6f2071d01545d81fc85710067691106206983a7a 100644 (file)
@@ -95,33 +95,21 @@ final class SyncOptimization {
 
     private static boolean isSyncAvoidance(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isIncludeDbVersion() != null) {
-            return stateful1.isIncludeDbVersion();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getIncludeDbVersion());
     }
 
     private static boolean isDeltaSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isDeltaLspSyncCapability() != null) {
-            return stateful1.isDeltaLspSyncCapability();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getDeltaLspSyncCapability());
     }
 
     private static boolean isTriggeredInitialSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isTriggeredInitialSync() != null) {
-            return stateful1.isTriggeredInitialSync();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getTriggeredInitialSync());
     }
 
     private static boolean isTriggeredReSync(final Tlvs openTlvs) {
         final Stateful1 stateful1 = getStateful1(openTlvs);
-        if (stateful1 != null && stateful1.isTriggeredResync() != null) {
-            return stateful1.isTriggeredResync();
-        }
-        return false;
+        return stateful1 != null && Boolean.TRUE.equals(stateful1.getTriggeredResync());
     }
 }
index 313e757b8a248316982785c2c0f41b6ee17e4ea4..c9a616b195cf0927a0412e05aee8808e19ba4463 100644 (file)
@@ -227,9 +227,9 @@ public class PCEPTopologySessionListenerTest
             assertTrue(replyTime.getMaxTime().toJava() > 0);
             final StatefulCapabilitiesStatsAug statefulCapabilities = listenerState
                     .getPeerCapabilities().augmentation(StatefulCapabilitiesStatsAug.class);
-            assertFalse(statefulCapabilities.isActive());
-            assertTrue(statefulCapabilities.isInstantiation());
-            assertTrue(statefulCapabilities.isStateful());
+            assertFalse(statefulCapabilities.getActive());
+            assertTrue(statefulCapabilities.getInstantiation());
+            assertTrue(statefulCapabilities.getStateful());
             return pcc;
         });
 
index 8ef5de3fa30d6ccf3d67167051afd01737844d83..edffb35667543f76b557cc160164814109befb53 100644 (file)
@@ -205,9 +205,9 @@ public class TopologyStatsRpcServiceImpl
                 sb.setPeerCapabilities(new PeerCapabilitiesBuilder(topoPeerCapability)
                         .removeAugmentation(StatefulCapabilitiesStatsAug.class)
                         .addAugmentation(new StatefulCapabilitiesRpcAugBuilder()
-                            .setActive(capabilityStatsAug.isActive())
-                            .setInstantiation(capabilityStatsAug.isInstantiation())
-                            .setStateful(capabilityStatsAug.isStateful())
+                            .setActive(capabilityStatsAug.getActive())
+                            .setInstantiation(capabilityStatsAug.getInstantiation())
+                            .setStateful(capabilityStatsAug.getStateful())
                             .build())
                         .build());
             }
index 0bc59b0714daa1bba8dc4bc76f435f961b1cceb5..ceacdfa4845a57ea6f55bed7c3e9ab058823965e 100644 (file)
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import org.junit.After;
 import org.junit.Before;
@@ -54,7 +55,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
@@ -79,25 +82,25 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke
         rpcService.init();
 
         // PCEP topology with one PCC node
-        final Topology t1 = createTopology(TOPOLOGY_ID1, Collections.singletonList(createPcepNode(NODE_ID1)));
+        final Topology t1 = createTopology(TOPOLOGY_ID1, BindingMap.of(createPcepNode(NODE_ID1)));
 
         // PCEP topology with two PCC node
         final Topology t2 =
-                createTopology(TOPOLOGY_ID2, Arrays.asList(createPcepNode(NODE_ID2), createPcepNode(NODE_ID3)));
+                createTopology(TOPOLOGY_ID2, BindingMap.of(createPcepNode(NODE_ID2), createPcepNode(NODE_ID3)));
 
         // Non-PCEP topology with one non-PCC node
         final Topology t3 = createTopology(NONPCEP_TOPOLOGY,
-                Collections.singletonList(new NodeBuilder().setNodeId(new NodeId(NONPCEP_NODE)).build()));
+                BindingMap.of(new NodeBuilder().setNodeId(new NodeId(NONPCEP_NODE)).build()));
 
         final WriteTransaction wtx = getDataBroker().newWriteOnlyTransaction();
         final NetworkTopologyBuilder ntb = new NetworkTopologyBuilder();
-        ntb.setTopology(Arrays.asList(t1, t2, t3));
+        ntb.setTopology(BindingMap.of(t1, t2, t3));
         wtx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.builder(NetworkTopology.class).build(),
                 ntb.build());
         wtx.commit().get();
     }
 
-    private static Topology createTopology(final String topologyId, final List<Node> nodes) {
+    private static Topology createTopology(final String topologyId, final Map<NodeKey, Node> nodes) {
         return new TopologyBuilder().setTopologyId(new TopologyId(topologyId)).setNode(nodes).build();
     }
 
@@ -260,7 +263,7 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke
                 .getTopology().values() .iterator().next();
         final var ot2 = createGetStatsOutput(TOPOLOGY_ID2, Arrays.asList(NODE_ID2, NODE_ID3), createRpcSessionState())
                 .getTopology().values().iterator().next();
-        final GetStatsOutput out = new GetStatsOutputBuilder().setTopology(Arrays.asList(ot1, ot2)).build();
+        final GetStatsOutput out = new GetStatsOutputBuilder().setTopology(BindingMap.of(ot1, ot2)).build();
 
         // Implicitly match all PCEP topologies and nodes
         in = createGetStatsInput(null, null);
@@ -271,7 +274,7 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke
                 .iterator().next();
         final var it2 = createGetStatsInput(TOPOLOGY_ID2, Arrays.asList(NODE_ID2, NODE_ID3)).getTopology().values()
                 .iterator().next();
-        in = new GetStatsInputBuilder().setTopology(Arrays.asList(it1, it2)).build();
+        in = new GetStatsInputBuilder().setTopology(BindingMap.of(it1, it2)).build();
         performCountTest(in, out);
     }
 
@@ -322,8 +325,7 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke
         } else {
             topology = null;
         }
-        return new GetStatsInputBuilder().setTopology(topology != null ? Collections.singletonList(topology) : null)
-                .build();
+        return new GetStatsInputBuilder().setTopology(topology != null ? BindingMap.of(topology) : null).build();
     }
 
     private static GetStatsOutput createGetStatsOutput(final String topologyId, final List<String> nodeIds,
index cecd2641a9b5cbfc2f83f3f1ff8de40063ef5c3d..90c94cacf0dc4b8ea8429578f90b15ff48538450 100644 (file)
@@ -72,6 +72,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -211,9 +212,9 @@ public final class NodeChangedListener implements ClusteredDataTreeChangeListene
         final NodeKey nk = new NodeKey(new NodeId(url));
         final NodeBuilder nb = new NodeBuilder();
         nb.withKey(nk).setNodeId(nk.getNodeId());
-        nb.setTerminationPoint(Lists.newArrayList(tpb.build()));
+        nb.setTerminationPoint(BindingMap.of(tpb.build()));
         if (sni != null) {
-            nb.setSupportingNode(Lists.newArrayList(createSupportingNode(InstanceIdentifier.keyOf(sni).getNodeId(),
+            nb.setSupportingNode(BindingMap.of(createSupportingNode(InstanceIdentifier.keyOf(sni).getNodeId(),
                     inControl)));
         }
         final InstanceIdentifier<Node> nid = this.target.child(Node.class, nb.key());
@@ -258,13 +259,13 @@ public final class NodeChangedListener implements ClusteredDataTreeChangeListene
 
         final InstanceIdentifier<TerminationPoint> dst = getIpTerminationPoint(trans, dstIp, null, Boolean.FALSE);
         final InstanceIdentifier<TerminationPoint> src = getIpTerminationPoint(trans, srcIp, ni,
-                rl.getLsp().isDelegate());
+                rl.getLsp().getDelegate());
 
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720
                 .Link1Builder slab = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf
                 .stateful.rev200720.Link1Builder();
         slab.setOperationalStatus(rl.getLsp().getOperational());
-        slab.setAdministrativeStatus(rl.getLsp().isAdministrative() ? AdministrativeStatus.Active :
+        slab.setAdministrativeStatus(rl.getLsp().getAdministrative() ? AdministrativeStatus.Active :
                 AdministrativeStatus.Inactive);
 
         final LinkId id = linkIdForLsp(identifier, value);
index 2c5a65892639713d8316ed7536d2ec1384557a6d..87085b41f88894b039e825077f793d5fa75dfe89 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.bgpcep.pcep.tunnel.provider;
 
-import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
@@ -62,7 +61,7 @@ public final class PCEPTunnelTopologyProvider extends DefaultTopologyReference i
                                 .addAugmentation(new TopologyTypes1Builder()
                                         .setTopologyTunnelPcep(
                                                 new TopologyTunnelPcepBuilder().build()).build()).build())
-                        .setNode(new ArrayList<>()).build());
+                        .build());
         try {
             tx.commit().get();
         } catch (final InterruptedException | ExecutionException e) {
index 2bdbd8500ec5f917d83726830ab5b2064f29d072..48ae10b38732fc0d08ddf3b1c7c6f93b48c56c59 100644 (file)
@@ -72,7 +72,7 @@ final class TunelProgrammingUtil {
                 if (h1 != null) {
                     final SubobjectBuilder sb = new SubobjectBuilder();
                     sb.fieldsFrom(h1);
-                    sb.setLoose(h.isLoose());
+                    sb.setLoose(h.getLoose());
                     subobjs.add(sb.build());
                 } else {
                     LOG.debug("Ignoring unhandled explicit hop {}", h);
@@ -86,7 +86,7 @@ final class TunelProgrammingUtil {
     public static NodeId supportingNode(final Node node) {
         for (final SupportingNode n : node.nonnullSupportingNode().values()) {
             final SupportingNode1 n1 = n.augmentation(SupportingNode1.class);
-            if (n1 != null && n1.getPathComputationClient().isControlling()) {
+            if (n1 != null && n1.getPathComputationClient().getControlling()) {
                 return n.key().getNodeRef();
             }
         }
index 921a14c5b81e3b65a11f6a6ebcb6c105da1a2829..bbe1caa82f6b8df5647cd26b611a548d097701e2 100644 (file)
@@ -13,12 +13,9 @@ import static org.junit.Assert.assertNull;
 import static org.opendaylight.protocol.util.CheckTestUtil.readDataOperational;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.concurrent.ExecutionException;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
@@ -62,6 +59,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNode;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
@@ -90,7 +88,7 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
     public void setUp() throws InterruptedException, ExecutionException {
         final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
         wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, PCEP_TOPO_IID, new TopologyBuilder()
-                .withKey(new TopologyKey(PCEP_TOPOLOGY_ID)).setNode(Collections.emptyList())
+                .withKey(new TopologyKey(PCEP_TOPOLOGY_ID))
                 .setTopologyId(PCEP_TOPOLOGY_ID).build());
         wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, TUNNEL_TOPO_IID, new TopologyBuilder()
                 .withKey(new TopologyKey(TUNNEL_TOPOLOGY_ID)).setTopologyId(TUNNEL_TOPOLOGY_ID).build());
@@ -127,35 +125,35 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
             dst = tmp;
         }
 
-        Assert.assertEquals(srcId, src.getNodeId());
-        Assert.assertEquals(dstId, dst.getNodeId());
+        assertEquals(srcId, src.getNodeId());
+        assertEquals(dstId, dst.getNodeId());
 
-        Assert.assertEquals(1, dst.getTerminationPoint().size());
-        Assert.assertEquals(1, src.getTerminationPoint().size());
+        assertEquals(1, dst.getTerminationPoint().size());
+        assertEquals(1, src.getTerminationPoint().size());
         final TerminationPoint dstTp = dst.nonnullTerminationPoint().values().iterator().next();
         final TerminationPoint srcTp = src.nonnullTerminationPoint().values().iterator().next();
         final TpId dstNodeTpId = new TpId(dstId.getValue());
         final TpId srcNodeTpId = new TpId(srcId.getValue());
-        Assert.assertEquals(dstNodeTpId, dstTp.getTpId());
-        Assert.assertEquals(srcNodeTpId, srcTp.getTpId());
+        assertEquals(dstNodeTpId, dstTp.getTpId());
+        assertEquals(srcNodeTpId, srcTp.getTpId());
 
-        Assert.assertEquals(1, src.getSupportingNode().size());
-        Assert.assertNull(dst.getSupportingNode());
+        assertEquals(1, src.getSupportingNode().size());
+        assertNull(dst.getSupportingNode());
         final SupportingNode sNode = src.nonnullSupportingNode().values().iterator().next();
-        Assert.assertEquals(NODE1_ID, sNode.key().getNodeRef());
+        assertEquals(NODE1_ID, sNode.key().getNodeRef());
 
-        Assert.assertEquals(1, tunnelTopo.nonnullLink().size());
+        assertEquals(1, tunnelTopo.nonnullLink().size());
         final Link link = tunnelTopo.nonnullLink().values().iterator().next();
-        Assert.assertEquals(srcId, link.getSource().getSourceNode());
-        Assert.assertEquals(srcNodeTpId, link.getSource().getSourceTp());
-        Assert.assertEquals(dstId, link.getDestination().getDestNode());
-        Assert.assertEquals(dstNodeTpId, link.getDestination().getDestTp());
+        assertEquals(srcId, link.getSource().getSourceNode());
+        assertEquals(srcNodeTpId, link.getSource().getSourceTp());
+        assertEquals(dstId, link.getDestination().getDestNode());
+        assertEquals(dstNodeTpId, link.getDestination().getDestTp());
 
         // update second node -> adds supporting node and second link
         createNode(NODE2_ID, NODE2_IPV4, LSP2_NAME, LSP2_ID, NODE1_IPV4);
         readDataOperational(getDataBroker(), TUNNEL_TOPO_IID, updatedNodeTopo -> {
             assertNotNull(updatedNodeTopo.getNode());
-            Assert.assertEquals(2, updatedNodeTopo.getNode().size());
+            assertEquals(2, updatedNodeTopo.getNode().size());
             final Node updatedNode;
             if (updatedNodeTopo.nonnullNode().values().iterator().next().getNodeId().equals(srcId)) {
                 updatedNode = Iterables.get(updatedNodeTopo.nonnullNode().values(), 1);
@@ -164,10 +162,10 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
             }
 
             assertNotNull(updatedNode.getSupportingNode());
-            Assert.assertEquals(1, updatedNode.nonnullSupportingNode().size());
+            assertEquals(1, updatedNode.nonnullSupportingNode().size());
             final SupportingNode sNode2 = updatedNode.nonnullSupportingNode().values().iterator().next();
-            Assert.assertEquals(NODE2_ID, sNode2.getNodeRef());
-            Assert.assertEquals(2, updatedNodeTopo.getLink().size());
+            assertEquals(NODE2_ID, sNode2.getNodeRef());
+            assertEquals(2, updatedNodeTopo.getLink().size());
             return updatedNodeTopo;
 
         });
@@ -219,11 +217,11 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
                                 .build()).build()).build()).build()).setAdministrative(true)
                 .setDelegate(true).build()).build());
         final ReportedLsp reportedLps = new ReportedLspBuilder().withKey(new ReportedLspKey(lspName)).setPath(
-                Collections.singletonList(pathBuilder.build())).build();
+                BindingMap.of(pathBuilder.build())).build();
         final Node1Builder node1Builder = new Node1Builder();
         node1Builder.setPathComputationClient(new PathComputationClientBuilder()
                 .setStateSync(PccSyncState.Synchronized)
-                .setReportedLsp(Lists.newArrayList(reportedLps))
+                .setReportedLsp(BindingMap.of(reportedLps))
                 .setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone(ipv4Address)))
                 .build());
         nodeBuilder.addAugmentation(node1Builder.build());
index cc4857e969e7919f155869601c05bb8c5274457b..ff9b85173fd50710886e2c9bf5e27800c897295d 100644 (file)
@@ -7,18 +7,25 @@
  */
 package org.opendaylight.bgpcep.pcep.tunnel.provider;
 
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.bgpcep.programming.spi.Instruction;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.programming.spi.SchedulerException;
@@ -78,21 +85,19 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.LinkKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNode;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNodeKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TerminationPoint1Builder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.IgpTerminationPointAttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.igp.termination.point.attributes.termination.point.type.IpBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
 import org.osgi.framework.BundleContext;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
 
     private static final TopologyId TOPOLOGY_ID = new TopologyId("tunnel-topo");
@@ -143,28 +148,29 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
     private ListenableFuture<RpcResult<RemoveLspOutput>> futureRemoveLspOutput;
 
     private static Node createNode(final NodeId nodeId, final TpId tpId, final String ipv4Address) {
-        final TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
-        tpBuilder.setTpId(tpId);
-        tpBuilder.withKey(new TerminationPointKey(tpId));
-        tpBuilder.addAugmentation(new TerminationPoint1Builder()
-                .setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder()
+        return new NodeBuilder()
+            .setNodeId(nodeId)
+            .setTerminationPoint(BindingMap.of(new TerminationPointBuilder()
+                .setTpId(tpId)
+                .addAugmentation(new TerminationPoint1Builder()
+                    .setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder()
                         .setTerminationPointType(new IpBuilder()
-                                .setIpAddress(Collections.singletonList(new IpAddress(new Ipv4Address(ipv4Address))))
-                                .build()).build()).build());
-        final NodeBuilder nodeBuilder = new NodeBuilder();
-        nodeBuilder.setNodeId(nodeId);
-        nodeBuilder.withKey(new NodeKey(nodeId));
-        nodeBuilder.setTerminationPoint(Lists.newArrayList(tpBuilder.build()));
-        final SupportingNode supportingNode = new SupportingNodeBuilder()
-                .withKey(new SupportingNodeKey(nodeId, new TopologyId("dummy")))
+                            .setIpAddress(Collections.singletonList(new IpAddress(new Ipv4Address(ipv4Address))))
+                            .build())
+                        .build())
+                    .build())
+                .build()))
+            .setSupportingNode(BindingMap.of(new SupportingNodeBuilder()
+                .setTopologyRef(new TopologyId("dummy"))
+                .setNodeRef(nodeId)
                 .addAugmentation(new SupportingNode1Builder()
-                        .setPathComputationClient(new PathComputationClientBuilder()
-                                .setControlling(true).build()).build()).build();
-        nodeBuilder.setSupportingNode(Lists.newArrayList(supportingNode));
-        return nodeBuilder.build();
+                    .setPathComputationClient(new PathComputationClientBuilder().setControlling(true).build())
+                    .build())
+                .build()))
+            .build();
     }
 
-    private static ExplicitHops createExplicitHop(final String ipv4Prefix, Uint32 order) {
+    private static ExplicitHops createExplicitHop(final String ipv4Prefix, final Uint32 order) {
         return new ExplicitHopsBuilder()
                 .setOrder(order)
                 .addAugmentation(new ExplicitHops1Builder()
@@ -176,56 +182,50 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
 
     @Before
     public void setUp() throws SchedulerException, InterruptedException, ExecutionException {
-        MockitoAnnotations.initMocks(this);
-        Mockito.doReturn(true).when(this.instruction).checkedExecutionStart();
-        Mockito.doNothing().when(this.instruction).executionCompleted(InstructionStatus.Failed, null);
-        Mockito.doAnswer(invocation -> {
-            final Runnable callback = invocation.getArgument(0);
-            callback.run();
+        doReturn(true).when(instruction).checkedExecutionStart();
+        doNothing().when(instruction).executionCompleted(InstructionStatus.Failed, null);
+        doAnswer(invocation -> {
+            invocation.getArgument(0, Runnable.class).run();
             return null;
-        }).when(this.instructionFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doReturn(false).when(this.futureAddLspOutput).isCancelled();
-        Mockito.doAnswer(invocation -> {
-            final Runnable callback = invocation.getArgument(0);
-            callback.run();
+        }).when(instructionFuture).addListener(ArgumentMatchers.any(Runnable.class), Mockito.any(Executor.class));
+        doReturn(false).when(futureAddLspOutput).isCancelled();
+        doAnswer(invocation -> {
+            invocation.getArgument(0, Runnable.class).run();
             return null;
-        }).when(this.futureAddLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doReturn(false).when(this.futureUpdateLspOutput).isCancelled();
-        Mockito.doAnswer(invocation -> {
-            final Runnable callback = invocation.getArgument(0);
-            callback.run();
+        }).when(futureAddLspOutput).addListener(any(Runnable.class), any(Executor.class));
+        doReturn(false).when(futureUpdateLspOutput).isCancelled();
+        doAnswer(invocation -> {
+            invocation.getArgument(0, Runnable.class).run();
             return null;
-        }).when(this.futureUpdateLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doReturn(false).when(this.futureRemoveLspOutput).isCancelled();
-        Mockito.doAnswer(invocation -> {
-            final Runnable callback = invocation.getArgument(0);
-            callback.run();
+        }).when(futureUpdateLspOutput).addListener(any(Runnable.class), any(Executor.class));
+        doReturn(false).when(futureRemoveLspOutput).isCancelled();
+        doAnswer(invocation -> {
+            invocation.getArgument(0, Runnable.class).run();
             return null;
-        }).when(this.futureRemoveLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.addLspInput = invocation.getArgument(0);
-            return TunnelProgrammingTest.this.futureAddLspOutput;
-        }).when(this.topologyService).addLsp(Mockito.any(AddLspInput.class));
-        Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.updateLspInput = invocation.getArgument(0);
-            return TunnelProgrammingTest.this.futureUpdateLspOutput;
-        }).when(this.topologyService).updateLsp(Mockito.any(UpdateLspInput.class));
-        Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.removeLspInput = invocation.getArgument(0);
-            return TunnelProgrammingTest.this.futureRemoveLspOutput;
-        }).when(this.topologyService).removeLsp(Mockito.any(RemoveLspInput.class));
-        Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
-        Mockito.doReturn(true).when(this.instructionFuture).isDone();
-        Mockito.doReturn(this.instructionFuture).when(this.scheduler)
-                .scheduleInstruction(Mockito.any(SubmitInstructionInput.class));
+        }).when(futureRemoveLspOutput).addListener(any(Runnable.class), any(Executor.class));
+        doAnswer(invocation -> {
+            addLspInput = invocation.getArgument(0);
+            return futureAddLspOutput;
+        }).when(topologyService).addLsp(any(AddLspInput.class));
+        doAnswer(invocation -> {
+            updateLspInput = invocation.getArgument(0);
+            return futureUpdateLspOutput;
+        }).when(topologyService).updateLsp(any(UpdateLspInput.class));
+        doAnswer(invocation -> {
+            removeLspInput = invocation.getArgument(0);
+            return futureRemoveLspOutput;
+        }).when(topologyService).removeLsp(any(RemoveLspInput.class));
+        doReturn(instruction).when(instructionFuture).get();
+        doReturn(true).when(instructionFuture).isDone();
+        doReturn(instructionFuture).when(scheduler)
+                .scheduleInstruction(any(SubmitInstructionInput.class));
 
-        Mockito.doReturn(this.topologyService).when(this.rpcs)
+        doReturn(topologyService).when(rpcs)
                 .getRpcService(NetworkTopologyPcepService.class);
 
         createInitialTopology();
-        final TunnelProviderDependencies dependencies = new TunnelProviderDependencies(getDataBroker(), this.cssp,
-                this.rpr, this.rpcs, this.bundleContext);
-        this.tunnelProgramming = new TunnelProgramming(this.scheduler, dependencies);
+        tunnelProgramming = new TunnelProgramming(scheduler,
+            new TunnelProviderDependencies(getDataBroker(), cssp, rpr, rpcs, bundleContext));
     }
 
     @Test
@@ -235,88 +235,89 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
         final String tunnelName = "create-tunnel";
         final NetworkTopologyRef topologyRef = new NetworkTopologyRef(TOPO_IID);
         // create tunnel
-        final PcepCreateP2pTunnelInputBuilder createInputBuilder = new PcepCreateP2pTunnelInputBuilder();
-        createInputBuilder.setDestination(new DestinationBuilder().setNode(NODE2_ID).setTp(TP2_ID).build());
-        createInputBuilder.setSource(new SourceBuilder().setNode(NODE1_ID).setTp(TP1_ID).build());
-        createInputBuilder.setNetworkTopologyRef(topologyRef);
-        createInputBuilder.setBandwidth(bwd);
-        createInputBuilder.setClassType(classType);
-        createInputBuilder.setSymbolicPathName(tunnelName);
-        createInputBuilder.setExplicitHops(Collections.emptyList());
-        createInputBuilder.addAugmentation(new PcepCreateP2pTunnelInput1Builder()
-                .setAdministrativeStatus(AdministrativeStatus.Active).build());
-        this.tunnelProgramming.pcepCreateP2pTunnel(createInputBuilder.build());
+        tunnelProgramming.pcepCreateP2pTunnel(new PcepCreateP2pTunnelInputBuilder()
+            .setDestination(new DestinationBuilder().setNode(NODE2_ID).setTp(TP2_ID).build())
+            .setSource(new SourceBuilder().setNode(NODE1_ID).setTp(TP1_ID).build())
+            .setNetworkTopologyRef(topologyRef)
+            .setBandwidth(bwd)
+            .setClassType(classType)
+            .setSymbolicPathName(tunnelName)
+            .addAugmentation(new PcepCreateP2pTunnelInput1Builder()
+                .setAdministrativeStatus(AdministrativeStatus.Active)
+                .build())
+            .build());
         //check add-lsp input
-        Assert.assertNotNull(this.addLspInput);
-        Assert.assertEquals(tunnelName, this.addLspInput.getName());
-        final Arguments agrs = this.addLspInput.getArguments();
-        Assert.assertNotNull(agrs);
-        Assert.assertEquals(bwd, agrs.getBandwidth().getBandwidth());
-        Assert.assertEquals(classType, agrs.getClassType().getClassType());
+        assertNotNull(addLspInput);
+        assertEquals(tunnelName, addLspInput.getName());
+        final Arguments agrs = addLspInput.getArguments();
+        assertNotNull(agrs);
+        assertEquals(bwd, agrs.getBandwidth().getBandwidth());
+        assertEquals(classType, agrs.getClassType().getClassType());
         final Ipv4 ipv4Endpoints = ((Ipv4Case) agrs.getEndpointsObj().getAddressFamily()).getIpv4();
-        Assert.assertEquals(NODE1_IPV4, ipv4Endpoints.getSourceIpv4Address().getValue());
-        Assert.assertEquals(NODE2_IPV4, ipv4Endpoints.getDestinationIpv4Address().getValue());
-        Assert.assertEquals(NODE1_ID.getValue(), this.addLspInput.getNode().getValue());
+        assertEquals(NODE1_IPV4, ipv4Endpoints.getSourceIpv4Address().getValue());
+        assertEquals(NODE2_IPV4, ipv4Endpoints.getDestinationIpv4Address().getValue());
+        assertEquals(NODE1_ID.getValue(), addLspInput.getNode().getValue());
         createLink();
 
         // update tunnel
-        final PcepUpdateTunnelInputBuilder updateInputBuilder = new PcepUpdateTunnelInputBuilder();
-        updateInputBuilder.setNetworkTopologyRef(topologyRef);
-        updateInputBuilder.setBandwidth(bwd);
-        updateInputBuilder.setClassType(classType);
-        updateInputBuilder.setExplicitHops(Lists.newArrayList(createExplicitHop(IPV4_PREFIX1, Uint32.ONE),
-                createExplicitHop(IPV4_PREFIX2, Uint32.TWO)));
-        updateInputBuilder.setLinkId(LINK1_ID);
-        updateInputBuilder.addAugmentation(new PcepUpdateTunnelInput1Builder()
-                .setAdministrativeStatus(AdministrativeStatus.Active).build());
-        this.tunnelProgramming.pcepUpdateTunnel(updateInputBuilder.build());
+        tunnelProgramming.pcepUpdateTunnel(new PcepUpdateTunnelInputBuilder()
+            .setNetworkTopologyRef(topologyRef)
+            .setBandwidth(bwd)
+            .setClassType(classType)
+            // We assert on explicit order
+            .setExplicitHops(BindingMap.ordered(
+                createExplicitHop(IPV4_PREFIX1, Uint32.ONE),
+                createExplicitHop(IPV4_PREFIX2, Uint32.TWO)))
+            .setLinkId(LINK1_ID)
+            .addAugmentation(new PcepUpdateTunnelInput1Builder()
+                .setAdministrativeStatus(AdministrativeStatus.Active)
+                .build())
+            .build());
         //check update-lsp input
-        Assert.assertNotNull(this.updateLspInput);
-        Assert.assertEquals(LINK1_ID.getValue(), this.updateLspInput.getName());
+        assertNotNull(updateLspInput);
+        assertEquals(LINK1_ID.getValue(), updateLspInput.getName());
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev200120.update.lsp
-                .args.Arguments updArgs = this.updateLspInput.getArguments();
-        Assert.assertEquals(2, updArgs.getEro().getSubobject().size());
-        final List<Subobject> subObjects = updArgs.getEro().getSubobject();
+                .args.Arguments updArgs = updateLspInput.getArguments();
+        assertEquals(2, updArgs.getEro().nonnullSubobject().size());
+        final List<Subobject> subObjects = updArgs.getEro().nonnullSubobject();
         final IpPrefixCase prefix1 = (IpPrefixCase) subObjects.get(0).getSubobjectType();
         final IpPrefixCase prefix2 = (IpPrefixCase) subObjects.get(1).getSubobjectType();
-        Assert.assertEquals(IPV4_PREFIX1, prefix1.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
-        Assert.assertEquals(IPV4_PREFIX2, prefix2.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
+        assertEquals(IPV4_PREFIX1, prefix1.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
+        assertEquals(IPV4_PREFIX2, prefix2.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
 
         // delete tunnel
         final PcepDestroyTunnelInputBuilder destroyInputBuilder = new PcepDestroyTunnelInputBuilder();
         destroyInputBuilder.setLinkId(LINK1_ID);
         destroyInputBuilder.setNetworkTopologyRef(topologyRef);
-        this.tunnelProgramming.pcepDestroyTunnel(destroyInputBuilder.build());
-        Assert.assertNotNull(this.removeLspInput);
-        Assert.assertEquals(LINK1_ID.getValue(), this.removeLspInput.getName());
-        Assert.assertEquals(NODE1_ID.getValue(), this.removeLspInput.getNode().getValue());
+        tunnelProgramming.pcepDestroyTunnel(destroyInputBuilder.build());
+        assertNotNull(removeLspInput);
+        assertEquals(LINK1_ID.getValue(), removeLspInput.getName());
+        assertEquals(NODE1_ID, removeLspInput.getNode());
     }
 
     private void createInitialTopology() throws InterruptedException, ExecutionException {
-        final TopologyBuilder topologyBuilder = new TopologyBuilder();
-        topologyBuilder.withKey(new TopologyKey(TOPOLOGY_ID));
-        topologyBuilder.setServerProvided(true);
-        topologyBuilder.setTopologyId(TOPOLOGY_ID);
-        topologyBuilder.setNode(Lists.newArrayList(createNode(NODE1_ID, TP1_ID, NODE1_IPV4),
-                createNode(NODE2_ID, TP2_ID, NODE2_IPV4)));
         final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
-        wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, TOPO_IID, topologyBuilder.build());
+        wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, TOPO_IID, new TopologyBuilder()
+            .setTopologyId(TOPOLOGY_ID)
+            .setServerProvided(true)
+            .setTopologyId(TOPOLOGY_ID)
+            .setNode(BindingMap.of(createNode(NODE1_ID, TP1_ID, NODE1_IPV4), createNode(NODE2_ID, TP2_ID, NODE2_IPV4)))
+            .build());
         wTx.commit().get();
     }
 
     private void createLink() throws InterruptedException, ExecutionException {
-        final LinkBuilder linkBuilder = new LinkBuilder();
-        linkBuilder.setSource(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
-                .rev131021.link.attributes.SourceBuilder().setSourceNode(NODE1_ID).setSourceTp(TP1_ID).build());
-        linkBuilder.setDestination(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
-                .rev131021.link.attributes.DestinationBuilder().setDestNode(NODE2_ID).setDestTp(TP2_ID).build());
-        linkBuilder.setLinkId(LINK1_ID);
-        linkBuilder.withKey(new LinkKey(LINK1_ID));
-        linkBuilder.addAugmentation(new Link1Builder().setSymbolicPathName(LINK1_ID.getValue()).build());
         final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
         wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL,
-            TOPO_IID.builder().child(Link.class, new LinkKey(LINK1_ID)).build(), linkBuilder.build());
+            TOPO_IID.child(Link.class, new LinkKey(LINK1_ID)),
+            new LinkBuilder()
+                .setSource(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021
+                    .link.attributes.SourceBuilder().setSourceNode(NODE1_ID).setSourceTp(TP1_ID).build())
+                .setDestination(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021
+                    .link.attributes.DestinationBuilder().setDestNode(NODE2_ID).setDestTp(TP2_ID).build())
+                .setLinkId(LINK1_ID)
+                .addAugmentation(new Link1Builder().setSymbolicPathName(LINK1_ID.getValue()).build())
+                .build());
         wTx.commit().get();
     }
-
 }
index 3bd746a624f9b173d070525305f5c053c8297386..e203d5b0d2b9c82e4817ce83e8ac662d28cb1e27 100644 (file)
@@ -37,6 +37,6 @@ public class EROAsNumberSubobjectParser implements EROSubobjectParser, EROSubobj
             "Unknown subobject instance. Passed %s. Needed AsNumberCase.",
             subobject.getSubobjectType().getClass());
         final ByteBuf body = AsNumberCaseParser.serializeSubobject((AsNumberCase) subobject.getSubobjectType());
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 9972783f0a83fbaff5214a6cdcee6be4053d89df..b7b7744efd96a0c4e454faee39823f46e2bc7a73 100644 (file)
@@ -54,7 +54,7 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
                 .opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route
                 .subobjects.subobject.type.exrs._case.exrs.ExrsBuilder();
             b.setAttribute(s.getAttribute());
-            b.setMandatory(s.isMandatory());
+            b.setMandatory(s.getMandatory());
             b.setSubobjectType(s.getSubobjectType());
             exrss.add(b.build());
         }
@@ -71,19 +71,19 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.exclude.route
             .object.exclude.route.object.SubobjectContainer> list = new ArrayList<>();
         for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route
-            .subobjects.subobject.type.exrs._case.exrs.Exrs ex : e.getExrs()) {
+            .subobjects.subobject.type.exrs._case.exrs.Exrs ex : e.nonnullExrs()) {
             final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.exclude.route
                 .object.exclude.route.object.SubobjectContainerBuilder b = new org.opendaylight.yang.gen.v1.urn
                 .opendaylight.params.xml.ns.yang.rsvp.rev150820.exclude.route.object.exclude.route.object
                 .SubobjectContainerBuilder();
             b.setAttribute(ex.getAttribute());
-            b.setMandatory(ex.isMandatory());
+            b.setMandatory(ex.getMandatory());
             b.setSubobjectType(ex.getSubobjectType());
             list.add(b.build());
         }
         final ByteBuf body = Unpooled.buffer();
         localSerializeSubobject(list, body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 
     private List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.exclude.route.object
@@ -94,8 +94,8 @@ public class EROExplicitExclusionRouteSubobjectParser implements EROSubobjectPar
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.exclude.route
             .object.exclude.route.object.SubobjectContainer> subs = new ArrayList<>();
         while (buffer.isReadable()) {
-            final boolean mandatory = (buffer.getByte(buffer.readerIndex()) & (1 << Values.FIRST_BIT_OFFSET)) != 0;
-            final int type = (buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~(1 << Values
+            final boolean mandatory = (buffer.getByte(buffer.readerIndex()) & 1 << Values.FIRST_BIT_OFFSET) != 0;
+            final int type = buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES & ~(1 << Values
                 .FIRST_BIT_OFFSET);
             final int length = buffer.readUnsignedByte() - HEADER_LENGTH;
             if (length > buffer.readableBytes()) {
index a6c92bd18e08ff3c4d69eb6a7135f711de73ca8b..f79a8fb663c5e237b69f91c7daf3bfa51d9c1822 100644 (file)
@@ -68,6 +68,6 @@ public class EROIpv4PrefixSubobjectParser implements EROSubobjectParser, EROSubo
         checkArgument(prefix.getIpv4Prefix() != null, "Ipv4Prefix is mandatory.");
         Ipv4Util.writeIpv4Prefix(prefix.getIpv4Prefix(), body);
         body.writeZero(RESERVED);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 0ab248a47fdcc85469b248634fd19525e95f2ebb..7674370019500b25c5bb6b079d69e4488755cbf0 100644 (file)
@@ -66,6 +66,6 @@ public class EROIpv6PrefixSubobjectParser implements EROSubobjectParser, EROSubo
         final ByteBuf body = Unpooled.buffer();
         Ipv6Util.writeIpv6Prefix(ipv6prefix, body);
         body.writeZero(RESERVED);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 58286303d8667e9bd2f73cea0a3fa1359f357a7a..5a636989934145d432fa689cb7b05e85c6119d91 100644 (file)
@@ -79,7 +79,7 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject
             subobject.getSubobjectType().getClass());
         final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel();
         final ByteBuf body = Unpooled.buffer();
-        this.registry.serializeLabel(label.isUniDirectional(), false, label.getLabelType(), body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        this.registry.serializeLabel(label.getUniDirectional(), false, label.getLabelType(), body);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 4373fa49f28c44240dbe001e819266177b849fa8..459c4fbd36217195203858c3342c1b9ac85bf119 100644 (file)
@@ -53,9 +53,9 @@ public class EROPathKey32SubobjectParser implements EROSubobjectParser, EROSubob
             .getPathKey();
         final ByteBuf body = serializePathKey(pk);
         if (pk.getPceId().getValue().length == PCE_ID_F_LENGTH) {
-            EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+            EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
         } else if (pk.getPceId().getValue().length == EROPathKey128SubobjectParser.PCE128_ID_F_LENGTH) {
-            EROSubobjectUtil.formatSubobject(EROPathKey128SubobjectParser.TYPE, subobject.isLoose(), body, buffer);
+            EROSubobjectUtil.formatSubobject(EROPathKey128SubobjectParser.TYPE, subobject.getLoose(), body, buffer);
         }
     }
 }
index b2221041cc78b0709ef030d999cb2241ba66e923..603621abedc99c8f680455e0a54de8f167050a39 100644 (file)
@@ -53,6 +53,6 @@ public class EROUnnumberedInterfaceSubobjectParser implements EROSubobjectParser
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         body.writeZero(RESERVED);
         serializeUnnumeredInterface(((UnnumberedCase) subobject.getSubobjectType()).getUnnumbered(), body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 06314ea4cd1fec8fd00fca3a4d47dae2f666a906..168ceca67fe1d0411c94008694b60a1986d45939 100644 (file)
@@ -59,6 +59,6 @@ public class SEROBasicProtectionSubobjectParser extends ProtectionCommonParser
             .getProtectionSubobject();
         final ByteBuf body = Unpooled.buffer();
         serializeBody(CTYPE, protObj, body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
index 2a25bf88d10ec9281800affc66cb99d5a41b547f..abc6fecb2e6f582c84857589d111ae86cba78284 100644 (file)
@@ -33,6 +33,6 @@ public class SERODynamicProtectionSubobjectParser extends ProtectionCommonParser
             .getDynamicControlProtection().getProtectionSubobject();
         final ByteBuf body = Unpooled.buffer();
         serializeBody(CTYPE, protObj, body);
-        EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
+        EROSubobjectUtil.formatSubobject(TYPE, subobject.getLoose(), body, buffer);
     }
 }
\ No newline at end of file
index f28a9061260c9a9718adfeede6c5366140c5ea82..173f68f391abf7eed3d70ad915edd75a667ab1ac 100644 (file)
@@ -76,8 +76,8 @@ public class RROIpv4PrefixSubobjectParser implements RROSubobjectParser, RROSubo
         }
 
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT4_LENGTH);
         checkArgument(prefix.getIpv4Prefix() != null, "Ipv4Prefix is mandatory.");
         Ipv4Util.writeIpv4Prefix(prefix.getIpv4Prefix(), body);
index aebbe288dce15ef3dc1b915ae02bbb92d1214d9c..62f30c43c3f90261aac143d3b81ab53fde7c2305 100644 (file)
@@ -74,8 +74,8 @@ public class RROIpv6PrefixSubobjectParser implements RROSubobjectParser, RROSubo
     static void serializeSubobject(final ByteBuf buffer, final SubobjectContainer subobject,
             final Ipv6Prefix ipv6Prefix) {
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         Ipv6Util.writeIpv6Prefix(ipv6Prefix, body);
         flags.toByteBuf(body);
index 2d026330f355c19cfa0077d9fd3f24cf25a3065f..6439334b6864ef9dd5eca370c6d4322ee6884764 100644 (file)
@@ -80,7 +80,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject
         requireNonNull(subobject.getSubobjectType(), "Subobject type cannot be empty.");
         final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel();
         final ByteBuf body = Unpooled.buffer();
-        this.registry.serializeLabel(label.isUniDirectional(), label.isGlobal(), label.getLabelType(), body);
+        this.registry.serializeLabel(label.getUniDirectional(), label.getGlobal(), label.getLabelType(), body);
         RROSubobjectUtil.formatSubobject(TYPE, body, buffer);
     }
 }
index d3e68d43a2fc992239883c49f5b7ac28954e3baa..87d5695aeed097e2b350b70353a85e8c8252fa5e 100644 (file)
@@ -63,8 +63,8 @@ public class RROUnnumberedInterfaceSubobjectParser implements RROSubobjectParser
         checkArgument(type instanceof UnnumberedCase, "Unknown subobject instance. Passed %s. Needed UnnumberedCase.",
             type.getClass());
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(LPA_F_OFFSET, subobject.isProtectionAvailable());
-        flags.set(LPIU_F_OFFSET, subobject.isProtectionInUse());
+        flags.set(LPA_F_OFFSET, subobject.getProtectionAvailable());
+        flags.set(LPIU_F_OFFSET, subobject.getProtectionInUse());
         final ByteBuf body = Unpooled.buffer(CONTENT_LENGTH);
         flags.toByteBuf(body);
         body.writeZero(RESERVED);
index 41edc2e928821eed3f029a44ebd6405bd75b7e38..47e0a759b781ba98af508fef9a77e32dda569371 100644 (file)
@@ -37,6 +37,6 @@ public class XROAsNumberSubobjectParser implements XROSubobjectParser, XROSubobj
             "Unknown subobject instance. Passed %s. Needed AsNumberCase.",
             subobject.getSubobjectType().getClass());
         final ByteBuf body = AsNumberCaseParser.serializeSubobject((AsNumberCase) subobject.getSubobjectType());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index b87d01cbdfa4fc6cbfbb59e2d9a9b1f188277bd9..fb8fdc9ca36140bb95d867a8fbf2bc085350b7f9 100644 (file)
@@ -72,6 +72,6 @@ public class XROIpv4PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final Attribute attribute = subobject.getAttribute();
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 67f48094456ea758e1511a0b03585fe55eed28b9..c8f3fc1e4fb449754f13e5335707159add99eb7a 100644 (file)
@@ -74,6 +74,6 @@ public class XROIpv6PrefixSubobjectParser implements XROSubobjectParser, XROSubo
         final Attribute attribute = subobject.getAttribute();
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 03cfc159d8151eb0d48ecca511d4dede67dfbd44..1c142c0437c7a49bbeb1a42080ae5bdbf0004ec2 100644 (file)
@@ -55,9 +55,9 @@ public class XROPathKey32SubobjectParser implements XROSubobjectParser, XROSubob
         final ByteBuf body = serializePathKey(pk);
         final byte[] pceId = pk.getPceId().getValue();
         if (pceId.length == PCE_ID_F_LENGTH) {
-            XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+            XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
         } else if (pceId.length == XROPathKey128SubobjectParser.PCE128_ID_F_LENGTH) {
-            XROSubobjectUtil.formatSubobject(XROPathKey128SubobjectParser.TYPE, subobject.isMandatory(), body, buffer);
+            XROSubobjectUtil.formatSubobject(XROPathKey128SubobjectParser.TYPE, subobject.getMandatory(), body, buffer);
         }
     }
 }
index 0230bb3a264dafa609dd27d6ab362a0953e0e64f..f2e0de92f726adfec64c71e5708e0b3faea787ab 100644 (file)
@@ -68,6 +68,6 @@ public class XROSrlgSubobjectParser implements XROSubobjectParser, XROSubobjectS
         checkArgument(attribute != null, "Attribute is mandatory.");
         body.writeByte(0);
         body.writeByte(attribute.getIntValue());
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 75c370a0b2348630abf2736f6c2bb6b978ad87c1..18057a9366b3d02d42396b5dff94a33201fd4881 100644 (file)
@@ -58,6 +58,6 @@ public class XROUnnumberedInterfaceSubobjectParser implements XROSubobjectParser
         final Attribute attribute = subobject.getAttribute();
         body.writeByte(attribute != null ? attribute.getIntValue() : 0);
         serializeUnnumeredInterface(((UnnumberedCase) type).getUnnumbered(), body);
-        XROSubobjectUtil.formatSubobject(TYPE, subobject.isMandatory(), body, buffer);
+        XROSubobjectUtil.formatSubobject(TYPE, subobject.getMandatory(), body, buffer);
     }
 }
index 8dc45601beb143704c8508a977032483f31b643b..4fda9a050ad57568469d46f147ca4f76e5a85c60 100644 (file)
@@ -44,13 +44,13 @@ public final class AdminStatusObjectParser extends AbstractRSVPObjectParser {
         final AdminStatusObject addObject = (AdminStatusObject) teLspObject;
         serializeAttributeHeader(BODY_SIZE, CLASS_NUM, CTYPE, output);
         final BitArray reflect = new BitArray(FLAGS_SIZE);
-        reflect.set(REFLECT, addObject.isReflect());
+        reflect.set(REFLECT, addObject.getReflect());
         reflect.toByteBuf(output);
         output.writeShort(0);
         final BitArray flags = new BitArray(FLAGS_SIZE);
-        flags.set(TESTING, addObject.isTesting());
-        flags.set(DOWN, addObject.isAdministrativelyDown());
-        flags.set(DELETION, addObject.isDeletionInProgress());
+        flags.set(TESTING, addObject.getTesting());
+        flags.set(DOWN, addObject.getAdministrativelyDown());
+        flags.set(DELETION, addObject.getDeletionInProgress());
         flags.toByteBuf(output);
     }
 }
index da774e5bfaa10c66c7953e18c64ed9c19b346bf0..cd5bd9c400a4690f5ddb98409fd67caca04b581b 100644 (file)
@@ -49,8 +49,8 @@ public final class MetricObjectParser extends AbstractRSVPObjectParser {
         serializeAttributeHeader(BODY_SIZE, CLASS_NUM, CTYPE, output);
         output.writeShort(0);
         final BitArray reflect = new BitArray(FLAGS_SIZE);
-        reflect.set(BOUND, metric.isBound());
-        reflect.set(COMPUTED, metric.isComputed());
+        reflect.set(BOUND, metric.getBound());
+        reflect.set(COMPUTED, metric.getComputed());
         reflect.toByteBuf(output);
         output.writeByte(metric.getMetricType().toJava());
         writeFloat32(metric.getValue(), output);
index 738705bef6dda60b7683b6b95d449e4df1051e6a..46c097d7e8d509c89ccd59e0c49f2762c76aa0e5 100644 (file)
@@ -37,7 +37,7 @@ public class ProtectionCommonParser {
 
     protected static void serializeBodyType1(final ProtectionSubobject protObj, final ByteBuf output) {
         final BitArray flagBitArray = new BitArray(FLAGS_SIZE);
-        flagBitArray.set(SECONDARY, protObj.isSecondary());
+        flagBitArray.set(SECONDARY, protObj.getSecondary());
         flagBitArray.toByteBuf(output);
         output.writeShort(0);
         output.writeByte(protObj.getLinkFlags().getIntValue());
@@ -45,17 +45,17 @@ public class ProtectionCommonParser {
 
     protected static void serializeBodyType2(final ProtectionSubobject protObj, final ByteBuf output) {
         final BitArray flagBitArray = new BitArray(FLAGS_SIZE);
-        flagBitArray.set(SECONDARY, protObj.isSecondary());
-        flagBitArray.set(PROTECTING, protObj.isProtecting());
-        flagBitArray.set(NOTIFICATION, protObj.isNotification());
-        flagBitArray.set(OPERATIONAL, protObj.isOperational());
+        flagBitArray.set(SECONDARY, protObj.getSecondary());
+        flagBitArray.set(PROTECTING, protObj.getProtecting());
+        flagBitArray.set(NOTIFICATION, protObj.getNotification());
+        flagBitArray.set(OPERATIONAL, protObj.getOperational());
         flagBitArray.toByteBuf(output);
         output.writeByte(protObj.getLspFlag().getIntValue());
         output.writeByte(0);
         output.writeByte(protObj.getLinkFlags().getIntValue());
         final BitArray flagInPlaceBitArray = new BitArray(FLAGS_SIZE);
-        flagInPlaceBitArray.set(IN_PLACE, protObj.isInPlace());
-        flagInPlaceBitArray.set(REQUIRED, protObj.isRequired());
+        flagInPlaceBitArray.set(IN_PLACE, protObj.getInPlace());
+        flagInPlaceBitArray.set(REQUIRED, protObj.getRequired());
         flagInPlaceBitArray.toByteBuf(output);
         output.writeByte(protObj.getSegFlag().getIntValue());
         output.writeShort(0);
index 889e8e9b839e07466ab3706c4ede86f4851560f7..f63b428a861e445ee74b7c354ad4df81eff233c1 100644 (file)
@@ -39,8 +39,8 @@ public final class SecondaryRecordRouteObjectParser extends RROSubobjectListPars
             .route.object.secondary.record.route.object.SubobjectContainer> srroSbo = sbo.stream()
             .map(so -> new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.secondary
                 .record.route.object.secondary.record.route.object.SubobjectContainerBuilder()
-                .setProtectionAvailable(so.isProtectionAvailable())
-                .setProtectionInUse(so.isProtectionInUse())
+                .setProtectionAvailable(so.getProtectionAvailable())
+                .setProtectionInUse(so.getProtectionInUse())
                 .setSubobjectType(so.getSubobjectType())
                 .build()
             ).collect(Collectors.toList());
@@ -55,8 +55,8 @@ public final class SecondaryRecordRouteObjectParser extends RROSubobjectListPars
         final ByteBuf bufferAux = Unpooled.buffer();
         final List<SubobjectContainer> srroSbo = srro.getSubobjectContainer()
             .stream().map(so -> new SubobjectContainerBuilder()
-                .setProtectionAvailable(so.isProtectionAvailable())
-                .setProtectionInUse(so.isProtectionInUse())
+                .setProtectionAvailable(so.getProtectionAvailable())
+                .setProtectionInUse(so.getProtectionInUse())
                 .setSubobjectType(so.getSubobjectType())
                 .build()).collect(Collectors.toList());
         serializeList(srroSbo, bufferAux);
index a39b88758c701b7789d0b78f275357fef237766e..5de8252d4bf9912496dedd67bcf89798343f5c4d 100644 (file)
@@ -64,9 +64,9 @@ public final class SessionAttributeLspObjectParser extends AbstractRSVPObjectPar
         output.writeByte(sessionObject.getSetupPriority().toJava());
         output.writeByte(sessionObject.getHoldPriority().toJava());
         final BitArray bs = new BitArray(FLAGS_SIZE);
-        bs.set(LOCAL_PROTECTION, sessionObject.isLocalProtectionDesired());
-        bs.set(LABEL_RECORDING, sessionObject.isLabelRecordingDesired());
-        bs.set(SE_STYLE, sessionObject.isSeStyleDesired());
+        bs.set(LOCAL_PROTECTION, sessionObject.getLocalProtectionDesired());
+        bs.set(LABEL_RECORDING, sessionObject.getLabelRecordingDesired());
+        bs.set(SE_STYLE, sessionObject.getSeStyleDesired());
         bs.toByteBuf(output);
         output.writeByte(sessionName.readableBytes());
         output.writeBytes(sessionName);
index 1de4bd5914abf23c78e46b5abda6c287ea61f291..5dae1e245de0309115523c4b958efa2ab08912af 100644 (file)
@@ -66,9 +66,9 @@ public final class SessionAttributeLspRaObjectParser extends AbstractRSVPObjectP
         output.writeByte(sessionObject.getSetupPriority().toJava());
         output.writeByte(sessionObject.getHoldPriority().toJava());
         final BitArray bs = new BitArray(FLAGS_SIZE);
-        bs.set(SessionAttributeLspObjectParser.LOCAL_PROTECTION, sessionObject.isLocalProtectionDesired());
-        bs.set(SessionAttributeLspObjectParser.LABEL_RECORDING, sessionObject.isLabelRecordingDesired());
-        bs.set(SessionAttributeLspObjectParser.SE_STYLE, sessionObject.isSeStyleDesired());
+        bs.set(SessionAttributeLspObjectParser.LOCAL_PROTECTION, sessionObject.getLocalProtectionDesired());
+        bs.set(SessionAttributeLspObjectParser.LABEL_RECORDING, sessionObject.getLabelRecordingDesired());
+        bs.set(SessionAttributeLspObjectParser.SE_STYLE, sessionObject.getSeStyleDesired());
         bs.toByteBuf(output);
         output.writeByte(sessionName.readableBytes());
         output.writeBytes(Unpooled.wrappedBuffer(StandardCharsets.US_ASCII.encode(sessionObject.getSessionName())));