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

Merge pull request #1018 from bosch-io/fix_migration_to_new_spring_boot_version

Browse Source 
Update Spring Boot to 2.3.7.RELEASE
This commit is contained in:
Dominic Schabel
2021-02-11 16:42:14 +01:00
committed by GitHub
parent 84f0180ad1 0a31b513ec
commit 17cca56a1b
104 changed files with 831 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/IdentifiableEntityToProxyIdentifiableEntityMapper.java
View File

@@ -8,8 +8,8 @@
*/
package org.eclipse.hawkbit.ui.common.data.mappers;
import org.eclipse.hawkbit.repository.Identifiable;
import org.eclipse.hawkbit.ui.common.data.proxies.ProxyIdentifiableEntity;
import org.springframework.hateoas.Identifiable;
/**
* Interface for mapping identifiable entities, fetched from backend, to the

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractMetaDataDataProvider.java
View File

@@ -31,7 +31,7 @@ public abstract class AbstractMetaDataDataProvider<U extends MetaData, F>
private static final long serialVersionUID = 1L;
protected AbstractMetaDataDataProvider() {
this(new Sort(Direction.DESC, "key"));
this(Sort.by(Direction.DESC, "key"));
}
protected AbstractMetaDataDataProvider(final Sort defaultSortOrder) {

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractProxyDataProvider.java
View File

@@ -10,12 +10,12 @@ package org.eclipse.hawkbit.ui.common.data.providers;
import java.util.stream.Stream;
import org.eclipse.hawkbit.repository.Identifiable;
import org.eclipse.hawkbit.ui.common.data.mappers.IdentifiableEntityToProxyIdentifiableEntityMapper;
import org.eclipse.hawkbit.ui.common.data.proxies.ProxyIdentifiableEntity;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.hateoas.Identifiable;
/**
* Base class for loading a batch of {@link Identifiable} entities from backend
@@ -41,7 +41,7 @@ public abstract class AbstractProxyDataProvider<T extends ProxyIdentifiableEntit
* IdentifiableEntityToProxyIdentifiableEntityMapper of generic type
*/
public AbstractProxyDataProvider(final IdentifiableEntityToProxyIdentifiableEntityMapper<T, U> mapper) {
this(mapper, new Sort(Direction.ASC, "id"));
this(mapper, Sort.by(Direction.ASC, "id"));
}
/**

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionDataProvider.java
View File

@@ -42,7 +42,7 @@ public class ActionDataProvider extends AbstractProxyDataProvider<ProxyAction, A
*/
public ActionDataProvider(final DeploymentManagement deploymentManagement,
final ActionToProxyActionMapper entityMapper) {
super(entityMapper, new Sort(Direction.DESC, "id"));
super(entityMapper, Sort.by(Direction.DESC, "id"));
this.deploymentManagement = deploymentManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusDataProvider.java
View File

@@ -40,7 +40,7 @@ public class ActionStatusDataProvider extends AbstractProxyDataProvider<ProxyAct
*/
public ActionStatusDataProvider(final DeploymentManagement deploymentManagement,
final ActionStatusToProxyActionStatusMapper entityMapper) {
super(entityMapper, new Sort(Direction.DESC, "id"));
super(entityMapper, Sort.by(Direction.DESC, "id"));
this.deploymentManagement = deploymentManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusMsgDataProvider.java
View File

@@ -43,7 +43,7 @@ public class ActionStatusMsgDataProvider extends AbstractGenericDataProvider<Pro
* Message not available text
*/
public ActionStatusMsgDataProvider(final DeploymentManagement deploymentManagement, final String noMessageText) {
this(deploymentManagement, noMessageText, new Sort(Direction.DESC, "id"));
this(deploymentManagement, noMessageText, Sort.by(Direction.DESC, "id"));
}
/**

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ArtifactDataProvider.java
View File

@@ -39,7 +39,7 @@ public class ArtifactDataProvider extends AbstractProxyDataProvider<ProxyArtifac
*/
public ArtifactDataProvider(final ArtifactManagement artifactManagement,
final ArtifactToProxyArtifactMapper entityMapper) {
super(entityMapper, new Sort(Direction.DESC, "filename"));
super(entityMapper, Sort.by(Direction.DESC, "filename"));
this.artifactManagement = artifactManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetStatelessDataProvider.java
View File

@@ -41,7 +41,7 @@ public class DistributionSetStatelessDataProvider
*/
public DistributionSetStatelessDataProvider(final DistributionSetManagement distributionSetManagement,
final DistributionSetToProxyDistributionMapper entityMapper) {
super(entityMapper, new Sort(Direction.ASC, "name", "version"));
super(entityMapper, Sort.by(Direction.ASC, "name", "version"));
this.distributionSetManagement = distributionSetManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTagDataProvider.java
View File

@@ -38,7 +38,7 @@ public class DistributionSetTagDataProvider extends AbstractProxyDataProvider<Pr
*/
public DistributionSetTagDataProvider(final DistributionSetTagManagement distributionSetTagManagement,
final TagToProxyTagMapper<DistributionSetTag> mapper) {
super(mapper, new Sort(Direction.ASC, "name"));
super(mapper, Sort.by(Direction.ASC, "name"));
this.distributionSetTagManagement = distributionSetTagManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTypeDataProvider.java
View File

@@ -41,7 +41,7 @@ public class DistributionSetTypeDataProvider<T extends ProxyIdentifiableEntity>
*/
public DistributionSetTypeDataProvider(final DistributionSetTypeManagement distributionSetTypeManagement,
final IdentifiableEntityToProxyIdentifiableEntityMapper<T, DistributionSetType> mapper) {
super(mapper, new Sort(Direction.ASC, "name"));
super(mapper, Sort.by(Direction.ASC, "name"));
this.distributionSetTypeManagement = distributionSetTypeManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutDataProvider.java
View File

@@ -39,7 +39,7 @@ public class RolloutDataProvider extends AbstractProxyDataProvider<ProxyRollout,
*/
public RolloutDataProvider(final RolloutManagement rolloutManagement,
final RolloutToProxyRolloutMapper entityMapper) {
super(entityMapper, new Sort(Direction.DESC, "lastModifiedAt"));
super(entityMapper, Sort.by(Direction.DESC, "lastModifiedAt"));
this.rolloutManagement = rolloutManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleTypeDataProvider.java
View File

@@ -42,7 +42,7 @@ public class SoftwareModuleTypeDataProvider<T extends ProxyIdentifiableEntity>
*/
public SoftwareModuleTypeDataProvider(final SoftwareModuleTypeManagement softwareModuleTypeManagement,
final IdentifiableEntityToProxyIdentifiableEntityMapper<T, SoftwareModuleType> mapper) {
super(mapper, new Sort(Direction.ASC, "name"));
super(mapper, Sort.by(Direction.ASC, "name"));
this.softwareModuleTypeManagement = softwareModuleTypeManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDataProvider.java
View File

@@ -39,7 +39,7 @@ public class TargetFilterQueryDataProvider
*/
public TargetFilterQueryDataProvider(final TargetFilterQueryManagement targetFilterQueryManagement,
final TargetFilterQueryToProxyTargetFilterMapper entityMapper) {
super(entityMapper, new Sort(Direction.ASC, "name"));
super(entityMapper, Sort.by(Direction.ASC, "name"));
this.targetFilterQueryManagement = targetFilterQueryManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDetailsDataProvider.java
View File

@@ -38,7 +38,7 @@ public class TargetFilterQueryDetailsDataProvider
*/
public TargetFilterQueryDetailsDataProvider(final TargetFilterQueryManagement targetFilterQueryManagement,
final TargetFilterQueryToProxyTargetFilterMapper entityMapper) {
super(entityMapper, new Sort(Direction.ASC, "name"));
super(entityMapper, Sort.by(Direction.ASC, "name"));
this.targetFilterQueryManagement = targetFilterQueryManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterStateDataProvider.java
View File

@@ -40,7 +40,7 @@ public class TargetFilterStateDataProvider extends AbstractProxyDataProvider<Pro
*/
public TargetFilterStateDataProvider(final TargetManagement targetManagement,
final TargetToProxyTargetMapper entityMapper) {
super(entityMapper, new Sort(Direction.ASC, "name"));
super(entityMapper, Sort.by(Direction.ASC, "name"));
this.targetManagement = targetManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetManagementStateDataProvider.java
View File

@@ -44,7 +44,7 @@ public class TargetManagementStateDataProvider
*/
public TargetManagementStateDataProvider(final TargetManagement targetManagement,
final TargetToProxyTargetMapper entityMapper) {
super(entityMapper, new Sort(Direction.DESC, "lastModifiedAt"));
super(entityMapper, Sort.by(Direction.DESC, "lastModifiedAt"));
this.targetManagement = targetManagement;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTagDataProvider.java
View File

@@ -37,7 +37,7 @@ public class TargetTagDataProvider extends AbstractProxyDataProvider<ProxyTag, T
*/
public TargetTagDataProvider(final TargetTagManagement tagManagementService,
final TagToProxyTagMapper<TargetTag> mapper) {
super(mapper, new Sort(Direction.ASC, "name"));
super(mapper, Sort.by(Direction.ASC, "name"));
this.tagManagementService = tagManagementService;
}

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyIdentifiableEntity.java
View File

@@ -8,10 +8,9 @@
*/
package org.eclipse.hawkbit.ui.common.data.proxies;
import org.eclipse.hawkbit.repository.Identifiable;
import java.io.Serializable;
import org.springframework.hateoas.Identifiable;
/**
* Proxy entity representing the {@link Identifiable} entity, fetched from
* backend.

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
View File

@@ -14,6 +14,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.eclipse.hawkbit.repository.Identifiable;
import org.eclipse.hawkbit.ui.SpPermissionChecker;
import org.eclipse.hawkbit.ui.common.CommonUiDependencies;
import org.eclipse.hawkbit.ui.common.data.proxies.ProxyNamedEntity;
@@ -22,7 +23,6 @@ import org.eclipse.hawkbit.ui.common.layout.MasterEntityAwareComponent;
import org.eclipse.hawkbit.ui.common.tagdetails.TagPanelLayout.TagAssignmentListener;
import org.eclipse.hawkbit.ui.utils.UINotification;
import org.eclipse.hawkbit.ui.utils.VaadinMessageSource;
import org.springframework.hateoas.Identifiable;
import org.springframework.util.CollectionUtils;
import org.vaadin.spring.events.EventBus.UIEventBus;