lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

set the JpaControllerManagement constructor public (#1227)

Browse Source 
Signed-off-by: Robert Sing <robert.sing@bosch-si.com>
This commit is contained in:
Robert Sing
2022-01-31 11:36:13 +01:00
committed by GitHub
parent 69e6488004
commit cc3d36e442
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java
View File

@@ -155,7 +155,7 @@ public class JpaControllerManagement extends JpaActionManagement implements Cont
@Autowired @Autowired
private TenantAware tenantAware; private TenantAware tenantAware;
JpaControllerManagement(final ScheduledExecutorService executorService, public JpaControllerManagement(final ScheduledExecutorService executorService,
final RepositoryProperties repositoryProperties, final ActionRepository actionRepository) { final RepositoryProperties repositoryProperties, final ActionRepository actionRepository) {
super(actionRepository, repositoryProperties); super(actionRepository, repositoryProperties);
@@ -392,7 +392,7 @@ public class JpaControllerManagement extends JpaActionManagement implements Cont
.orElseGet(() -> createTarget(controllerId, address, name)); .orElseGet(() -> createTarget(controllerId, address, name));
} }
private Target createTarget(final String controllerId, final URI address, String name) { private Target createTarget(final String controllerId, final URI address, final String name) {
final Target result = targetRepository.save((JpaTarget) entityFactory.target().create() final Target result = targetRepository.save((JpaTarget) entityFactory.target().create()
.controllerId(controllerId).description("Plug and Play target: " + controllerId).name((StringUtils.hasText(name) ? name : controllerId)) .controllerId(controllerId).description("Plug and Play target: " + controllerId).name((StringUtils.hasText(name) ? name : controllerId))
@@ -509,17 +509,21 @@ public class JpaControllerManagement extends JpaActionManagement implements Cont
} }
return toUpdate; return toUpdate;
} }
private boolean isStoreEager(final JpaTarget toUpdate, final URI address, final String name) { private boolean isStoreEager(final JpaTarget toUpdate, final URI address, final String name) {
return repositoryProperties.isEagerPollPersistence() || isAddressChanged(toUpdate.getAddress(), address) return repositoryProperties.isEagerPollPersistence() || isAddressChanged(toUpdate.getAddress(), address)
|| isNameChanged(toUpdate.getName(), name) || isStatusUnknown(toUpdate.getUpdateStatus()); || isNameChanged(toUpdate.getName(), name) || isStatusUnknown(toUpdate.getUpdateStatus());
} }
private boolean isAddressChanged(final URI addressToUpdate, final URI address) {
private static boolean isAddressChanged(final URI addressToUpdate, final URI address) {
return addressToUpdate == null || !addressToUpdate.equals(address); return addressToUpdate == null || !addressToUpdate.equals(address);
} }
private boolean isNameChanged(final String nameToUpdate, final String name) {
private static boolean isNameChanged(final String nameToUpdate, final String name) {
return StringUtils.hasText(name) && !nameToUpdate.equals(name); return StringUtils.hasText(name) && !nameToUpdate.equals(name);
} }
private boolean isStatusUnknown(final TargetUpdateStatus statusToUpdate) {
private static boolean isStatusUnknown(final TargetUpdateStatus statusToUpdate) {
return TargetUpdateStatus.UNKNOWN == statusToUpdate; return TargetUpdateStatus.UNKNOWN == statusToUpdate;
} }