From 877be4131741fe5fdfbd9e7bce69f19c2bf8d44f Mon Sep 17 00:00:00 2001
From: Vickey <891607480@qq.com>
Date: Mon, 9 Jun 2025 15:48:22 +0800
Subject: [PATCH] build: bump project version to 2025.6.0 and remove unused
job/register dependencies
---
.github/workflows/docker-ci.yml | 2 +-
dc3-api/dc3-api-auth/pom.xml | 4 +-
dc3-api/dc3-api-data/pom.xml | 4 +-
dc3-api/dc3-api-driver/pom.xml | 4 +-
dc3-api/dc3-api-manager/pom.xml | 4 +-
dc3-api/pom.xml | 6 +-
dc3-center/dc3-center-auth/pom.xml | 2 +-
.../pnoker/center/auth/AuthApplication.java | 2 +-
dc3-center/dc3-center-data/pom.xml | 2 +-
.../pnoker/center/data/DataApplication.java | 2 +-
dc3-center/dc3-center-manager/pom.xml | 2 +-
.../center/manager/ManagerApplication.java | 2 +-
dc3-center/dc3-center-single/pom.xml | 2 +-
.../pnoker/center/SingleApplication.java | 2 +-
dc3-center/pom.xml | 4 +-
dc3-common/dc3-common-api/pom.xml | 4 +-
.../pnoker/common/utils/GrpcBuilderUtil.java | 2 +-
dc3-common/dc3-common-auth/pom.xml | 4 +-
.../auth/biz/DictionaryForAuthService.java | 2 +-
.../pnoker/common/auth/biz/TokenService.java | 2 +-
.../impl/DictionaryForAuthServiceImpl.java | 2 +-
.../auth/biz/impl/TokenServiceImpl.java | 2 +-
.../DictionaryForAuthController.java | 2 +-
.../auth/controller/TenantController.java | 2 +-
.../auth/controller/TokenController.java | 2 +-
.../auth/controller/UserLoginController.java | 2 +-
.../pnoker/common/auth/dal/ApiManager.java | 2 +-
.../common/auth/dal/DriverTokenManager.java | 2 +-
.../pnoker/common/auth/dal/MenuManager.java | 2 +-
.../common/auth/dal/ResourceManager.java | 2 +-
.../pnoker/common/auth/dal/RoleManager.java | 2 +-
.../auth/dal/RoleResourceBindManager.java | 2 +-
.../common/auth/dal/RoleUserBindManager.java | 2 +-
.../common/auth/dal/TenantBindManager.java | 2 +-
.../pnoker/common/auth/dal/TenantManager.java | 2 +-
.../common/auth/dal/UserLoginManager.java | 2 +-
.../pnoker/common/auth/dal/UserManager.java | 2 +-
.../common/auth/dal/UserPasswordManager.java | 2 +-
.../common/auth/dal/impl/ApiManagerImpl.java | 2 +-
.../auth/dal/impl/DriverTokenManagerImpl.java | 2 +-
.../common/auth/dal/impl/MenuManagerImpl.java | 2 +-
.../auth/dal/impl/ResourceManagerImpl.java | 2 +-
.../common/auth/dal/impl/RoleManagerImpl.java | 2 +-
.../dal/impl/RoleResourceBindManagerImpl.java | 2 +-
.../dal/impl/RoleUserBindManagerImpl.java | 2 +-
.../auth/dal/impl/TenantBindManagerImpl.java | 2 +-
.../auth/dal/impl/TenantManagerImpl.java | 2 +-
.../auth/dal/impl/UserLoginManagerImpl.java | 2 +-
.../common/auth/dal/impl/UserManagerImpl.java | 2 +-
.../dal/impl/UserPasswordManagerImpl.java | 2 +-
.../common/auth/entity/bean/AuthHeader.java | 2 +-
.../pnoker/common/auth/entity/bean/Login.java | 2 +-
.../common/auth/entity/bean/TokenValid.java | 2 +-
.../pnoker/common/auth/entity/bo/ApiBO.java | 2 +-
.../common/auth/entity/bo/DriverTokenBO.java | 2 +-
.../pnoker/common/auth/entity/bo/MenuBO.java | 2 +-
.../common/auth/entity/bo/ResourceBO.java | 2 +-
.../pnoker/common/auth/entity/bo/RoleBO.java | 2 +-
.../auth/entity/bo/RoleResourceBindBO.java | 2 +-
.../common/auth/entity/bo/RoleUserBindBO.java | 2 +-
.../common/auth/entity/bo/TenantBO.java | 2 +-
.../common/auth/entity/bo/TenantBindBO.java | 2 +-
.../pnoker/common/auth/entity/bo/UserBO.java | 2 +-
.../common/auth/entity/bo/UserLoginBO.java | 2 +-
.../common/auth/entity/bo/UserPasswordBO.java | 2 +-
.../auth/entity/builder/ApiBuilder.java | 2 +-
.../builder/DictionaryForAuthBuilder.java | 2 +-
.../auth/entity/builder/MenuBuilder.java | 2 +-
.../auth/entity/builder/ResourceBuilder.java | 2 +-
.../auth/entity/builder/RoleBuilder.java | 2 +-
.../builder/RoleResourceBindBuilder.java | 2 +-
.../entity/builder/RoleUserBindBuilder.java | 2 +-
.../entity/builder/TenantBindBuilder.java | 2 +-
.../auth/entity/builder/TenantBuilder.java | 2 +-
.../auth/entity/builder/UserBuilder.java | 2 +-
.../auth/entity/builder/UserLoginBuilder.java | 2 +-
.../entity/builder/UserPasswordBuilder.java | 2 +-
.../common/auth/entity/model/ApiDO.java | 2 +-
.../auth/entity/model/DriverTokenDO.java | 2 +-
.../common/auth/entity/model/MenuDO.java | 2 +-
.../common/auth/entity/model/ResourceDO.java | 2 +-
.../common/auth/entity/model/RoleDO.java | 2 +-
.../auth/entity/model/RoleResourceBindDO.java | 2 +-
.../auth/entity/model/RoleUserBindDO.java | 2 +-
.../auth/entity/model/TenantBindDO.java | 2 +-
.../common/auth/entity/model/TenantDO.java | 2 +-
.../common/auth/entity/model/UserDO.java | 2 +-
.../common/auth/entity/model/UserLoginDO.java | 2 +-
.../auth/entity/model/UserPasswordDO.java | 2 +-
.../common/auth/entity/query/ApiQuery.java | 2 +-
.../auth/entity/query/DriverTokenQuery.java | 2 +-
.../common/auth/entity/query/MenuQuery.java | 2 +-
.../auth/entity/query/ResourceQuery.java | 2 +-
.../common/auth/entity/query/RoleQuery.java | 2 +-
.../entity/query/RoleResourceBindQuery.java | 2 +-
.../auth/entity/query/RoleUserBindQuery.java | 2 +-
.../auth/entity/query/TenantBindQuery.java | 2 +-
.../common/auth/entity/query/TenantQuery.java | 2 +-
.../common/auth/entity/query/TokenQuery.java | 2 +-
.../auth/entity/query/UserLoginQuery.java | 2 +-
.../auth/entity/query/UserPasswordQuery.java | 2 +-
.../common/auth/entity/query/UserQuery.java | 2 +-
.../pnoker/common/auth/entity/vo/ApiVO.java | 2 +-
.../common/auth/entity/vo/DriverTokenVO.java | 2 +-
.../pnoker/common/auth/entity/vo/MenuVO.java | 2 +-
.../common/auth/entity/vo/ResourceVO.java | 2 +-
.../auth/entity/vo/RoleResourceBindVO.java | 2 +-
.../common/auth/entity/vo/RoleUserBindVO.java | 2 +-
.../pnoker/common/auth/entity/vo/RoleVO.java | 2 +-
.../common/auth/entity/vo/TenantBindVO.java | 2 +-
.../common/auth/entity/vo/TenantVO.java | 2 +-
.../common/auth/entity/vo/UserLoginVO.java | 2 +-
.../common/auth/entity/vo/UserPasswordVO.java | 2 +-
.../pnoker/common/auth/entity/vo/UserVO.java | 2 +-
.../auth/generator/MybatisGenerator.java | 2 +-
.../pnoker/common/auth/grpc/TenantServer.java | 2 +-
.../pnoker/common/auth/grpc/TokenServer.java | 2 +-
.../common/auth/grpc/UserLoginServer.java | 2 +-
.../pnoker/common/auth/grpc/UserServer.java | 2 +-
.../auth/grpc/builder/GrpcTenantBuilder.java | 2 +-
.../auth/grpc/builder/GrpcUserBuilder.java | 2 +-
.../grpc/builder/GrpcUserLoginBuilder.java | 2 +-
.../pnoker/common/auth/mapper/ApiMapper.java | 2 +-
.../common/auth/mapper/DriverTokenMapper.java | 2 +-
.../pnoker/common/auth/mapper/MenuMapper.java | 2 +-
.../common/auth/mapper/ResourceMapper.java | 2 +-
.../pnoker/common/auth/mapper/RoleMapper.java | 2 +-
.../auth/mapper/RoleResourceBindMapper.java | 2 +-
.../auth/mapper/RoleUserBindMapper.java | 2 +-
.../common/auth/mapper/TenantBindMapper.java | 2 +-
.../common/auth/mapper/TenantMapper.java | 2 +-
.../common/auth/mapper/UserLoginMapper.java | 2 +-
.../pnoker/common/auth/mapper/UserMapper.java | 2 +-
.../auth/mapper/UserPasswordMapper.java | 2 +-
.../common/auth/service/ApiService.java | 2 +-
.../common/auth/service/MenuService.java | 2 +-
.../common/auth/service/ResourceService.java | 2 +-
.../auth/service/RoleResourceBindService.java | 2 +-
.../common/auth/service/RoleService.java | 2 +-
.../auth/service/RoleUserBindService.java | 2 +-
.../auth/service/TenantBindService.java | 2 +-
.../common/auth/service/TenantService.java | 2 +-
.../common/auth/service/UserLoginService.java | 2 +-
.../auth/service/UserPasswordService.java | 2 +-
.../common/auth/service/UserService.java | 2 +-
.../auth/service/impl/ApiServiceImpl.java | 2 +-
.../auth/service/impl/MenuServiceImpl.java | 2 +-
.../service/impl/ResourceServiceImpl.java | 2 +-
.../impl/RoleResourceBindServiceImpl.java | 2 +-
.../auth/service/impl/RoleServiceImpl.java | 2 +-
.../service/impl/RoleUserBindServiceImpl.java | 2 +-
.../service/impl/TenantBindServiceImpl.java | 2 +-
.../auth/service/impl/TenantServiceImpl.java | 2 +-
.../service/impl/UserLoginServiceImpl.java | 2 +-
.../service/impl/UserPasswordServiceImpl.java | 2 +-
.../auth/service/impl/UserServiceImpl.java | 2 +-
.../config/ActiveAuthProfileConfig.java | 2 +-
.../pnoker/common/init/AuthInitRunner.java | 2 +-
dc3-common/dc3-common-constant/pom.xml | 4 +-
.../constant/cache/TimeoutConstant.java | 2 +-
.../constant/common/AlgorithmConstant.java | 2 +-
.../constant/common/DefaultConstant.java | 2 +-
.../constant/common/EnvironmentConstant.java | 2 +-
.../constant/common/FolderConstant.java | 2 +-
.../constant/common/PrefixConstant.java | 2 +-
.../constant/common/QueryWrapperConstant.java | 2 +-
.../constant/common/RequestConstant.java | 8 +-
.../constant/common/SuffixConstant.java | 2 +-
.../constant/common/SymbolConstant.java | 2 +-
.../common/constant/common/TimeConstant.java | 2 +-
.../common/constant/driver/EventConstant.java | 6 +-
.../constant/driver/MetadataConstant.java | 12 +-
.../constant/driver/RabbitConstant.java | 2 +-
.../constant/driver/ScheduleConstant.java | 2 +-
.../constant/driver/StorageConstant.java | 2 +-
.../constant/driver/StrategyConstant.java | 4 +-
.../common/constant/service/AuthConstant.java | 2 +-
.../common/constant/service/DataConstant.java | 2 +-
.../constant/service/DriverConstant.java | 2 +-
.../constant/service/ManagerConstant.java | 2 +-
.../pnoker/common/enums/AccrueFlagEnum.java | 2 +-
.../enums/AlarmMessageLevelFlagEnum.java | 2 +-
.../common/enums/AlarmTypeFlagEnum.java | 2 +-
.../pnoker/common/enums/ApiTypeFlagEnum.java | 2 +-
.../common/enums/AttributeTypeFlagEnum.java | 2 +-
.../common/enums/AutoConfirmFlagEnum.java | 2 +-
.../common/enums/DeviceCommandTypeEnum.java | 2 +-
.../common/enums/DeviceEventTypeEnum.java | 2 +-
.../pnoker/common/enums/DeviceStatusEnum.java | 2 +-
.../common/enums/DriverCommandTypeEnum.java | 2 +-
.../common/enums/DriverEventTypeEnum.java | 2 +-
.../pnoker/common/enums/DriverStatusEnum.java | 2 +-
.../common/enums/DriverTypeFlagEnum.java | 2 +-
.../pnoker/common/enums/EnableFlagEnum.java | 2 +-
.../common/enums/EntityTypeFlagEnum.java | 2 +-
.../pnoker/common/enums/ExpireFlagEnum.java | 2 +-
.../common/enums/GroupTypeFlagEnum.java | 2 +-
.../common/enums/MenuLevelFlagEnum.java | 2 +-
.../pnoker/common/enums/MenuTypeFlagEnum.java | 2 +-
.../common/enums/MetadataOperateTypeEnum.java | 2 +-
.../pnoker/common/enums/MetadataTypeEnum.java | 2 +-
.../common/enums/PointTypeFlagEnum.java | 2 +-
.../common/enums/ProfileShareFlagEnum.java | 2 +-
.../common/enums/ProfileTypeFlagEnum.java | 2 +-
.../common/enums/ResourceScopeFlagEnum.java | 2 +-
.../common/enums/ResourceTypeFlagEnum.java | 2 +-
.../pnoker/common/enums/ResponseEnum.java | 2 +-
.../pnoker/common/enums/RwFlagEnum.java | 2 +-
dc3-common/dc3-common-dal/pom.xml | 4 +-
.../common/dal/dal/GroupBindManager.java | 2 +-
.../pnoker/common/dal/dal/GroupManager.java | 2 +-
.../common/dal/dal/LabelBindManager.java | 2 +-
.../pnoker/common/dal/dal/LabelManager.java | 2 +-
.../dal/dal/impl/GroupBindManagerImpl.java | 2 +-
.../common/dal/dal/impl/GroupManagerImpl.java | 2 +-
.../dal/dal/impl/LabelBindManagerImpl.java | 2 +-
.../common/dal/dal/impl/LabelManagerImpl.java | 2 +-
.../common/dal/entity/bo/DictionaryBO.java | 2 +-
.../pnoker/common/dal/entity/bo/GroupBO.java | 2 +-
.../pnoker/common/dal/entity/bo/LabelBO.java | 2 +-
.../common/dal/entity/bo/LabelBindBO.java | 2 +-
.../dal/entity/builder/DictionaryBuilder.java | 2 +-
.../dal/entity/builder/GroupBuilder.java | 2 +-
.../dal/entity/builder/LabelBindBuilder.java | 2 +-
.../dal/entity/builder/LabelBuilder.java | 2 +-
.../common/dal/entity/model/GroupBindDO.java | 2 +-
.../common/dal/entity/model/GroupDO.java | 2 +-
.../common/dal/entity/model/LabelBindDO.java | 2 +-
.../common/dal/entity/model/LabelDO.java | 2 +-
.../common/dal/entity/query/GroupQuery.java | 2 +-
.../dal/entity/query/LabelBindQuery.java | 2 +-
.../common/dal/entity/query/LabelQuery.java | 2 +-
.../common/dal/entity/vo/DictionaryVO.java | 2 +-
.../pnoker/common/dal/entity/vo/GroupVO.java | 2 +-
.../common/dal/entity/vo/LabelBindVO.java | 2 +-
.../pnoker/common/dal/entity/vo/LabelVO.java | 2 +-
.../dal/generator/MybatisGenerator.java | 2 +-
.../common/dal/mapper/GroupBindMapper.java | 2 +-
.../pnoker/common/dal/mapper/GroupMapper.java | 2 +-
.../common/dal/mapper/LabelBindMapper.java | 2 +-
.../pnoker/common/dal/mapper/LabelMapper.java | 2 +-
.../common/dal/service/GroupService.java | 2 +-
.../common/dal/service/LabelBindService.java | 2 +-
.../common/dal/service/LabelService.java | 2 +-
.../dal/service/impl/GroupServiceImpl.java | 2 +-
.../service/impl/LabelBindServiceImpl.java | 2 +-
.../dal/service/impl/LabelServiceImpl.java | 2 +-
dc3-common/dc3-common-data/pom.xml | 4 +-
.../config/ActiveDataProfileConfig.java | 2 +-
.../pnoker/common/config/DataTopicConfig.java | 2 +-
.../common/data/biz/DeviceEventService.java | 2 +-
.../common/data/biz/DeviceStatusService.java | 2 +-
.../common/data/biz/DriverEventService.java | 2 +-
.../common/data/biz/DriverStatusService.java | 2 +-
.../data/biz/PointValueCommandService.java | 2 +-
.../common/data/biz/PointValueService.java | 2 +-
.../data/biz/ScheduleForDataService.java | 2 +-
.../data/biz/impl/DeviceEventServiceImpl.java | 2 +-
.../biz/impl/DeviceStatusServiceImpl.java | 2 +-
.../data/biz/impl/DriverEventServiceImpl.java | 2 +-
.../biz/impl/DriverStatusServiceImpl.java | 2 +-
.../impl/PointValueCommandServiceImpl.java | 2 +-
.../data/biz/impl/PointValueServiceImpl.java | 2 +-
.../impl/PostgresRepositoryServiceImpl.java | 2 +-
.../biz/impl/ScheduleForDataServiceImpl.java | 2 +-
.../controller/DeviceStatusController.java | 2 +-
.../controller/DriverStatusController.java | 2 +-
.../PointValueCommandController.java | 2 +-
.../data/controller/PointValueController.java | 2 +-
.../common/data/dal/DeviceEventManager.java | 2 +-
.../data/dal/DeviceRunHistoryManager.java | 2 +-
.../common/data/dal/DeviceRunManager.java | 2 +-
.../data/dal/DeviceStatusHistoryManager.java | 2 +-
.../common/data/dal/DriverEventManager.java | 2 +-
.../data/dal/DriverRunHistoryManager.java | 2 +-
.../common/data/dal/DriverRunManager.java | 2 +-
.../data/dal/DriverStatusHistoryManager.java | 2 +-
.../common/data/dal/MessageManager.java | 2 +-
.../pnoker/common/data/dal/NotifyManager.java | 2 +-
.../common/data/dal/PointValueManager.java | 2 +-
.../pnoker/common/data/dal/RuleManager.java | 2 +-
.../data/dal/impl/DeviceEventManagerImpl.java | 2 +-
.../dal/impl/DeviceRunHistoryManagerImpl.java | 2 +-
.../data/dal/impl/DeviceRunManagerImpl.java | 2 +-
.../impl/DeviceStatusHistoryManagerImpl.java | 2 +-
.../data/dal/impl/DriverEventManagerImpl.java | 2 +-
.../dal/impl/DriverRunHistoryManagerImpl.java | 2 +-
.../data/dal/impl/DriverRunManagerImpl.java | 2 +-
.../impl/DriverStatusHistoryManagerImpl.java | 2 +-
.../data/dal/impl/MessageManagerImpl.java | 2 +-
.../data/dal/impl/NotifyManagerImpl.java | 2 +-
.../data/dal/impl/PointValueManagerImpl.java | 2 +-
.../common/data/dal/impl/RuleManagerImpl.java | 2 +-
.../common/data/entity/DeviceEvent.java | 2 +-
.../common/data/entity/DriverEvent.java | 2 +-
.../common/data/entity/bo/MessageBO.java | 2 +-
.../common/data/entity/bo/NotifyBO.java | 2 +-
.../pnoker/common/data/entity/bo/RuleBO.java | 2 +-
.../data/entity/builder/MessageBuilder.java | 2 +-
.../data/entity/builder/NotifyBuilder.java | 2 +-
.../entity/builder/PointValueBuilder.java | 2 +-
.../data/entity/builder/RuleBuilder.java | 2 +-
.../data/entity/model/DeviceEventDO.java | 2 +-
.../common/data/entity/model/DeviceRunDO.java | 2 +-
.../data/entity/model/DeviceRunHistoryDO.java | 2 +-
.../entity/model/DeviceStatusHistoryDO.java | 2 +-
.../data/entity/model/DriverEventDO.java | 2 +-
.../common/data/entity/model/DriverRunDO.java | 2 +-
.../data/entity/model/DriverRunHistoryDO.java | 2 +-
.../entity/model/DriverStatusHistoryDO.java | 2 +-
.../common/data/entity/model/MessageDO.java | 2 +-
.../common/data/entity/model/NotifyDO.java | 2 +-
.../data/entity/model/PointValueDO.java | 2 +-
.../common/data/entity/model/RuleDO.java | 2 +-
.../data/entity/query/DeviceEventQuery.java | 2 +-
.../common/data/entity/query/DeviceQuery.java | 2 +-
.../data/entity/query/DriverEventQuery.java | 2 +-
.../common/data/entity/query/DriverQuery.java | 2 +-
.../data/entity/query/MessageQuery.java | 2 +-
.../common/data/entity/query/NotifyQuery.java | 2 +-
.../common/data/entity/query/RuleQuery.java | 2 +-
.../common/data/entity/vo/MessageVO.java | 2 +-
.../common/data/entity/vo/NotifyVO.java | 2 +-
.../data/entity/vo/PointValueReadVO.java | 2 +-
.../common/data/entity/vo/PointValueVO.java | 2 +-
.../data/entity/vo/PointValueWriteVO.java | 2 +-
.../pnoker/common/data/entity/vo/RuleVO.java | 2 +-
.../data/generator/MybatisGenerator.java | 7 +-
.../common/data/job/HourlyJobForData.java | 2 +-
.../pnoker/common/data/job/PointValueJob.java | 2 +-
.../common/data/mapper/DeviceEventMapper.java | 2 +-
.../data/mapper/DeviceRunHistoryMapper.java | 2 +-
.../common/data/mapper/DeviceRunMapper.java | 2 +-
.../mapper/DeviceStatusHistoryMapper.java | 2 +-
.../common/data/mapper/DriverEventMapper.java | 2 +-
.../data/mapper/DriverRunHistoryMapper.java | 2 +-
.../common/data/mapper/DriverRunMapper.java | 2 +-
.../mapper/DriverStatusHistoryMapper.java | 2 +-
.../common/data/mapper/MessageMapper.java | 2 +-
.../common/data/mapper/NotifyMapper.java | 2 +-
.../common/data/mapper/PointValueMapper.java | 2 +-
.../pnoker/common/data/mapper/RuleMapper.java | 2 +-
.../data/rabbit/DeviceEventReceiver.java | 2 +-
.../data/rabbit/DriverEventReceiver.java | 2 +-
.../data/rabbit/PointValueReceiver.java | 2 +-
.../common/data/service/MessageService.java | 2 +-
.../common/data/service/NotifyService.java | 2 +-
.../common/data/service/RuleService.java | 2 +-
.../data/service/impl/MessageServiceImpl.java | 2 +-
.../data/service/impl/NotifyServiceImpl.java | 2 +-
.../data/service/impl/RuleServiceImpl.java | 2 +-
.../pnoker/common/init/DataInitRunner.java | 2 +-
.../mapping/DeviceStatusHistoryMapper.xml | 3 +-
.../mapping/DriverStatusHistoryMapper.xml | 3 +-
dc3-common/dc3-common-driver/pom.xml | 4 +-
.../config/ActiveDriverProfileConfig.java | 2 +-
.../config/DriverEnvironmentConfig.java | 2 +-
.../common/config/DriverTopicConfig.java | 2 +-
.../common/driver/entity/bean/PointValue.java | 2 +-
.../common/driver/entity/bean/RValue.java | 2 +-
.../common/driver/entity/bean/WValue.java | 2 +-
.../common/driver/entity/bo/AttributeBO.java | 2 +-
.../common/driver/entity/bo/DeviceBO.java | 2 +-
.../common/driver/entity/bo/DriverBO.java | 2 +-
.../common/driver/entity/bo/PointBO.java | 2 +-
.../common/driver/entity/bo/RegisterBO.java | 2 +-
.../driver/entity/builder/DeviceBuilder.java | 2 +-
.../driver/entity/builder/DriverBuilder.java | 2 +-
.../builder/GrpcDriverAttributeBuilder.java | 2 +-
.../GrpcDriverAttributeConfigBuilder.java | 2 +-
.../builder/GrpcPointAttributeBuilder.java | 2 +-
.../GrpcPointAttributeConfigBuilder.java | 2 +-
.../driver/entity/builder/PointBuilder.java | 2 +-
.../entity/dto/DriverAttributeConfigDTO.java | 2 +-
.../driver/entity/dto/DriverAttributeDTO.java | 2 +-
.../entity/dto/PointAttributeConfigDTO.java | 2 +-
.../driver/entity/dto/PointAttributeDTO.java | 2 +-
.../entity/property/DriverProperties.java | 6 +-
.../event/metadata/MetadataEventListener.java | 2 +-
.../metadata/MetadataEventPublisher.java | 2 +-
.../driver/job/DriverCustomScheduleJob.java | 2 +-
.../driver/job/DriverReadScheduleJob.java | 2 +-
.../driver/job/DriverStatusScheduleJob.java | 2 +-
.../driver/metadata/DeviceMetadata.java | 2 +-
.../driver/metadata/DriverMetadata.java | 2 +-
.../common/driver/metadata/PointMetadata.java | 2 +-
.../rabbit/DeviceCommandReceiver.java | 2 +-
.../rabbit/DriverCommandReceiver.java | 2 +-
.../receiver/rabbit/MetadataReceiver.java | 2 +-
.../driver/service/DriverCustomService.java | 2 +-
.../driver/service/DriverReadService.java | 2 +-
.../driver/service/DriverRegisterService.java | 2 +-
.../driver/service/DriverScheduleService.java | 2 +-
.../driver/service/DriverSenderService.java | 2 +-
.../driver/service/DriverWriteService.java | 2 +-
.../service/impl/DriverReadServiceImpl.java | 2 +-
.../impl/DriverRegisterServiceImpl.java | 2 +-
.../impl/DriverScheduleServiceImpl.java | 2 +-
.../service/impl/DriverSenderServiceImpl.java | 2 +-
.../service/impl/DriverWriteServiceImpl.java | 2 +-
.../pnoker/common/init/DriverInitRunner.java | 2 +-
.../github/pnoker/common/utils/CodecUtil.java | 2 +-
dc3-common/dc3-common-exception/pom.xml | 4 +-
.../constant/common/ExceptionConstant.java | 2 +-
.../pnoker/common/exception/AddException.java | 2 +-
.../common/exception/AssociatedException.java | 2 +-
.../common/exception/ConfigException.java | 2 +-
.../common/exception/ConnectorException.java | 2 +-
.../common/exception/CronException.java | 2 +-
.../common/exception/DeleteException.java | 2 +-
.../common/exception/DuplicateException.java | 2 +-
.../common/exception/EmptyException.java | 2 +-
.../common/exception/ImportException.java | 2 +-
.../common/exception/JsonException.java | 2 +-
.../common/exception/NotFoundException.java | 2 +-
.../common/exception/OutRangeException.java | 2 +-
.../common/exception/ReadPointException.java | 2 +-
.../common/exception/RegisterException.java | 2 +-
.../common/exception/RepositoryException.java | 2 +-
.../common/exception/RequestException.java | 2 +-
.../common/exception/SecurityException.java | 2 +-
.../common/exception/ServiceException.java | 2 +-
.../common/exception/TypeException.java | 2 +-
.../exception/UnAuthorizedException.java | 2 +-
.../common/exception/UnSupportException.java | 2 +-
.../common/exception/UpdateException.java | 2 +-
.../common/exception/WritePointException.java | 2 +-
.../pnoker/common/utils/ExceptionUtil.java | 2 +-
dc3-common/dc3-common-gateway/pom.xml | 4 +-
.../config/ActiveGatewayProfileConfig.java | 2 +-
.../filter/AuthenticGatewayFilterFactory.java | 2 +-
.../common/gateway/service/FilterService.java | 2 +-
.../service/impl/FilterServiceImpl.java | 2 +-
.../pnoker/common/init/GatewayInitRunner.java | 2 +-
dc3-common/dc3-common-job/READEME.md | 1 -
dc3-common/dc3-common-job/pom.xml | 91 ------------
.../common/config/ActiveJobProfileConfig.java | 43 ------
.../pnoker/common/config/JobConfig.java | 56 --------
.../pnoker/common/init/XxlJobInitRunner.java | 44 ------
.../job/entity/property/JobProperties.java | 74 ----------
.../main/resources/META-INF/spring.factories | 20 ---
...ot.autoconfigure.AutoConfiguration.imports | 18 ---
.../src/main/resources/application-job.yml | 28 ----
dc3-common/dc3-common-log/pom.xml | 4 +-
.../github/pnoker/common/annotation/Logs.java | 2 +-
.../pnoker/common/annotation/LogsAspect.java | 2 +-
.../pnoker/common/annotation/LogsType.java | 2 +-
dc3-common/dc3-common-manager/pom.xml | 4 +-
.../config/ActiveManagerProfileConfig.java | 2 +-
.../pnoker/common/init/ManagerInitRunner.java | 2 +-
.../biz/DictionaryForManagerService.java | 2 +-
.../manager/biz/DriverRegisterService.java | 2 +-
.../manager/biz/ImportDeviceService.java | 2 +-
.../biz/ScheduleForManagerService.java | 2 +-
.../impl/DictionaryForManagerServiceImpl.java | 2 +-
.../biz/impl/DriverRegisterServiceImpl.java | 2 +-
.../biz/impl/ImportDeviceServiceImpl.java | 2 +-
.../impl/ScheduleForManagerServiceImpl.java | 2 +-
.../manager/controller/DeviceController.java | 2 +-
.../DictionaryForManagerController.java | 2 +-
.../DriverAttributeConfigController.java | 2 +-
.../controller/DriverAttributeController.java | 2 +-
.../manager/controller/DriverController.java | 2 +-
.../manager/controller/GroupController.java | 2 +-
.../manager/controller/LabelController.java | 2 +-
.../PointAttributeConfigController.java | 2 +-
.../controller/PointAttributeController.java | 2 +-
.../manager/controller/PointController.java | 2 +-
.../manager/controller/ProfileController.java | 2 +-
.../common/manager/dal/DeviceManager.java | 2 +-
.../dal/DriverAttributeConfigManager.java | 2 +-
.../manager/dal/DriverAttributeManager.java | 2 +-
.../common/manager/dal/DriverManager.java | 2 +-
.../dal/PointAttributeConfigManager.java | 2 +-
.../manager/dal/PointAttributeManager.java | 2 +-
.../dal/PointDataVolumeHistoryManager.java | 2 +-
.../dal/PointDataVolumeRunManager.java | 2 +-
.../common/manager/dal/PointManager.java | 2 +-
.../manager/dal/ProfileBindManager.java | 2 +-
.../common/manager/dal/ProfileManager.java | 2 +-
.../manager/dal/impl/DeviceManagerImpl.java | 2 +-
.../DriverAttributeConfigManagerImpl.java | 2 +-
.../dal/impl/DriverAttributeManagerImpl.java | 2 +-
.../manager/dal/impl/DriverManagerImpl.java | 2 +-
.../impl/PointAttributeConfigManagerImpl.java | 2 +-
.../dal/impl/PointAttributeManagerImpl.java | 2 +-
.../PointDataVolumeHistoryManagerImpl.java | 2 +-
.../impl/PointDataVolumeRunManagerImpl.java | 2 +-
.../manager/dal/impl/PointManagerImpl.java | 2 +-
.../dal/impl/ProfileBindManagerImpl.java | 2 +-
.../manager/dal/impl/ProfileManagerImpl.java | 2 +-
.../common/manager/entity/bo/DeviceBO.java | 2 +-
.../manager/entity/bo/DriverAttributeBO.java | 2 +-
.../entity/bo/DriverAttributeConfigBO.java | 2 +-
.../common/manager/entity/bo/DriverBO.java | 2 +-
.../manager/entity/bo/PointAttributeBO.java | 2 +-
.../entity/bo/PointAttributeConfigBO.java | 2 +-
.../common/manager/entity/bo/PointBO.java | 2 +-
.../common/manager/entity/bo/ProfileBO.java | 2 +-
.../manager/entity/bo/ProfileBindBO.java | 2 +-
.../manager/entity/builder/DeviceBuilder.java | 2 +-
.../builder/DictionaryForManagerBuilder.java | 2 +-
.../builder/DriverAttributeBuilder.java | 2 +-
.../builder/DriverAttributeConfigBuilder.java | 2 +-
.../manager/entity/builder/DriverBuilder.java | 2 +-
.../entity/builder/PointAttributeBuilder.java | 2 +-
.../builder/PointAttributeConfigBuilder.java | 2 +-
.../manager/entity/builder/PointBuilder.java | 2 +-
.../entity/builder/ProfileBindBuilder.java | 2 +-
.../entity/builder/ProfileBuilder.java | 2 +-
.../common/manager/entity/model/DeviceDO.java | 2 +-
.../entity/model/DriverAttributeConfigDO.java | 2 +-
.../entity/model/DriverAttributeDO.java | 2 +-
.../common/manager/entity/model/DriverDO.java | 2 +-
.../entity/model/PointAttributeConfigDO.java | 2 +-
.../entity/model/PointAttributeDO.java | 2 +-
.../common/manager/entity/model/PointDO.java | 2 +-
.../model/PointDataVolumeHistoryDO.java | 2 +-
.../entity/model/PointDataVolumeRunDO.java | 2 +-
.../manager/entity/model/ProfileBindDO.java | 2 +-
.../manager/entity/model/ProfileDO.java | 2 +-
.../manager/entity/query/DeviceQuery.java | 2 +-
.../manager/entity/query/DictionaryQuery.java | 2 +-
.../query/DriverAttributeConfigQuery.java | 2 +-
.../entity/query/DriverAttributeQuery.java | 2 +-
.../manager/entity/query/DriverQuery.java | 2 +-
.../query/PointAttributeConfigQuery.java | 2 +-
.../entity/query/PointAttributeQuery.java | 2 +-
.../manager/entity/query/PointQuery.java | 2 +-
.../entity/query/ProfileBindQuery.java | 2 +-
.../manager/entity/query/ProfileQuery.java | 2 +-
.../manager/entity/query/TopicQuery.java | 2 +-
.../common/manager/entity/vo/DeviceVO.java | 2 +-
.../entity/vo/DriverAttributeConfigVO.java | 2 +-
.../manager/entity/vo/DriverAttributeVO.java | 2 +-
.../common/manager/entity/vo/DriverVO.java | 2 +-
.../entity/vo/PointAttributeConfigVO.java | 2 +-
.../manager/entity/vo/PointAttributeVO.java | 2 +-
.../common/manager/entity/vo/PointVO.java | 2 +-
.../manager/entity/vo/ProfileBindVO.java | 2 +-
.../common/manager/entity/vo/ProfileVO.java | 2 +-
.../event/metadata/MetadataEventListener.java | 2 +-
.../metadata/MetadataEventPublisher.java | 2 +-
.../manager/generator/MybatisGenerator.java | 2 +-
.../grpc/builder/GrpcDeviceBuilder.java | 2 +-
.../builder/GrpcDriverAttributeBuilder.java | 2 +-
.../GrpcDriverAttributeConfigBuilder.java | 2 +-
.../grpc/builder/GrpcDriverBuilder.java | 2 +-
.../builder/GrpcPointAttributeBuilder.java | 2 +-
.../GrpcPointAttributeConfigBuilder.java | 2 +-
.../grpc/builder/GrpcPointBuilder.java | 2 +-
.../server/driver/DriverDeviceServer.java | 2 +-
.../server/driver/DriverDriverServer.java | 2 +-
.../grpc/server/driver/DriverPointServer.java | 2 +-
.../server/manager/ManagerDeviceServer.java | 2 +-
.../server/manager/ManagerDriverServer.java | 2 +-
.../server/manager/ManagerPointServer.java | 2 +-
.../manager/job/HourlyJobForManager.java | 2 +-
.../common/manager/mapper/DeviceMapper.java | 2 +-
.../mapper/DriverAttributeConfigMapper.java | 2 +-
.../manager/mapper/DriverAttributeMapper.java | 2 +-
.../common/manager/mapper/DriverMapper.java | 2 +-
.../mapper/PointAttributeConfigMapper.java | 2 +-
.../manager/mapper/PointAttributeMapper.java | 2 +-
.../mapper/PointDataVolumeHistoryMapper.java | 2 +-
.../mapper/PointDataVolumeRunMapper.java | 2 +-
.../common/manager/mapper/PointMapper.java | 2 +-
.../manager/mapper/ProfileBindMapper.java | 2 +-
.../common/manager/mapper/ProfileMapper.java | 2 +-
.../common/manager/service/DeviceService.java | 2 +-
.../service/DriverAttributeConfigService.java | 2 +-
.../service/DriverAttributeService.java | 2 +-
.../common/manager/service/DriverService.java | 2 +-
.../service/PointAttributeConfigService.java | 2 +-
.../service/PointAttributeService.java | 2 +-
.../common/manager/service/PointService.java | 2 +-
.../manager/service/ProfileBindService.java | 2 +-
.../manager/service/ProfileService.java | 2 +-
.../service/impl/DeviceServiceImpl.java | 2 +-
.../DriverAttributeConfigServiceImpl.java | 2 +-
.../impl/DriverAttributeServiceImpl.java | 2 +-
.../service/impl/DriverServiceImpl.java | 2 +-
.../impl/PointAttributeConfigServiceImpl.java | 2 +-
.../impl/PointAttributeServiceImpl.java | 2 +-
.../service/impl/PointServiceImpl.java | 2 +-
.../service/impl/ProfileBindServiceImpl.java | 2 +-
.../service/impl/ProfileServiceImpl.java | 2 +-
dc3-common/dc3-common-model/pom.xml | 4 +-
.../pnoker/common/entity/base/BaseBO.java | 2 +-
.../pnoker/common/entity/base/BaseDTO.java | 2 +-
.../pnoker/common/entity/base/BaseVO.java | 2 +-
.../common/entity/builder/BaseBuilder.java | 2 +-
.../common/entity/dto/CmdParameterDTO.java | 2 +-
.../common/entity/dto/DeviceCommandDTO.java | 6 +-
.../common/entity/dto/DeviceEventDTO.java | 4 +-
.../common/entity/dto/DriverCommandDTO.java | 2 +-
.../common/entity/dto/DriverEventDTO.java | 4 +-
.../common/entity/dto/MetadataEventDTO.java | 2 +-
.../common/entity/event/MetadataEvent.java | 2 +-
.../pnoker/common/entity/ext/ApiExt.java | 2 +-
.../pnoker/common/entity/ext/BaseExt.java | 2 +-
.../pnoker/common/entity/ext/DeviceExt.java | 2 +-
.../common/entity/ext/DriverAttributeExt.java | 2 +-
.../pnoker/common/entity/ext/DriverExt.java | 2 +-
.../pnoker/common/entity/ext/JsonExt.java | 2 +-
.../pnoker/common/entity/ext/MenuExt.java | 2 +-
.../pnoker/common/entity/ext/MessageExt.java | 2 +-
.../pnoker/common/entity/ext/NotifyExt.java | 2 +-
.../common/entity/ext/PointAttributeExt.java | 2 +-
.../pnoker/common/entity/ext/PointExt.java | 2 +-
.../pnoker/common/entity/ext/ProfileExt.java | 2 +-
.../pnoker/common/entity/ext/ResourceExt.java | 2 +-
.../pnoker/common/entity/ext/RoleExt.java | 2 +-
.../pnoker/common/entity/ext/RuleExt.java | 2 +-
.../pnoker/common/entity/ext/TenantExt.java | 2 +-
.../common/entity/ext/UserIdentityExt.java | 2 +-
.../common/entity/ext/UserSocialExt.java | 2 +-
.../io/github/pnoker/common/valid/Add.java | 2 +-
.../io/github/pnoker/common/valid/Auth.java | 2 +-
.../io/github/pnoker/common/valid/Check.java | 2 +-
.../io/github/pnoker/common/valid/Parent.java | 2 +-
.../io/github/pnoker/common/valid/Read.java | 2 +-
.../io/github/pnoker/common/valid/Select.java | 2 +-
.../io/github/pnoker/common/valid/Update.java | 2 +-
.../io/github/pnoker/common/valid/Upload.java | 2 +-
.../io/github/pnoker/common/valid/Write.java | 2 +-
dc3-common/dc3-common-mqtt/pom.xml | 9 +-
.../config/ActiveMqttProfileConfig.java | 2 +-
.../pnoker/common/config/MqttConfig.java | 2 +-
.../common/config/MqttEnvironmentConfig.java | 2 +-
.../pnoker/common/init/MqttInitRunner.java | 2 +-
.../common/mqtt/entity/MessageHeader.java | 2 +-
.../common/mqtt/entity/MqttMessage.java | 2 +-
.../mqtt/entity/property/MqttProperties.java | 2 +-
.../mqtt/handler/MqttReceiveHandler.java | 2 +-
.../mqtt/service/MqttReceiveService.java | 2 +-
.../mqtt/service/MqttScheduleService.java | 2 +-
.../service/impl/MqttScheduleServiceImpl.java | 2 +-
.../mqtt/service/job/MqttScheduleJob.java | 2 +-
.../github/pnoker/common/utils/MqttUtil.java | 2 +-
dc3-common/dc3-common-postgres/pom.xml | 4 +-
.../config/ActivePostgresProfileConfig.java | 2 +-
.../common/config/MybatisPlusConfig.java | 2 +-
.../pnoker/common/utils/MybatisUtil.java | 2 +-
dc3-common/dc3-common-public/pom.xml | 4 +-
.../common/base/service/BaseService.java | 2 +-
.../pnoker/common/config/OkHttpConfig.java | 2 +-
.../io/github/pnoker/common/entity/R.java | 2 +-
.../pnoker/common/entity/auth/Keys.java | 2 +-
.../pnoker/common/entity/common/Pages.java | 2 +-
.../common/entity/common/RequestHeader.java | 2 +-
.../pnoker/common/entity/common/TreeNode.java | 2 +-
.../common/optional/CollectionOptional.java | 2 +-
.../common/optional/EnableOptional.java | 2 +-
.../common/optional/IntegerOptional.java | 2 +-
.../pnoker/common/optional/JsonOptional.java | 2 +-
.../pnoker/common/optional/LongOptional.java | 2 +-
.../common/optional/StringOptional.java | 2 +-
.../pnoker/common/utils/ArithmeticUtil.java | 2 +-
.../github/pnoker/common/utils/CmdUtil.java | 2 +-
.../github/pnoker/common/utils/CodeUtil.java | 2 +-
.../pnoker/common/utils/DecodeUtil.java | 2 +-
.../pnoker/common/utils/EnvironmentUtil.java | 2 +-
.../github/pnoker/common/utils/FieldUtil.java | 2 +-
.../github/pnoker/common/utils/FileUtil.java | 2 +-
.../github/pnoker/common/utils/HostUtil.java | 2 +-
.../github/pnoker/common/utils/JsonUtil.java | 2 +-
.../pnoker/common/utils/KeyStoreUtil.java | 2 +-
.../github/pnoker/common/utils/KeyUtil.java | 2 +-
.../common/utils/LocalDateTimeUtil.java | 2 +-
.../pnoker/common/utils/MapStructUtil.java | 2 +-
.../github/pnoker/common/utils/PageUtil.java | 2 +-
.../github/pnoker/common/utils/PoiUtil.java | 2 +-
.../github/pnoker/common/utils/RegexUtil.java | 2 +-
.../github/pnoker/common/utils/TimeUtil.java | 2 +-
.../github/pnoker/common/utils/TreeUtil.java | 2 +-
.../github/pnoker/common/utils/X509Util.java | 2 +-
.../pnoker/common/utils/ZoneDateTimeUtil.java | 2 +-
.../src/main/resources/banner.txt | 2 +-
dc3-common/dc3-common-quartz/pom.xml | 4 +-
.../config/ActiveQuartzProfileConfig.java | 2 +-
.../pnoker/common/quartz/QuartzService.java | 2 +-
dc3-common/dc3-common-rabbitmq/pom.xml | 4 +-
.../config/ActiveRabbitProfileConfig.java | 2 +-
.../pnoker/common/config/ExchangeConfig.java | 2 +-
.../pnoker/common/config/RabbitConfig.java | 2 +-
.../config/RabbitmqEnvironmentConfig.java | 2 +-
dc3-common/dc3-common-redis/pom.xml | 4 +-
.../config/ActiveRedisProfileConfig.java | 2 +-
.../common/config/RedisCacheConfig.java | 2 +-
.../common/config/RedisTemplateConfig.java | 2 +-
.../pnoker/common/init/RedisInitRunner.java | 2 +-
.../builder/RedisPointValueBuilder.java | 2 +-
.../redis/entity/model/RedisPointValueDO.java | 2 +-
.../redis/service/RedisRepositoryService.java | 2 +-
.../common/redis/service/RedisService.java | 2 +-
dc3-common/dc3-common-register/README.md | 1 -
dc3-common/dc3-common-register/pom.xml | 131 ------------------
.../config/ActiveRegisterProfileConfig.java | 43 ------
.../main/resources/META-INF/spring.factories | 17 ---
...ot.autoconfigure.AutoConfiguration.imports | 16 ---
.../main/resources/application-register.yml | 38 -----
.../src/main/resources/nacos-logback.xml | 124 -----------------
dc3-common/dc3-common-repository/pom.xml | 4 +-
.../config/ActiveRepositoryProfileConfig.java | 2 +-
.../pnoker/common/entity/bo/PointValueBO.java | 2 +-
.../common/entity/query/PointValueQuery.java | 2 +-
.../common/repository/RepositoryService.java | 2 +-
.../strategy/RepositoryStrategyFactory.java | 2 +-
dc3-common/dc3-common-thread/pom.xml | 4 +-
.../config/ActiveThreadProfileConfig.java | 2 +-
.../common/config/ThreadPoolConfig.java | 4 +-
.../pnoker/common/init/ThreadInitRunner.java | 2 +-
.../entity/property/ThreadProperties.java | 2 +-
dc3-common/dc3-common-transfer/pom.xml | 4 +-
.../github/pnoker/common/TransformAspect.java | 2 +-
.../pnoker/common/annotation/Transform.java | 2 +-
.../pnoker/common/base/enums/BaseEnum.java | 2 +-
.../pnoker/common/base/enums/EnumBean.java | 2 +-
.../pnoker/common/base/enums/EnumPool.java | 2 +-
.../common/component/TransformClass.java | 2 +-
.../common/component/TransformField.java | 2 +-
.../pnoker/common/component/UnWrapper.java | 2 +-
.../common/transformer/SimpleTransformer.java | 2 +-
.../common/transformer/Transformer.java | 2 +-
.../pnoker/common/util/SpringContextUtil.java | 2 +-
.../pnoker/common/util/TransformUtil.java | 2 +-
dc3-common/dc3-common-web/pom.xml | 4 +-
.../pnoker/common/base/BaseController.java | 2 +-
.../common/config/ActiveWebProfileConfig.java | 2 +-
.../pnoker/common/config/ExceptionConfig.java | 2 +-
.../pnoker/common/config/WebFilterConfig.java | 2 +-
.../pnoker/common/config/WebFluxConfig.java | 2 +-
.../pnoker/common/utils/RequestUtil.java | 2 +-
.../pnoker/common/utils/ResponseUtil.java | 2 +-
.../pnoker/common/utils/UserHeaderUtil.java | 2 +-
dc3-common/pom.xml | 68 ++++-----
.../dc3-driver-listening-virtual/pom.xml | 2 +-
.../ListeningVirtualDriverApplication.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
.../service/netty/NettyServerHandler.java | 2 +-
.../service/netty/tcp/NettyTcpServer.java | 2 +-
.../netty/tcp/NettyTcpServerHandler.java | 2 +-
.../service/netty/udp/NettyUdpServer.java | 2 +-
.../netty/udp/NettyUdpServerHandler.java | 2 +-
dc3-driver/dc3-driver-modbus-tcp/pom.xml | 2 +-
.../serotonin/modbus4j/BasicProcessImage.java | 2 +-
.../com/serotonin/modbus4j/BatchRead.java | 2 +-
.../com/serotonin/modbus4j/BatchResults.java | 2 +-
.../serotonin/modbus4j/ExceptionResult.java | 2 +-
.../java/com/serotonin/modbus4j/Modbus.java | 2 +-
.../com/serotonin/modbus4j/ModbusFactory.java | 2 +-
.../com/serotonin/modbus4j/ModbusMaster.java | 2 +-
.../serotonin/modbus4j/ModbusSlaveSet.java | 2 +-
.../serotonin/modbus4j/NodeScanListener.java | 2 +-
.../com/serotonin/modbus4j/ProcessImage.java | 2 +-
.../modbus4j/ProcessImageListener.java | 2 +-
.../modbus4j/base/BaseMessageParser.java | 2 +-
.../modbus4j/base/BaseRequestHandler.java | 2 +-
.../modbus4j/base/KeyedModbusLocator.java | 2 +-
.../serotonin/modbus4j/base/ModbusUtils.java | 2 +-
.../modbus4j/base/RangeAndOffset.java | 2 +-
.../modbus4j/base/ReadFunctionGroup.java | 2 +-
.../modbus4j/base/SlaveAndRange.java | 2 +-
.../serotonin/modbus4j/base/SlaveProfile.java | 2 +-
.../com/serotonin/modbus4j/code/DataType.java | 2 +-
.../modbus4j/code/ExceptionCode.java | 2 +-
.../serotonin/modbus4j/code/FunctionCode.java | 2 +-
.../modbus4j/code/RegisterRange.java | 2 +-
.../exception/ErrorResponseException.java | 2 +-
.../IllegalDataAddressException.java | 2 +-
.../exception/IllegalDataTypeException.java | 2 +-
.../exception/IllegalFunctionException.java | 2 +-
.../exception/IllegalSlaveIdException.java | 2 +-
.../InvalidDataConversionException.java | 2 +-
.../modbus4j/exception/ModbusIdException.java | 2 +-
.../exception/ModbusInitException.java | 2 +-
.../exception/ModbusTransportException.java | 2 +-
.../com/serotonin/modbus4j/ip/IpMessage.java | 2 +-
.../modbus4j/ip/IpMessageResponse.java | 2 +-
.../serotonin/modbus4j/ip/IpParameters.java | 2 +-
.../modbus4j/ip/encap/EncapMessage.java | 2 +-
.../modbus4j/ip/encap/EncapMessageParser.java | 2 +-
.../ip/encap/EncapMessageRequest.java | 2 +-
.../ip/encap/EncapMessageResponse.java | 2 +-
.../ip/encap/EncapRequestHandler.java | 2 +-
.../ip/encap/EncapWaitingRoomKeyFactory.java | 2 +-
.../modbus4j/ip/listener/TcpListener.java | 2 +-
.../serotonin/modbus4j/ip/tcp/TcpMaster.java | 2 +-
.../serotonin/modbus4j/ip/tcp/TcpSlave.java | 2 +-
.../serotonin/modbus4j/ip/udp/UdpMaster.java | 2 +-
.../serotonin/modbus4j/ip/udp/UdpSlave.java | 2 +-
.../serotonin/modbus4j/ip/xa/XaMessage.java | 2 +-
.../modbus4j/ip/xa/XaMessageParser.java | 2 +-
.../modbus4j/ip/xa/XaMessageRequest.java | 2 +-
.../modbus4j/ip/xa/XaMessageResponse.java | 2 +-
.../modbus4j/ip/xa/XaRequestHandler.java | 2 +-
.../ip/xa/XaWaitingRoomKeyFactory.java | 2 +-
.../modbus4j/locator/BaseLocator.java | 2 +-
.../modbus4j/locator/BinaryLocator.java | 2 +-
.../modbus4j/locator/NumericLocator.java | 2 +-
.../modbus4j/locator/StringLocator.java | 2 +-
.../modbus4j/msg/ExceptionRequest.java | 2 +-
.../modbus4j/msg/ExceptionResponse.java | 2 +-
.../serotonin/modbus4j/msg/ModbusMessage.java | 2 +-
.../serotonin/modbus4j/msg/ModbusRequest.java | 2 +-
.../modbus4j/msg/ModbusResponse.java | 2 +-
.../modbus4j/msg/ReadBinaryRequest.java | 2 +-
.../modbus4j/msg/ReadCoilsRequest.java | 2 +-
.../modbus4j/msg/ReadCoilsResponse.java | 2 +-
.../msg/ReadDiscreteInputsRequest.java | 2 +-
.../msg/ReadDiscreteInputsResponse.java | 2 +-
.../msg/ReadExceptionStatusRequest.java | 2 +-
.../msg/ReadExceptionStatusResponse.java | 2 +-
.../msg/ReadHoldingRegistersRequest.java | 2 +-
.../msg/ReadHoldingRegistersResponse.java | 2 +-
.../msg/ReadInputRegistersRequest.java | 2 +-
.../msg/ReadInputRegistersResponse.java | 2 +-
.../modbus4j/msg/ReadNumericRequest.java | 2 +-
.../serotonin/modbus4j/msg/ReadResponse.java | 2 +-
.../modbus4j/msg/ReportSlaveIdRequest.java | 2 +-
.../modbus4j/msg/ReportSlaveIdResponse.java | 2 +-
.../modbus4j/msg/WriteCoilRequest.java | 2 +-
.../modbus4j/msg/WriteCoilResponse.java | 2 +-
.../modbus4j/msg/WriteCoilsRequest.java | 2 +-
.../modbus4j/msg/WriteCoilsResponse.java | 2 +-
.../msg/WriteMaskRegisterRequest.java | 2 +-
.../msg/WriteMaskRegisterResponse.java | 2 +-
.../modbus4j/msg/WriteRegisterRequest.java | 2 +-
.../modbus4j/msg/WriteRegisterResponse.java | 2 +-
.../modbus4j/msg/WriteRegistersRequest.java | 2 +-
.../modbus4j/msg/WriteRegistersResponse.java | 2 +-
.../modbus4j/serial/SerialMaster.java | 2 +-
.../modbus4j/serial/SerialMessage.java | 2 +-
.../modbus4j/serial/SerialPortWrapper.java | 2 +-
.../modbus4j/serial/SerialSlave.java | 2 +-
.../serial/SerialWaitingRoomKeyFactory.java | 2 +-
.../modbus4j/serial/ascii/AsciiMaster.java | 2 +-
.../modbus4j/serial/ascii/AsciiMessage.java | 2 +-
.../serial/ascii/AsciiMessageParser.java | 2 +-
.../serial/ascii/AsciiMessageRequest.java | 2 +-
.../serial/ascii/AsciiMessageResponse.java | 2 +-
.../serial/ascii/AsciiRequestHandler.java | 2 +-
.../modbus4j/serial/ascii/AsciiSlave.java | 2 +-
.../modbus4j/serial/rtu/RtuMaster.java | 2 +-
.../modbus4j/serial/rtu/RtuMessage.java | 2 +-
.../modbus4j/serial/rtu/RtuMessageParser.java | 2 +-
.../serial/rtu/RtuMessageRequest.java | 2 +-
.../serial/rtu/RtuMessageResponse.java | 2 +-
.../serial/rtu/RtuRequestHandler.java | 2 +-
.../modbus4j/serial/rtu/RtuSlave.java | 2 +-
.../sero/NotImplementedException.java | 2 +-
.../sero/ShouldNeverHappenException.java | 2 +-
.../sero/epoll/InputStreamEPollWrapper.java | 2 +-
.../epoll/Modbus4JInputStreamCallback.java | 2 +-
.../modbus4j/sero/io/LineHandler.java | 2 +-
.../modbus4j/sero/io/NullWriter.java | 2 +-
.../modbus4j/sero/io/StreamUtils.java | 2 +-
.../modbus4j/sero/log/BaseIOLog.java | 2 +-
.../serotonin/modbus4j/sero/log/IOLog.java | 2 +-
.../modbus4j/sero/log/RollingIOLog.java | 2 +-
.../modbus4j/sero/log/SimpleLog.java | 2 +-
.../modbus4j/sero/messaging/DataConsumer.java | 2 +-
.../DefaultMessagingExceptionHandler.java | 2 +-
.../sero/messaging/EpollStreamTransport.java | 2 +-
.../EpollStreamTransportCharSpaced.java | 2 +-
.../sero/messaging/IncomingMessage.java | 2 +-
.../messaging/IncomingRequestMessage.java | 2 +-
.../messaging/IncomingResponseMessage.java | 2 +-
.../sero/messaging/InputStreamListener.java | 2 +-
.../sero/messaging/MessageControl.java | 2 +-
.../sero/messaging/MessageParser.java | 2 +-
.../messaging/MessagingExceptionHandler.java | 2 +-
.../sero/messaging/OutgoingMessage.java | 2 +-
.../messaging/OutgoingRequestMessage.java | 2 +-
.../messaging/OutgoingResponseMessage.java | 2 +-
.../sero/messaging/RequestHandler.java | 2 +-
.../sero/messaging/StreamTransport.java | 2 +-
.../messaging/StreamTransportCharSpaced.java | 2 +-
.../sero/messaging/TestableTransport.java | 2 +-
.../sero/messaging/TimeoutException.java | 2 +-
.../modbus4j/sero/messaging/Transport.java | 2 +-
.../sero/messaging/WaitingRoomException.java | 2 +-
.../sero/messaging/WaitingRoomKey.java | 2 +-
.../sero/messaging/WaitingRoomKeyFactory.java | 2 +-
.../modbus4j/sero/timer/SystemTimeSource.java | 2 +-
.../modbus4j/sero/timer/TimeSource.java | 2 +-
.../modbus4j/sero/util/ArrayUtils.java | 2 +-
.../modbus4j/sero/util/ProgressiveTask.java | 2 +-
.../sero/util/ProgressiveTaskListener.java | 2 +-
.../modbus4j/sero/util/queue/ByteQueue.java | 2 +-
.../serotonin/modbus4j/value/ModbusValue.java | 2 +-
.../driver/ModbusTcpDriverApplication.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/dc3-driver-mqtt/pom.xml | 2 +-
.../pnoker/driver/MqttDriverApplication.java | 2 +-
.../service/impl/MqttReceiveServiceImpl.java | 2 +-
.../driver/service/MqttSendService.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/dc3-driver-opc-da/pom.xml | 2 +-
.../pnoker/driver/OpcDaApplication.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/dc3-driver-opc-ua/pom.xml | 2 +-
.../pnoker/driver/OpcUaApplication.java | 2 +-
.../github/pnoker/driver/key/KeyLoader.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/dc3-driver-plcs7/pom.xml | 2 +-
.../pnoker/driver/PlcS7DriverApplication.java | 2 +-
.../github/pnoker/driver/api/SiemensPLCS.java | 2 +-
.../driver/bean/PlcS7PointVariable.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/dc3-driver-virtual/pom.xml | 2 +-
.../driver/VirtualDriverApplication.java | 2 +-
.../service/impl/DriverCustomServiceImpl.java | 2 +-
dc3-driver/pom.xml | 2 +-
dc3-gateway/pom.xml | 4 +-
.../pnoker/gateway/GatewayApplication.java | 2 +-
dc3/docker-compose-aliyun.yml | 22 +--
dc3/docker-compose-dev-aliyun.yml | 22 +--
dc3/docker-compose-dev.yml | 22 +--
dc3/docker-compose.yml | 22 +--
pom.xml | 68 ++++-----
922 files changed, 1056 insertions(+), 1819 deletions(-)
delete mode 100644 dc3-common/dc3-common-job/READEME.md
delete mode 100644 dc3-common/dc3-common-job/pom.xml
delete mode 100644 dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/ActiveJobProfileConfig.java
delete mode 100644 dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/config/JobConfig.java
delete mode 100644 dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/init/XxlJobInitRunner.java
delete mode 100644 dc3-common/dc3-common-job/src/main/java/io/github/pnoker/common/job/entity/property/JobProperties.java
delete mode 100644 dc3-common/dc3-common-job/src/main/resources/META-INF/spring.factories
delete mode 100644 dc3-common/dc3-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
delete mode 100644 dc3-common/dc3-common-job/src/main/resources/application-job.yml
delete mode 100644 dc3-common/dc3-common-register/README.md
delete mode 100644 dc3-common/dc3-common-register/pom.xml
delete mode 100644 dc3-common/dc3-common-register/src/main/java/io/github/pnoker/common/config/ActiveRegisterProfileConfig.java
delete mode 100644 dc3-common/dc3-common-register/src/main/resources/META-INF/spring.factories
delete mode 100644 dc3-common/dc3-common-register/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
delete mode 100644 dc3-common/dc3-common-register/src/main/resources/application-register.yml
delete mode 100644 dc3-common/dc3-common-register/src/main/resources/nacos-logback.xml
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 9328c5256..f10c10c3a 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -31,7 +31,7 @@ jobs:
run: |
echo "profile=pro" >> $GITHUB_OUTPUT
echo "version=${GITHUB_REF#refs/tags/dc3.develop.}" >> $GITHUB_OUTPUT
- echo "service_version=2025.2.5" >> $GITHUB_OUTPUT
+ echo "service_version=2025.6.0" >> $GITHUB_OUTPUT
echo "service_name_gateway=dc3-gateway" >> $GITHUB_OUTPUT
echo "service_path_gateway=dc3-gateway" >> $GITHUB_OUTPUT
echo "service_name_center_auth=dc3-center-auth" >> $GITHUB_OUTPUT
diff --git a/dc3-api/dc3-api-auth/pom.xml b/dc3-api/dc3-api-auth/pom.xml
index a779792c6..194ac1e6d 100644
--- a/dc3-api/dc3-api-auth/pom.xml
+++ b/dc3-api/dc3-api-auth/pom.xml
@@ -21,12 +21,12 @@
该类是Spring Boot应用的入口类, 用于启动监听虚拟驱动应用。
* * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 3aaca5c08..484ec400d 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java index 8c0c65973..b1ea74aef 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/NettyServerHandler.java @@ -40,7 +40,7 @@ import java.util.Map; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java index e0ad11d3d..5318edaf0 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServer.java @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java index e47b35dbf..54e43e2eb 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/tcp/NettyTcpServerHandler.java @@ -44,7 +44,7 @@ import javax.annotation.PostConstruct; * lg:[4C 69 73 74 65 6E 69 6E 67 56 69 72 74 75 61 6C 44 65 76 69 63 65 62 44 C3 E7 5C 40 46 D5 C2 8F 5C 28 F6 00 00 00 00 00 00 00 0C 00 00 00 2D 01 31 33 31 2E 32 33 31 34 35 36 2C 30 32 31 2E 35 36 38 32 31 31] * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java index 15e9310f1..1053810d7 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServer.java @@ -31,7 +31,7 @@ import java.net.InetSocketAddress; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Component diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java index 7ef98a150..ef6039cb2 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/io/github/pnoker/driver/service/netty/udp/NettyUdpServerHandler.java @@ -44,7 +44,7 @@ import javax.annotation.PostConstruct; * lg:[4C 69 73 74 65 6E 69 6E 67 56 69 72 74 75 61 6C 44 65 76 69 63 65 62 44 C3 E7 5C 40 46 D5 C2 8F 5C 28 F6 00 00 00 00 00 00 00 0C 00 00 00 2D 01 31 33 31 2E 32 33 31 34 35 36 2C 30 32 31 2E 35 36 38 32 31 31] * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-modbus-tcp/pom.xml b/dc3-driver/dc3-driver-modbus-tcp/pom.xml index d594f9925..185ba13dd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/pom.xml +++ b/dc3-driver/dc3-driver-modbus-tcp/pom.xml @@ -21,7 +21,7 @@BasicProcessImage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BasicProcessImage implements ProcessImage { private final int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java index 8a0ead037..fc8dd58dc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/BatchRead.java @@ -37,7 +37,7 @@ import java.util.*; * * @paramBatchResults class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BatchResultsExceptionResult class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionResult { private final byte exceptionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java index ccfad7c1a..144b4f632 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/Modbus.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.MessagingExceptionHandler; * TODO: - handle echoing in RS485 * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class Modbus { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java index 5395a4153..aefc1eb19 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusFactory.java @@ -36,7 +36,7 @@ import com.serotonin.modbus4j.serial.rtu.RtuSlave; *ModbusFactory class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusFactory { // diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java index a86ab6238..5344b9292 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ModbusMaster.java @@ -45,7 +45,7 @@ import java.util.Map; *Abstract ModbusMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusMaster extends Modbus { private final MapAbstract ModbusSlaveSet class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusSlaveSet extends Modbus { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java index 5e5cd8cec..8c23ed5f0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/NodeScanListener.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.sero.util.ProgressiveTaskListener; *NodeScanListener interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface NodeScanListener extends ProgressiveTaskListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java index 6c778b70e..3e686f249 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImage.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.exception.IllegalDataAddressException; * Used by slave implementors. Provides an interface by which slaves can easily manage data. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProcessImage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java index ec0b8d4e8..6a223c413 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ProcessImageListener.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j; *ProcessImageListener interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProcessImageListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java index 8469ea2df..0a79e9ea2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract BaseMessageParser class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseMessageParser implements MessageParser { protected final boolean master; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java index 140e2e1ca..449316654 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/BaseRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.RequestHandler; *Abstract BaseRequestHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseRequestHandler implements RequestHandler { protected ModbusSlaveSet slave; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java index 36acface6..20621b455 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/KeyedModbusLocator.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.locator.BaseLocator; *KeyedModbusLocator class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class KeyedModbusLocatorModbusUtils class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusUtils { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java index adbf8fc86..f1f0848e3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/RangeAndOffset.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.code.RegisterRange; *RangeAndOffset class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RangeAndOffset { private int range; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java index 7e8c3ed4b..c22853629 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/ReadFunctionGroup.java @@ -24,7 +24,7 @@ import java.util.List; *ReadFunctionGroup class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadFunctionGroupSlaveAndRange class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SlaveAndRange { private final int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java index 0c57be9ed..1b15fce8f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/base/SlaveProfile.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.base; * featured, and then we note function failures so that we know how requests should subsequently be sent. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SlaveProfile { private boolean writeMaskRegister = true; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java index 0e7dd65e1..1c61a292a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/DataType.java @@ -21,7 +21,7 @@ import java.math.BigInteger; *DataType class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class DataType { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java index 8c1e9f3ec..d3c0d477b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/ExceptionCode.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *ExceptionCode class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionCode { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java index 22a7776ea..c9d77f3d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/FunctionCode.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *FunctionCode class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class FunctionCode { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java index bb4438982..97d3b5f6d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/code/RegisterRange.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.code; *RegisterRange class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RegisterRange { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java index 25102dea6..0a68900a2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ErrorResponseException.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.msg.ModbusResponse; *ErrorResponseException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ErrorResponseException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java index 438d0c967..7cbbef6f2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataAddressException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *IllegalDataAddressException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalDataAddressException extends ModbusTransportException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java index 7ffce6cbe..9c407ef5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalDataTypeException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *IllegalDataTypeException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalDataTypeException extends ModbusIdException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java index 220bbe0f9..de826f0cd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalFunctionException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *IllegalFunctionException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalFunctionException extends ModbusTransportException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java index 98730fadf..6aeedca9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/IllegalSlaveIdException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *IllegalSlaveIdException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IllegalSlaveIdException extends ModbusIdException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java index 961a55145..e1d42df9f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/InvalidDataConversionException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *InvalidDataConversionException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class InvalidDataConversionException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java index 21d138ef8..41da29aba 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusIdException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *ModbusIdException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusIdException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java index 2d2aac4b2..f63a749c6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusInitException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *ModbusInitException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusInitException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java index e12329c6b..29b6a4aa0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/exception/ModbusTransportException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.exception; *ModbusTransportException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ModbusTransportException extends Exception { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java index 43aac3cb1..4a008e8b0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessage.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.msg.ModbusMessage; *Abstract IpMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class IpMessage { protected final ModbusMessage modbusMessage; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java index 9c840c681..2bd190863 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpMessageResponse.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *IpMessageResponse interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IpMessageResponse extends OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java index 8bd84d259..d5a2033c0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/IpParameters.java @@ -21,7 +21,7 @@ import com.serotonin.modbus4j.base.ModbusUtils; *IpParameters class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IpParameters { private String host; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java index 376294269..e8bdc782b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *EncapMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessage extends IpMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java index 0a07cca27..62ad24a2c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *EncapMessageParser class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java index d8691a667..5ffe7e3c0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *EncapMessageRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageRequest extends EncapMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java index b672204a2..5a8fbdef1 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapMessageResponse.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *EncapMessageResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapMessageResponse extends EncapMessage implements IpMessageResponse { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java index c62ba50a2..12838b7de 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *EncapRequestHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java index 51950346d..1f265947d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/encap/EncapWaitingRoomKeyFactory.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *EncapWaitingRoomKeyFactory class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EncapWaitingRoomKeyFactory implements WaitingRoomKeyFactory { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java index e4b080447..f1788e4bc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/listener/TcpListener.java @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; *TcpListener class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpListener extends ModbusMaster { // Configuration fields. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java index 88a2c520c..c663f2e09 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpMaster.java @@ -42,7 +42,7 @@ import java.util.Arrays; *TcpMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpMaster extends ModbusMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java index 41551677f..3a25d600c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/tcp/TcpSlave.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; *TcpSlave class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TcpSlave extends ModbusSlaveSet { final boolean encapsulated; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java index 0b64291c4..826ada02a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpMaster.java @@ -37,7 +37,7 @@ import java.net.*; *UdpMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class UdpMaster extends ModbusMaster { private static final int MESSAGE_LENGTH = 1024; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java index b56cf48ff..a0f3973d2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/udp/UdpSlave.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; *UdpSlave class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class UdpSlave extends ModbusSlaveSet { final BaseMessageParser messageParser; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java index ebc065ec8..e4304983f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *XaMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessage extends IpMessage { protected final int transactionId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java index ea38374f7..35bec85b4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *XaMessageParser class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java index 7208908d7..a6818402d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *XaMessageRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageRequest extends XaMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java index 70cd26dc5..31742f09c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaMessageResponse.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *XaMessageResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaMessageResponse extends XaMessage implements IpMessageResponse { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java index 387810a2c..089dfdb1c 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *XaRequestHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java index cfe77ac2f..a4bd0d263 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/ip/xa/XaWaitingRoomKeyFactory.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *XaWaitingRoomKeyFactory class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class XaWaitingRoomKeyFactory implements WaitingRoomKeyFactory { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java index 17c3c968e..487e8c6b4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/locator/BaseLocator.java @@ -29,7 +29,7 @@ import java.nio.charset.Charset; *Abstract BaseLocator class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class BaseLocatorBinaryLocator class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class BinaryLocator extends BaseLocatorNumericLocator class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NumericLocator extends BaseLocatorStringLocator class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StringLocator extends BaseLocatorExceptionRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionRequest extends ModbusRequest { private final byte functionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java index 130a1ed81..9255e8a10 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ExceptionResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *ExceptionResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ExceptionResponse extends ModbusResponse { private final byte functionCode; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java index 2c57f146f..0c5b9dba6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusMessage.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ModbusMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusMessage { protected int slaveId; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java index 4ccf5d560..dc2fe7b2a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusRequest.java @@ -28,7 +28,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ModbusRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusRequest extends ModbusMessage { ModbusRequest(int slaveId) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java index ebd1a6177..b7ae60dec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ModbusResponse.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ModbusResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusResponse extends ModbusMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java index 69d078a00..35c1657d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadBinaryRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ReadBinaryRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadBinaryRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java index 5a4992451..73ac59e30 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadCoilsRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadCoilsRequest extends ReadBinaryRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java index ece20902b..c5150b2aa 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadCoilsResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadCoilsResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadCoilsResponse extends ReadResponse { ReadCoilsResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java index 970052f2d..b49f5bbbc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadDiscreteInputsRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadDiscreteInputsRequest extends ReadBinaryRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java index 2cddf5d37..6511d3f9e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadDiscreteInputsResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadDiscreteInputsResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadDiscreteInputsResponse extends ReadResponse { ReadDiscreteInputsResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java index 019e1f068..390b2cbfa 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *ReadExceptionStatusRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadExceptionStatusRequest extends ModbusRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java index 373bb5faa..ae2feee95 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadExceptionStatusResponse.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *ReadExceptionStatusResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadExceptionStatusResponse extends ModbusResponse { private byte exceptionStatus; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java index 9399f69fa..9c0015ab4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadHoldingRegistersRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadHoldingRegistersRequest extends ReadNumericRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java index 78ab3b7e7..28603cc91 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadHoldingRegistersResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadHoldingRegistersResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadHoldingRegistersResponse extends ReadResponse { ReadHoldingRegistersResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java index 1f7e1edfe..88ebc0548 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersRequest.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadInputRegistersRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadInputRegistersRequest extends ReadNumericRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java index 9ebc411fe..c7f7782da 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadInputRegistersResponse.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.exception.ModbusTransportException; *ReadInputRegistersResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReadInputRegistersResponse extends ReadResponse { ReadInputRegistersResponse(int slaveId, byte[] data) throws ModbusTransportException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java index 89dbac055..43c83eda9 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadNumericRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ReadNumericRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadNumericRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java index f5bd71dfa..1b0bc63d5 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReadResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract ReadResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ReadResponse extends ModbusResponse { private byte[] data; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java index 89011431b..dbba9551e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdRequest.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *ReportSlaveIdRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReportSlaveIdRequest extends ModbusRequest { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java index 2b6b8f17a..08ac40b22 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/ReportSlaveIdResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *ReportSlaveIdResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ReportSlaveIdResponse extends ModbusResponse { private byte[] data; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java index d32a3ffd5..04c2dd036 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteCoilRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java index ff7504e5b..78cae403f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteCoilResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java index 11f9164f0..7426a1c5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteCoilsRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilsRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java index 961e055f4..c5d64fae3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteCoilsResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteCoilsResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteCoilsResponse extends ModbusResponse { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java index 887f5fc49..d6cc71e03 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterRequest.java @@ -27,7 +27,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteMaskRegisterRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteMaskRegisterRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java index 84089486b..b6ab1abc5 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteMaskRegisterResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteMaskRegisterResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteMaskRegisterResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java index 80759e00e..278d0ce74 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteRegisterRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegisterRequest extends ModbusRequest { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java index 0a21f9797..e88988e87 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegisterResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteRegisterResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegisterResponse extends ModbusResponse { private int writeOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java index 1fcbf1c8c..be94636f0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteRegistersRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegistersRequest extends ModbusRequest { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java index 82cfeada8..d5300e1ef 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/msg/WriteRegistersResponse.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *WriteRegistersResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WriteRegistersResponse extends ModbusResponse { private int startOffset; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java index e56599879..2fc5cd78e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMaster.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; *Abstract SerialMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialMaster extends ModbusMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java index 28445f411..8e45ce0b2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialMessage.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.msg.ModbusMessage; *Abstract SerialMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialMessage { protected final ModbusMessage modbusMessage; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java index 1e92ad141..275871f5a 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialPortWrapper.java @@ -22,7 +22,7 @@ import java.io.OutputStream; * Wrapper to further aid in abstracting Modbus4J from a serial port implementation * * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public interface SerialPortWrapper { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java index 9ce2e9868..3edcff3c8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialSlave.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory; *Abstract SerialSlave class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class SerialSlave extends ModbusSlaveSet { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java index d90ccde93..b4d5504d3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/SerialWaitingRoomKeyFactory.java @@ -25,7 +25,7 @@ import com.serotonin.modbus4j.sero.messaging.WaitingRoomKeyFactory; *SerialWaitingRoomKeyFactory class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SerialWaitingRoomKeyFactory implements WaitingRoomKeyFactory { private static final Sync sync = new Sync(); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java index 395c39f37..f4564a01f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMaster.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; *AsciiMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMaster extends SerialMaster { private final Log LOG = LogFactory.getLog(SerialMaster.class); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java index 53046250e..54e0f90e4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *Abstract AsciiMessage class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class AsciiMessage extends SerialMessage { private static final byte START = ':'; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java index c9f9070a3..4ceb4e9ee 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageParser.java @@ -23,7 +23,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *AsciiMessageParser class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java index c017cff53..72d0c6c17 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *AsciiMessageRequest class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageRequest extends AsciiMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java index 2048300cf..9c0478ba3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiMessageResponse.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; *AsciiMessageResponse class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiMessageResponse extends AsciiMessage implements OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java index 234d2d8c1..b31cddc08 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *AsciiRequestHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java index 973f5f5b8..0ef6e30d9 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/ascii/AsciiSlave.java @@ -26,7 +26,7 @@ import java.io.IOException; *AsciiSlave class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class AsciiSlave extends SerialSlave { private MessageControl conn; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java index b32b5b2b1..1fac264c6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMaster.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; *RtuMaster class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMaster extends SerialMaster { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java index c28051054..ce890acd4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessage.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Convenience superclass primarily for calculating CRC values. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessage extends SerialMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java index 0b3bfc417..b57837d9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageParser.java @@ -24,7 +24,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * handling of incomplete messages. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageParser extends BaseMessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java index 9467120d8..c8e2299ac 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageRequest.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Handles the RTU enveloping of modbus requests. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageRequest extends RtuMessage implements OutgoingRequestMessage, IncomingRequestMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java index 933864936..f1e6572fc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuMessageResponse.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Handles the RTU enveloping of modbus responses. * * @author mlohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuMessageResponse extends RtuMessage implements OutgoingResponseMessage, IncomingResponseMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java index dc44feb36..e3fc8bd9b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuRequestHandler.java @@ -26,7 +26,7 @@ import com.serotonin.modbus4j.sero.messaging.OutgoingResponseMessage; *RtuRequestHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuRequestHandler extends BaseRequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java index db0fac21b..c77d4a3c4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/serial/rtu/RtuSlave.java @@ -26,7 +26,7 @@ import java.io.IOException; *RtuSlave class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class RtuSlave extends SerialSlave { // Runtime fields diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java index c3c940d6c..24dcd7f8b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/NotImplementedException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero; *NotImplementedException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NotImplementedException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java index 8add92981..287c25845 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/ShouldNeverHappenException.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero; *ShouldNeverHappenException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ShouldNeverHappenException extends RuntimeException { private static final long serialVersionUID = -1; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java index 903705929..cfffd3e48 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/InputStreamEPollWrapper.java @@ -21,7 +21,7 @@ import java.io.InputStream; *InputStreamEPollWrapper interface.
* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public interface InputStreamEPollWrapper { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java index 3cbde4fbd..db7fea40b 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/epoll/Modbus4JInputStreamCallback.java @@ -25,7 +25,7 @@ import java.io.IOException; * notification to this callback. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface Modbus4JInputStreamCallback { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java index d35e6dc60..3a2b81069 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/LineHandler.java @@ -19,7 +19,7 @@ package com.serotonin.modbus4j.sero.io; *LineHandler interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface LineHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java index eee572169..1658b891e 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/NullWriter.java @@ -23,7 +23,7 @@ import java.io.Writer; *NullWriter class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class NullWriter extends Writer { @Override diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java index 250ede990..812c0c6ea 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/io/StreamUtils.java @@ -32,7 +32,7 @@ import java.util.List; *StreamUtils class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamUtils { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java index 84a862541..c5d498874 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/BaseIOLog.java @@ -31,7 +31,7 @@ import java.util.Date; *Abstract BaseIOLog class.
* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public abstract class BaseIOLog { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java index 662c03865..9f9f67f61 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/IOLog.java @@ -21,7 +21,7 @@ import java.io.File; *IOLog class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class IOLog extends BaseIOLog { //private static final Log LOG = LogFactory.getLog(IOLog.class); diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java index 9489f3cda..4ec077d81 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/RollingIOLog.java @@ -30,7 +30,7 @@ import java.nio.file.StandardCopyOption; * Class to Log IO with the option to keep historical files * * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class RollingIOLog extends BaseIOLog { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java index 68513ebd1..f4d363273 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/log/SimpleLog.java @@ -24,7 +24,7 @@ import java.util.Date; *SimpleLog class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SimpleLog { private final PrintWriter out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java index de6b6df77..619bc4fcd 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DataConsumer.java @@ -22,7 +22,7 @@ import java.io.IOException; *DataConsumer interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface DataConsumer { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java index 4dac9c6f7..fb12d6eb3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/DefaultMessagingExceptionHandler.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *DefaultMessagingExceptionHandler class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class DefaultMessagingExceptionHandler implements MessagingExceptionHandler { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java index 1aa2da2f8..caa581585 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransport.java @@ -29,7 +29,7 @@ import java.io.OutputStream; * control). * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class EpollStreamTransport implements Transport { private final OutputStream out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java index 5c00d8fa6..619e873ec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/EpollStreamTransportCharSpaced.java @@ -25,7 +25,7 @@ import java.io.OutputStream; *EpollStreamTransportCharSpaced class.
* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class EpollStreamTransportCharSpaced extends EpollStreamTransport { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java index a4f6de75e..3183cdc0f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingMessage.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *IncomingMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingMessage { // A marker interface diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java index b6a1d839f..a740b00bf 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingRequestMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *IncomingRequestMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingRequestMessage extends IncomingMessage { // A marker interface. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java index 4713de1b3..5b77dd8ec 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/IncomingResponseMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *IncomingResponseMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface IncomingResponseMessage extends IncomingMessage { // A marker interface diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java index 2a400d5ab..5f039dd33 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java @@ -28,7 +28,7 @@ import java.io.InputStream; * stream listeners to safely listen and still respond when they are told to stop. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class InputStreamListener implements Runnable { private static final int DEFAULT_READ_DELAY = 50; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java index ff59a5521..3ceaeee31 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageControl.java @@ -33,7 +33,7 @@ import java.io.IOException; * * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class MessageControl implements DataConsumer { private static int DEFAULT_RETRIES = 2; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java index f041b45f7..e3495e61d 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessageParser.java @@ -22,7 +22,7 @@ import com.serotonin.modbus4j.sero.util.queue.ByteQueue; * Interface defining methods that are called when data arrives in the connection. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface MessageParser { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java index e1648e88b..898fd7f59 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/MessagingExceptionHandler.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *MessagingExceptionHandler interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface MessagingExceptionHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java index bc57cefdf..88602f865 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingMessage.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.messaging; *OutgoingMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java index 16aa39757..ed5a1f0f6 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingRequestMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *OutgoingRequestMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingRequestMessage extends OutgoingMessage { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java index 3b2ab0c69..2640e1136 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/OutgoingResponseMessage.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *OutgoingResponseMessage interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface OutgoingResponseMessage extends OutgoingMessage { // A marker interface. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java index c06bc8ae9..faae1a476 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/RequestHandler.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *RequestHandler interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface RequestHandler { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java index c7d236939..151591734 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransport.java @@ -28,7 +28,7 @@ import java.io.OutputStream; * control). * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamTransport implements Transport, Runnable { protected OutputStream out; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java index d9ee93091..99297dd3f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/StreamTransportCharSpaced.java @@ -23,7 +23,7 @@ import java.io.OutputStream; *StreamTransportCharSpaced class.
* * @author Terry Packer - * @version 2025.2.5 + * @version 2025.6.0 */ public class StreamTransportCharSpaced extends StreamTransport { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java index ce08fab4c..b4c7e0ae4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TestableTransport.java @@ -25,7 +25,7 @@ import java.io.OutputStream; * Provides synchronization on the input stream read by wrapping it. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TestableTransport extends StreamTransport { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java index 3cdae2d24..1ab988e28 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/TimeoutException.java @@ -23,7 +23,7 @@ import java.io.Serial; *TimeoutException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class TimeoutException extends IOException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java index 356b327a0..df3c229d8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/Transport.java @@ -23,7 +23,7 @@ import java.io.IOException; * ports, sockets, UDP, email, etc. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface Transport { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java index d86d9045b..0fef52710 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomException.java @@ -23,7 +23,7 @@ import java.io.Serial; *WaitingRoomException class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class WaitingRoomException extends IOException { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java index da50e33d7..79c0715e8 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKey.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; * definitions. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface WaitingRoomKey { // Implementation needs to have hashcode and equals implementations. diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java index 6f703c5c1..5c89c421f 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/messaging/WaitingRoomKeyFactory.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.messaging; *WaitingRoomKeyFactory interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface WaitingRoomKeyFactory { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java index fb368e805..2f6fce536 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/SystemTimeSource.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.timer; * An implementation of TimeSource that returns the host time via System. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class SystemTimeSource implements TimeSource { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java index f08583758..e41571bfc 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/timer/TimeSource.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.timer; * the time is controlled explicitly. * * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface TimeSource { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java index 31791cba6..d065cf0e2 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ArrayUtils.java @@ -22,7 +22,7 @@ import java.util.List; *ArrayUtils class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ArrayUtils { private static int[] bitFromMask = {0xff, 0x7f, 0x3f, 0x1f, 0xf, 0x7, 0x3, 0x1}; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java index d4ab466b9..4dc49e913 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTask.java @@ -21,7 +21,7 @@ package com.serotonin.modbus4j.sero.util; *Abstract ProgressiveTask class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ProgressiveTask implements Runnable { protected boolean completed = false; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java index 1d70ed062..620a60fa4 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/ProgressiveTaskListener.java @@ -20,7 +20,7 @@ package com.serotonin.modbus4j.sero.util; *ProgressiveTaskListener interface.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public interface ProgressiveTaskListener { /** diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java index 3977a3310..336390c69 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/sero/util/queue/ByteQueue.java @@ -25,7 +25,7 @@ import java.nio.charset.Charset; *ByteQueue class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ public class ByteQueue implements Cloneable { private byte[] queue; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java index c66791645..9fd31b9a1 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/serotonin/modbus4j/value/ModbusValue.java @@ -24,7 +24,7 @@ import java.math.BigInteger; *Abstract ModbusValue class.
* * @author Matthew Lohbihler - * @version 2025.2.5 + * @version 2025.6.0 */ abstract public class ModbusValue { private final DataType type; diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java index 88e77abeb..ec5333532 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/ModbusTcpDriverApplication.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @SpringBootApplication diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java index 179e18dd7..03498ec28 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/io/github/pnoker/driver/service/impl/DriverCustomServiceImpl.java @@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit; * 驱动自定义服务实现类 * * @author pnoker - * @version 2025.2.5 + * @version 2025.6.0 * @since 2022.1.0 */ @Slf4j diff --git a/dc3-driver/dc3-driver-mqtt/pom.xml b/dc3-driver/dc3-driver-mqtt/pom.xml index 127b39165..ec8ac0cf2 100644 --- a/dc3-driver/dc3-driver-mqtt/pom.xml +++ b/dc3-driver/dc3-driver-mqtt/pom.xml @@ -21,7 +21,7 @@