Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl
This commit is contained in:
Kai Zimmermann
@@ -60,9 +60,17 @@ public interface ArtifactManagement {
|
||||
ExternalArtifact createExternalArtifact(@NotNull ExternalArtifactProvider externalRepository, String urlSuffix,
|
||||
@NotNull Long moduleId);
|
||||
|
||||
/**
|
||||
* @return the total amount of local artifacts stored in the artifact
|
||||
* management
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
|
||||
Long countLocalArtifactsAll();
|
||||
|
||||
/**
|
||||
* @return the total amount of external artifacts stored in the artifact
|
||||
* management
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
|
||||
Long countExternalArtifactsAll();
|
||||
|
||||
|
||||
@@ -187,9 +187,15 @@ public interface DeploymentManagement {
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Long countActionsByTarget(@NotNull String rsqlParam, @NotNull Target target);
|
||||
|
||||
/**
|
||||
* @return the total amount of stored action status
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Long countActionStatusAll();
|
||||
|
||||
/**
|
||||
* @return the total amount of stored actions
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Long countActionsAll();
|
||||
|
||||
@@ -280,8 +286,20 @@ public interface DeploymentManagement {
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Slice<Action> findActionsByTarget(@NotNull Pageable pageable, @NotNull Target target);
|
||||
|
||||
/**
|
||||
* Retrieves all {@link Action} which assigned to a specific
|
||||
* {@link DistributionSet}.
|
||||
*
|
||||
* @param pageable
|
||||
* the page request parameter for paging and sorting the result
|
||||
* @param distributionSet
|
||||
* the distribution set which should be assigned to the actions
|
||||
* in the result
|
||||
* @return a list of {@link Action} which are assigned to a specific
|
||||
* {@link DistributionSet}
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Slice<Action> findActionsByDistributionSet(@NotNull Pageable pageable, @NotNull DistributionSet ds);
|
||||
Slice<Action> findActionsByDistributionSet(@NotNull Pageable pageable, @NotNull DistributionSet distributionSet);
|
||||
|
||||
/**
|
||||
* Retrieves all {@link Action}s assigned to a specific {@link Target} and a
|
||||
@@ -345,8 +363,18 @@ public interface DeploymentManagement {
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Page<ActionStatus> findActionStatusByAction(@NotNull Pageable pageReq, @NotNull Action action);
|
||||
|
||||
/**
|
||||
* Retrieves all {@link ActionStatus} inclusive their messages by a specific
|
||||
* {@link Action}.
|
||||
*
|
||||
* @param pageable
|
||||
* the page request parameter for paging and sorting the result
|
||||
* @param action
|
||||
* the {@link Action} to retrieve the {@link ActionStatus} from
|
||||
* @return a page of {@link ActionStatus} by a speciifc {@link Action}
|
||||
*/
|
||||
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
|
||||
Page<ActionStatus> findActionStatusByActionWithMessages(@NotNull Pageable pageReq, @NotNull Action action);
|
||||
Page<ActionStatus> findActionStatusByActionWithMessages(@NotNull Pageable pageable, @NotNull Action action);
|
||||
|
||||
/**
|
||||
* Retrieves all {@link Action}s of a specific target ordered by action ID.
|
||||
|
||||
@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetType;
|
||||
* Repository constants.
|
||||
*
|
||||
*/
|
||||
public final class Constants {
|
||||
public final class RepositoryConstants {
|
||||
|
||||
/**
|
||||
* Prefix that the server puts in front of
|
||||
@@ -30,7 +30,7 @@ public final class Constants {
|
||||
*/
|
||||
public static final int DEFAULT_DS_TYPES_IN_TENANT = 2;
|
||||
|
||||
private Constants() {
|
||||
private RepositoryConstants() {
|
||||
// Utility class.
|
||||
}
|
||||
|
||||
@@ -18,8 +18,6 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
|
||||
import org.eclipse.hawkbit.repository.model.TenantMetaData;
|
||||
import org.eclipse.hawkbit.repository.report.model.SystemUsageReport;
|
||||
import org.eclipse.hawkbit.tenancy.TenantAware;
|
||||
import org.springframework.cache.interceptor.KeyGenerator;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
|
||||
/**
|
||||
@@ -67,14 +65,10 @@ public interface SystemManagement {
|
||||
*/
|
||||
TenantMetaData getTenantMetadata();
|
||||
|
||||
// TODO figure out why this is necessary and clean this up
|
||||
@Bean
|
||||
KeyGenerator currentTenantKeyGenerator();
|
||||
|
||||
/**
|
||||
* Returns {@link TenantMetaData} of given and current tenant. Creates for
|
||||
* new tenants also two {@link SoftwareModuleType} (os and app) and
|
||||
* {@link Constants#DEFAULT_DS_TYPES_IN_TENANT} {@link DistributionSetType}s
|
||||
* {@link RepositoryConstants#DEFAULT_DS_TYPES_IN_TENANT} {@link DistributionSetType}s
|
||||
* (os and os_app).
|
||||
*
|
||||
* DISCLAIMER: this variant is used during initial login (where the tenant
|
||||
|
||||
@@ -601,4 +601,4 @@ public interface TargetManagement {
|
||||
+ SpringEvalExpressions.IS_CONTROLLER)
|
||||
List<Target> updateTargets(@NotNull Collection<Target> targets);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public interface TenantConfigurationManagement {
|
||||
*/
|
||||
@PreAuthorize(value = SpringEvalExpressions.HAS_AUTH_TENANT_CONFIGURATION + SpringEvalExpressions.HAS_AUTH_OR
|
||||
+ SpringEvalExpressions.IS_SYSTEM_CODE)
|
||||
TenantConfigurationValue<?> getConfigurationValue(TenantConfigurationKey configurationKey);
|
||||
<T> TenantConfigurationValue<T> getConfigurationValue(TenantConfigurationKey configurationKey);
|
||||
|
||||
/**
|
||||
* Retrieves a configuration value from the e.g. tenant overwritten
|
||||
|
||||
@@ -45,4 +45,4 @@ public interface ActionWithStatusCount {
|
||||
*/
|
||||
String getRolloutName();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,4 +39,4 @@ public interface Artifact extends TenantAwareBaseEntity {
|
||||
*/
|
||||
Long getSize();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,4 +46,4 @@ public interface BaseEntity extends Serializable, Identifiable<Long> {
|
||||
*/
|
||||
long getOptLockRevision();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,4 +129,4 @@ public interface DistributionSet extends NamedVersionedEntity {
|
||||
*/
|
||||
boolean isComplete();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,4 +19,4 @@ public interface DistributionSetMetadata extends MetaData {
|
||||
*/
|
||||
DistributionSet getDistributionSet();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,4 +22,4 @@ public interface DistributionSetTag extends Tag {
|
||||
*/
|
||||
List<DistributionSet> getAssignedToDistributionSet();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,4 +170,4 @@ public interface DistributionSetType extends NamedEntity {
|
||||
*/
|
||||
void setColour(final String colour);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,4 +38,4 @@ public interface ExternalArtifact extends Artifact {
|
||||
*/
|
||||
void setUrlSuffix(String urlSuffix);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,4 +36,4 @@ public interface MetaData extends Serializable {
|
||||
*/
|
||||
void setValue(String value);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,4 +25,4 @@ public interface NamedVersionedEntity extends NamedEntity {
|
||||
*/
|
||||
void setVersion(String version);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ package org.eclipse.hawkbit.repository.model;
|
||||
* Repository model constants.
|
||||
*
|
||||
*/
|
||||
public final class Constants {
|
||||
public final class RepositoryModelConstants {
|
||||
|
||||
/**
|
||||
* indicating that target action has no force time which is only needed in
|
||||
@@ -20,7 +20,7 @@ public final class Constants {
|
||||
*/
|
||||
public static final Long NO_FORCE_TIME = 0L;
|
||||
|
||||
private Constants() {
|
||||
private RepositoryModelConstants() {
|
||||
// Utility class.
|
||||
}
|
||||
|
||||
@@ -156,4 +156,4 @@ public interface Rollout extends NamedEntity {
|
||||
ERROR_STARTING;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,44 +16,145 @@ package org.eclipse.hawkbit.repository.model;
|
||||
*/
|
||||
public interface RolloutGroup extends NamedEntity {
|
||||
|
||||
/**
|
||||
* @return the corresponding {@link Rollout} of this group
|
||||
*/
|
||||
Rollout getRollout();
|
||||
|
||||
/**
|
||||
* @param rollout
|
||||
* sets the {@link Rollout} for this group
|
||||
*/
|
||||
void setRollout(Rollout rollout);
|
||||
|
||||
/**
|
||||
* @return the current {@link RolloutGroupStatus} for this group
|
||||
*/
|
||||
RolloutGroupStatus getStatus();
|
||||
|
||||
/**
|
||||
* @param status
|
||||
* the {@link RolloutGroupStatus} to set for this group
|
||||
*/
|
||||
void setStatus(RolloutGroupStatus status);
|
||||
|
||||
/**
|
||||
* @return the parent group of this group, in case the group is the root
|
||||
* group it does not have a parent and so return {@code null}
|
||||
*/
|
||||
RolloutGroup getParent();
|
||||
|
||||
/**
|
||||
* @return the {@link RolloutGroupSuccessCondition} for this group to
|
||||
* indicate when a group is successful
|
||||
*/
|
||||
RolloutGroupSuccessCondition getSuccessCondition();
|
||||
|
||||
void setSuccessCondition(RolloutGroupSuccessCondition finishCondition);
|
||||
/**
|
||||
* @param successCondition
|
||||
* the {@link RolloutGroupSuccessCondition} to be set for this
|
||||
* group to indicate when a group is successfully and a next
|
||||
* group might be started
|
||||
*/
|
||||
void setSuccessCondition(RolloutGroupSuccessCondition successCondition);
|
||||
|
||||
/**
|
||||
* @return a String representation of the expression to be evaluated by the
|
||||
* {@link RolloutGroupSuccessCondition} to indicate if the condition
|
||||
* is true, might be {@code null} if no expression must be set for
|
||||
* the {@link RolloutGroupSuccessCondition}
|
||||
*/
|
||||
String getSuccessConditionExp();
|
||||
|
||||
void setSuccessConditionExp(String finishExp);
|
||||
/**
|
||||
* @param successConditionExp
|
||||
* sets a String represented expression which is evaluated by the
|
||||
* {@link RolloutGroupSuccessCondition}, might be {@code null} if
|
||||
* the set {@link RolloutGroupSuccessCondition} can handle
|
||||
* {@code null} value
|
||||
*/
|
||||
void setSuccessConditionExp(String successConditionExp);
|
||||
|
||||
/**
|
||||
* @return the {@link RolloutGroupErrorCondition} for this group to indicate
|
||||
* when a group should marked as failed
|
||||
*/
|
||||
RolloutGroupErrorCondition getErrorCondition();
|
||||
|
||||
/**
|
||||
*
|
||||
* @param errorCondition
|
||||
* the {@link RolloutGroupErrorCondition} to be set for this
|
||||
* group to indicate when a group is marked as failed and the
|
||||
* corresponding {@link RolloutGroupErrorAction} should be
|
||||
* executed
|
||||
*/
|
||||
void setErrorCondition(RolloutGroupErrorCondition errorCondition);
|
||||
|
||||
/**
|
||||
* @return a String representation of the expression to be evaluated by the
|
||||
* {@link RolloutGroupErrorCondition} to indicate if the condition
|
||||
* is true, might be {@code null} if no expression must be set for
|
||||
* the {@link RolloutGroupErrorCondition}
|
||||
*/
|
||||
String getErrorConditionExp();
|
||||
|
||||
/**
|
||||
* @param errorExp
|
||||
* sets a String represented expression which is evaluated by the
|
||||
* {@link RolloutGroupErrorCondition}, might be {@code null} if
|
||||
* the set {@link RolloutGroupErrorCondition} can handle
|
||||
* {@code null} value
|
||||
*/
|
||||
void setErrorConditionExp(String errorExp);
|
||||
|
||||
/**
|
||||
* @return a {@link RolloutGroupErrorAction} which is executed when the
|
||||
* given {@link RolloutGroupErrorCondition} is met, might be
|
||||
* {@code null} if no error action is set
|
||||
*/
|
||||
RolloutGroupErrorAction getErrorAction();
|
||||
|
||||
/**
|
||||
* @param errorAction
|
||||
* the {@link RolloutGroupErrorAction} to be set which should be
|
||||
* executed if the {@link RolloutGroupErrorCondition} is met,
|
||||
* might be {@code null} if no error action should be executed
|
||||
*/
|
||||
void setErrorAction(RolloutGroupErrorAction errorAction);
|
||||
|
||||
/**
|
||||
* @return a String representation of the expression to be evaluated by the
|
||||
* {@link RolloutGroupErrorAction} might be {@code null} if no
|
||||
* expression must be set for the {@link RolloutGroupErrorAction}
|
||||
*/
|
||||
String getErrorActionExp();
|
||||
|
||||
/**
|
||||
* @param errorActionExp
|
||||
* sets a String represented expression which is evaluated by the
|
||||
* {@link RolloutGroupErrorAction}, might be {@code null} if the
|
||||
* set {@link RolloutGroupErrorAction} can handle {@code null}
|
||||
* value
|
||||
*/
|
||||
void setErrorActionExp(String errorActionExp);
|
||||
|
||||
/**
|
||||
* @return the {@link RolloutGroupSuccessAction} which is executed if the
|
||||
* {@link RolloutGroupSuccessCondition} is met
|
||||
*/
|
||||
RolloutGroupSuccessAction getSuccessAction();
|
||||
|
||||
/**
|
||||
* @return a String representation of the expression to be evaluated by the
|
||||
* {@link RolloutGroupSuccessAction} might be {@code null} if no
|
||||
* expression must be set for the {@link RolloutGroupSuccessAction}
|
||||
*/
|
||||
String getSuccessActionExp();
|
||||
|
||||
/**
|
||||
* @return the total amount of targets containing in this group
|
||||
*/
|
||||
long getTotalTargets();
|
||||
|
||||
/**
|
||||
|
||||
@@ -108,4 +108,4 @@ public interface SoftwareModule extends NamedVersionedEntity {
|
||||
*/
|
||||
List<DistributionSet> getAssignedTo();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,4 +25,4 @@ public interface SoftwareModuleMetadata extends MetaData {
|
||||
*/
|
||||
void setSoftwareModule(SoftwareModule softwareModule);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,4 +57,4 @@ public interface SoftwareModuleType extends NamedEntity {
|
||||
*/
|
||||
void setColour(final String colour);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,4 +24,4 @@ public interface Tag extends NamedEntity {
|
||||
*/
|
||||
void setColour(String colour);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,4 +56,4 @@ public interface TargetFilterQuery extends TenantAwareBaseEntity {
|
||||
*/
|
||||
void setQuery(String query);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,4 +68,4 @@ public interface TargetInfo extends Serializable {
|
||||
*/
|
||||
boolean isRequestControllerAttributes();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,4 +21,4 @@ public interface TargetTag extends Tag {
|
||||
*/
|
||||
List<Target> getAssignedToTargets();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ public class TargetWithActionStatus {
|
||||
|
||||
private Target target;
|
||||
|
||||
private Status status = null;
|
||||
private Status status;
|
||||
|
||||
public TargetWithActionStatus(final Target target) {
|
||||
this.target = target;
|
||||
|
||||
@@ -51,7 +51,7 @@ public class TargetWithActionType {
|
||||
if (actionType == ActionType.TIMEFORCED) {
|
||||
return forceTime;
|
||||
}
|
||||
return Constants.NO_FORCE_TIME;
|
||||
return RepositoryModelConstants.NO_FORCE_TIME;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,4 +19,4 @@ public interface TenantAwareBaseEntity extends BaseEntity {
|
||||
*/
|
||||
String getTenant();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,4 +37,4 @@ public interface TenantConfiguration extends TenantAwareBaseEntity {
|
||||
*/
|
||||
void setValue(String value);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,4 +31,4 @@ public interface TenantMetaData extends BaseEntity {
|
||||
*/
|
||||
String getTenant();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,7 @@
|
||||
http://www.eclipse.org/legal/epl-v10.html
|
||||
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.eclipse.hawkbit</groupId>
|
||||
@@ -36,16 +35,6 @@
|
||||
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Hawkbit -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.hawkbit</groupId>
|
||||
@@ -61,7 +50,7 @@
|
||||
<groupId>org.eclipse.hawkbit</groupId>
|
||||
<artifactId>hawkbit-artifact-repository-mongo</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
@@ -85,7 +74,7 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-core</artifactId>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-core</artifactId>
|
||||
@@ -95,6 +84,10 @@
|
||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cz.jirutka.rsql</groupId>
|
||||
<artifactId>rsql-parser</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Test -->
|
||||
<dependency>
|
||||
@@ -103,6 +96,16 @@
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
@@ -132,7 +135,7 @@
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-aspects</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
@@ -147,7 +150,7 @@
|
||||
<groupId>org.easytesting</groupId>
|
||||
<artifactId>fest-assert</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-config</artifactId>
|
||||
@@ -158,10 +161,6 @@
|
||||
<artifactId>spring-security-web</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cz.jirutka.rsql</groupId>
|
||||
<artifactId>rsql-parser</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
/**
|
||||
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
|
||||
*
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*/
|
||||
package org.eclipse.hawkbit.repository.jpa;
|
||||
|
||||
import org.springframework.cache.interceptor.KeyGenerator;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* Defines the interfaces to register the {@link KeyGenerator} as bean which is
|
||||
* used by spring caching framework to resolve the key-generator. The
|
||||
* key-generator must registered as bean so spring can resolve the key-generator
|
||||
* by its name.
|
||||
*
|
||||
* When using the {@link Service} annotation e.g. by {@link JpaSystemManagement}
|
||||
* the bean registration must be declared by the interface due spring registers
|
||||
* the bean by the implemented interfaces. So introduce a single interface for
|
||||
* the {@link JpaSystemManagement} implementation to allow it to register the
|
||||
* key-generator bean.
|
||||
*
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface CurrentTenantCacheKeyGenerator {
|
||||
|
||||
/**
|
||||
* Bean declaration to register a {@code currentTenantKeyGenerator} bean
|
||||
* which is used by the caching framework.
|
||||
*
|
||||
* @return the {@link KeyGenerator} to be used to cache the values of the
|
||||
* current used tenant in the {@link JpaSystemManagement}
|
||||
*/
|
||||
@Bean
|
||||
KeyGenerator currentTenantKeyGenerator();
|
||||
}
|
||||
@@ -19,7 +19,7 @@ import javax.persistence.criteria.CriteriaQuery;
|
||||
import javax.persistence.criteria.Root;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import org.eclipse.hawkbit.repository.Constants;
|
||||
import org.eclipse.hawkbit.repository.RepositoryConstants;
|
||||
import org.eclipse.hawkbit.repository.ControllerManagement;
|
||||
import org.eclipse.hawkbit.repository.TargetManagement;
|
||||
import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
|
||||
@@ -216,7 +216,7 @@ public class JpaControllerManagement implements ControllerManagement {
|
||||
handleFinishedCancelation(actionStatus, action);
|
||||
break;
|
||||
case RETRIEVED:
|
||||
actionStatus.addMessage(Constants.SERVER_MESSAGE_PREFIX + "Cancellation request retrieved.");
|
||||
actionStatus.addMessage(RepositoryConstants.SERVER_MESSAGE_PREFIX + "Cancellation request retrieved.");
|
||||
break;
|
||||
default:
|
||||
// do nothing
|
||||
@@ -230,7 +230,7 @@ public class JpaControllerManagement implements ControllerManagement {
|
||||
private void handleFinishedCancelation(final ActionStatus actionStatus, final JpaAction action) {
|
||||
// in case of successful cancellation we also report the success at
|
||||
// the canceled action itself.
|
||||
actionStatus.addMessage(Constants.SERVER_MESSAGE_PREFIX + "Cancellation completion is finished sucessfully.");
|
||||
actionStatus.addMessage(RepositoryConstants.SERVER_MESSAGE_PREFIX + "Cancellation completion is finished sucessfully.");
|
||||
DeploymentHelper.successCancellation(action, actionRepository, targetManagement, targetInfoRepository,
|
||||
entityManager);
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ public class JpaDeploymentManagement implements DeploymentManagement {
|
||||
|
||||
return assignDistributionSetByTargetId((JpaDistributionSet) pset,
|
||||
targets.stream().map(target -> target.getControllerId()).collect(Collectors.toList()),
|
||||
ActionType.FORCED, org.eclipse.hawkbit.repository.model.Constants.NO_FORCE_TIME);
|
||||
ActionType.FORCED, org.eclipse.hawkbit.repository.model.RepositoryModelConstants.NO_FORCE_TIME);
|
||||
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ public class JpaDeploymentManagement implements DeploymentManagement {
|
||||
@CacheEvict(value = { "distributionUsageAssigned" }, allEntries = true)
|
||||
public DistributionSetAssignmentResult assignDistributionSet(final Long dsID, final String... targetIDs) {
|
||||
return assignDistributionSet(dsID, ActionType.FORCED,
|
||||
org.eclipse.hawkbit.repository.model.Constants.NO_FORCE_TIME, targetIDs);
|
||||
org.eclipse.hawkbit.repository.model.RepositoryModelConstants.NO_FORCE_TIME, targetIDs);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -49,7 +49,7 @@ import org.springframework.validation.annotation.Validated;
|
||||
@Transactional(readOnly = true, isolation = Isolation.READ_UNCOMMITTED)
|
||||
@Validated
|
||||
@Service
|
||||
public class JpaSystemManagement implements SystemManagement {
|
||||
public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, SystemManagement {
|
||||
@Autowired
|
||||
private EntityManager entityManager;
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ public class JpaTenantConfigurationManagement implements EnvironmentAware, Tenan
|
||||
}
|
||||
|
||||
@Override
|
||||
public TenantConfigurationValue<?> getConfigurationValue(final TenantConfigurationKey configurationKey) {
|
||||
public <T> TenantConfigurationValue<T> getConfigurationValue(final TenantConfigurationKey configurationKey) {
|
||||
return getConfigurationValue(configurationKey, configurationKey.getDataType());
|
||||
}
|
||||
|
||||
@@ -147,6 +147,7 @@ public class JpaTenantConfigurationManagement implements EnvironmentAware, Tenan
|
||||
final JpaTenantConfiguration updatedTenantConfiguration = tenantConfigurationRepository
|
||||
.save(tenantConfiguration);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
final Class<T> clazzT = (Class<T>) value.getClass();
|
||||
|
||||
return TenantConfigurationValue.<T> builder().global(false).createdBy(updatedTenantConfiguration.getCreatedBy())
|
||||
|
||||
@@ -11,7 +11,7 @@ package org.eclipse.hawkbit.repository.jpa.cache;
|
||||
import org.eclipse.hawkbit.repository.jpa.model.CacheFieldEntityListener;
|
||||
|
||||
/**
|
||||
* Constants for cache keys used in multiple classes.
|
||||
* RepositoryConstants for cache keys used in multiple classes.
|
||||
*
|
||||
*
|
||||
*
|
||||
|
||||
@@ -842,7 +842,7 @@ public class DeploymentManagementTest extends AbstractJpaIntegrationTest {
|
||||
final DistributionSet ds = testdataFactory.createDistributionSet("a");
|
||||
// assign ds to create an action
|
||||
final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement.assignDistributionSet(
|
||||
ds.getId(), ActionType.SOFT, org.eclipse.hawkbit.repository.model.Constants.NO_FORCE_TIME,
|
||||
ds.getId(), ActionType.SOFT, org.eclipse.hawkbit.repository.model.RepositoryModelConstants.NO_FORCE_TIME,
|
||||
target.getControllerId());
|
||||
final Action action = deploymentManagement.findActionWithDetails(assignDistributionSet.getActions().get(0));
|
||||
// verify preparation
|
||||
@@ -865,7 +865,7 @@ public class DeploymentManagementTest extends AbstractJpaIntegrationTest {
|
||||
final DistributionSet ds = testdataFactory.createDistributionSet("a");
|
||||
// assign ds to create an action
|
||||
final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement.assignDistributionSet(
|
||||
ds.getId(), ActionType.FORCED, org.eclipse.hawkbit.repository.model.Constants.NO_FORCE_TIME,
|
||||
ds.getId(), ActionType.FORCED, org.eclipse.hawkbit.repository.model.RepositoryModelConstants.NO_FORCE_TIME,
|
||||
target.getControllerId());
|
||||
final Action action = deploymentManagement.findActionWithDetails(assignDistributionSet.getActions().get(0));
|
||||
// verify perparation
|
||||
|
||||
@@ -10,7 +10,7 @@ package org.eclipse.hawkbit.repository.util;
|
||||
|
||||
import org.eclipse.hawkbit.ExcludePathAwareShallowETagFilter;
|
||||
import org.eclipse.hawkbit.repository.ArtifactManagement;
|
||||
import org.eclipse.hawkbit.repository.Constants;
|
||||
import org.eclipse.hawkbit.repository.RepositoryConstants;
|
||||
import org.eclipse.hawkbit.repository.ControllerManagement;
|
||||
import org.eclipse.hawkbit.repository.DeploymentManagement;
|
||||
import org.eclipse.hawkbit.repository.DistributionSetManagement;
|
||||
@@ -74,7 +74,7 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
|
||||
* {@link TestdataFactory#findOrCreateDefaultTestDsType()} and two
|
||||
* {@link SystemManagement#getTenantMetadata()};
|
||||
*/
|
||||
protected static final int DEFAULT_DS_TYPES = Constants.DEFAULT_DS_TYPES_IN_TENANT + 1;
|
||||
protected static final int DEFAULT_DS_TYPES = RepositoryConstants.DEFAULT_DS_TYPES_IN_TENANT + 1;
|
||||
|
||||
@Autowired
|
||||
protected EntityFactory entityFactory;
|
||||
|
||||
Reference in New Issue
Block a user