diff --git a/.circleci/run-qa.sh b/.circleci/run-qa.sh index 11cae82f7..f2e2ab63d 100755 --- a/.circleci/run-qa.sh +++ b/.circleci/run-qa.sh @@ -12,7 +12,7 @@ # Run SonarQube only for master branch if [ $CIRCLE_BRANCH = master ] ; then - mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_ACCESS_TOKEN --batch-mode + mvn verify license:check javadoc:javadoc sonar:sonar -Dsonar.login=$SONAR_ACCESS_TOKEN --batch-mode else - mvn verify license:check --batch-mode + mvn verify license:check javadoc:javadoc --batch-mode fi diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java index 72b3fb452..58f31818f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java @@ -38,7 +38,7 @@ public interface FieldNameProvider { * * @param propertyField * the given field - * @return contains contains not + * @return true contains false contains not */ default boolean containsSubEntityAttribute(final String propertyField) { @@ -76,7 +76,7 @@ public interface FieldNameProvider { /** * Is the entity field a {@link Map}. * - * @return is a map is not a map + * @return true is a map false is not a map */ default boolean isMap() { return false; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java index 4142425ae..6f1910f38 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java @@ -374,19 +374,19 @@ public interface ControllerManagement { /** * Retrieves the specified number of messages from action history of the * given {@link Action} based on messageCount. Regardless of the value of - * messageCount, in order to restrict resource utilization by controllers, + * messageCount, in order to restrict resource utilisation by controllers, * maximum number of messages that are retrieved from database is limited by - * {@link RepositoryConstants#MAX_ACTION_HISTORY_MSG_COUNT}. messageCount < - * 0, retrieves the maximum allowed number of action status messages from - * history; messageCount = 0, does not retrieve any message; and - * messageCount > 0, retrieves the specified number of messages, limited by - * maximum allowed number. A controller sends the feedback for an - * {@link ActionStatus} as a list of messages; while returning the messages, - * even though the messages from multiple {@link ActionStatus} are retrieved - * in descending order by the reported time - * ({@link ActionStatus#getOccurredAt()}), i.e. latest ActionStatus first, - * the sub-ordering of messages from within single {@link ActionStatus} is - * unspecified. + * {@link RepositoryConstants#MAX_ACTION_HISTORY_MSG_COUNT}. messageCount + * less then zero, retrieves the maximum allowed number of action status + * messages from history; messageCount equal zero, does not retrieve any + * message; and messageCount larger then zero, retrieves the specified + * number of messages, limited by maximum allowed number. A controller sends + * the feedback for an {@link ActionStatus} as a list of messages; while + * returning the messages, even though the messages from multiple + * {@link ActionStatus} are retrieved in descending order by the reported + * time ({@link ActionStatus#getOccurredAt()}), i.e. latest ActionStatus + * first, the sub-ordering of messages from within single + * {@link ActionStatus} is unspecified. * * @param actionId * to be filtered on diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java index 489647af4..9cfeca446 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java @@ -16,17 +16,11 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule; /** * Thrown if user tries to add a {@link SoftwareModule} to a - * {@link DistributionSet} that is not defined by< the + * {@link DistributionSet} that is not defined by the * {@link DistributionSetType}. - * - * - * - * */ public class UnsupportedSoftwareModuleForThisDistributionSetException extends AbstractServerRtException { - /** - * - */ + private static final long serialVersionUID = 1L; /** diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java index db7945be2..931031603 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java @@ -13,22 +13,22 @@ package org.eclipse.hawkbit.repository.model; * * Supported operators. *
    - *
  • Equal to : ==
    • - *
  • Not equal to : !=
    • - *
  • Less than : =lt= or <
    • - *
  • Less than or equal to : =le= or <=
    • - *
  • Greater than operator : =gt= or >
    • - *
  • Greater than or equal to : =ge= or >=
    • + *
  • {@code Equal to : ==}
    • + *
  • {@code Not equal to : !=}
    • + *
  • {@code Less than : =lt= or <}
    • + *
  • {@code Less than or equal to : =le= or <=}
    • + *
  • {@code Greater than operator : =gt= or >}
    • + *
  • {@code Greater than or equal to : =ge= or >=}
    • *
* Examples of RSQL expressions in both FIQL-like and alternative notation: *
    - *
  • version==2.0.0
    • - *
  • name==targetId1;description==plugAndPlay
    • - *
  • name==targetId1 and description==plugAndPlay
    • - *
  • name==targetId1;description==plugAndPlay
    • - *
  • name==targetId1 and description==plugAndPlay
    • - *
  • name==targetId1,description==plugAndPlay,updateStatus==UNKNOWN
    • - *
  • name==targetId1 or description==plugAndPlay or updateStatus==UNKNOWN
    • + *
  • {@code version==2.0.0}
    • + *
  • {@code name==targetId1;description==plugAndPlay}
    • + *
  • {@code name==targetId1 and description==plugAndPlay}
    • + *
  • {@code name==targetId1;description==plugAndPlay}
    • + *
  • {@code name==targetId1 and description==plugAndPlay}
    • + *
  • {@code name==targetId1,description==plugAndPlay,updateStatus==UNKNOWN}
    • + *
  • {@code name==targetId1 or description==plugAndPlay or updateStatus==UNKNOWN}
    • *
* */ diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java index d2d99a0aa..8824a01dd 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java @@ -431,7 +431,7 @@ public interface ActionRepository extends BaseEntityRepository, * @param pageable * page parameters * @param rolloutId - * the rollout the actions beglong to + * the rollout the actions belong to * @param actionStatus * the status of the actions * @return the actions referring a specific rollout an in a specific status diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/EntityInterceptor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/EntityInterceptor.java similarity index 65% rename from hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/EntityInterceptor.java rename to hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/EntityInterceptor.java index 9ed069c66..3854736d7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/EntityInterceptor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/EntityInterceptor.java @@ -6,77 +6,85 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.hawkbit.repository.model; +package org.eclipse.hawkbit.repository.jpa; + +import javax.persistence.PostLoad; +import javax.persistence.PostPersist; +import javax.persistence.PostRemove; +import javax.persistence.PostUpdate; +import javax.persistence.PrePersist; +import javax.persistence.PreRemove; +import javax.persistence.PreUpdate; /** * Interface for the entity interceptor lifecycle. */ // Exception squid:EmptyStatementUsageCheck - don't want to force users to -// impelemnt all methods +// implement all methods @SuppressWarnings("squid:EmptyStatementUsageCheck") public interface EntityInterceptor { /** - * Callback for the {@link @PrePersist} lifecycle event. + * Callback for the {@link PrePersist} lifecycle event. * * @param entity * the model entity */ default void prePersist(final Object entity) { - }; + } /** - * Callback for the {@link @PostPersist} lifecycle event. + * Callback for the {@link PostPersist} lifecycle event. * * @param entity * the model entity */ default void postPersist(final Object entity) { - }; + } /** - * Callback for the {@link @PostRemove} lifecycle event. + * Callback for the {@link PostRemove} lifecycle event. * * @param entity * the model entity */ default void postRemove(final Object entity) { - }; + } /** - * Callback for the {@link @PreRemove} lifecycle event. + * Callback for the {@link PreRemove} lifecycle event. * * @param entity * the model entity */ default void preRemove(final Object entity) { - }; + } /** - * Callback for the {@link @PostLoad} lifecycle event. + * Callback for the {@link PostLoad} lifecycle event. * * @param entity * the model entity */ default void postLoad(final Object entity) { - }; + } /** - * Callback for the {@link @PreUpdate} lifecycle event. + * Callback for the {@link PreUpdate} lifecycle event. * * @param entity * the model entity */ default void preUpdate(final Object entity) { - }; + } /** - * Callback for the {@link @PostUpdate} lifecycle event. + * Callback for the {@link PostUpdate} lifecycle event. * * @param entity * the model entity */ default void postUpdate(final Object entity) { - }; + } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java index 75f1411ef..68f2e8ae6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java @@ -18,8 +18,8 @@ import javax.persistence.PrePersist; import javax.persistence.PreRemove; import javax.persistence.PreUpdate; +import org.eclipse.hawkbit.repository.jpa.EntityInterceptor; import org.eclipse.hawkbit.repository.jpa.model.helper.EntityInterceptorHolder; -import org.eclipse.hawkbit.repository.model.EntityInterceptor; /** * Entity listener which calls the callback's of all registered entity diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java index c374f219a..4d912d31a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java @@ -11,7 +11,7 @@ package org.eclipse.hawkbit.repository.jpa.model.helper; import java.util.ArrayList; import java.util.List; -import org.eclipse.hawkbit.repository.model.EntityInterceptor; +import org.eclipse.hawkbit.repository.jpa.EntityInterceptor; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java index 94bbf7845..9e176b256 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java @@ -65,21 +65,21 @@ import cz.jirutka.rsql.parser.ast.RSQLVisitor; * entities. RSQL parser library: https://github.com/jirutka/rsql-parser * *
    - *
  • Equal to : ==
    • - *
  • Not equal to : !=
    • - *
  • Less than : =lt= or <
    • - *
  • Less than or equal to : =le= or <=
    • - *
  • Greater than operator : =gt= or >
    • - *
  • Greater than or equal to : =ge= or >=
    • + *
  • {@code Equal to : ==}
    • + *
  • {@code Not equal to : !=}
    • + *
  • {@code Less than : =lt= or <}
    • + *
  • {@code Less than or equal to : =le= or <=}
    • + *
  • {@code Greater than operator : =gt= or >}
    • + *
  • {@code Greater than or equal to : =ge= or >=}
    • *
*

* Examples of RSQL expressions in both FIQL-like and alternative notation: *

    - *
  • version==2.0.0
    • - *
  • name==targetId1;description==plugAndPlay
    • - *
  • name==targetId1 and description==plugAndPlay
    • - *
  • name==targetId1,description==plugAndPlay,updateStatus==UNKNOWN
    • - *
  • name==targetId1 or description==plugAndPlay or updateStatus==UNKNOWN
    • + *
  • {@code version==2.0.0}
    • + *
  • {@code name==targetId1;description==plugAndPlay}
    • + *
  • {@code name==targetId1 and description==plugAndPlay}
    • + *
  • {@code name==targetId1,description==plugAndPlay,updateStatus==UNKNOWN}
    • + *
  • {@code name==targetId1 or description==plugAndPlay or updateStatus==UNKNOWN}
    • *
*

* There is also a mechanism that allows to refer to known macros that can diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java index 0a8306faa..420a785c7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java @@ -52,7 +52,7 @@ public final class DistributionSetTypeSpecification { /** * {@link Specification} for retrieving {@link DistributionSetType} with - * given {@link DistributionSetType#getName())} including fetching the + * given {@link DistributionSetType#getName()} including fetching the * elements list. * * @param name diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java index 6d57b044c..5ed91f17b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java @@ -11,8 +11,8 @@ package org.eclipse.hawkbit.repository.jpa.model; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.hawkbit.repository.jpa.AbstractJpaIntegrationTest; +import org.eclipse.hawkbit.repository.jpa.EntityInterceptor; import org.eclipse.hawkbit.repository.jpa.model.helper.EntityInterceptorHolder; -import org.eclipse.hawkbit.repository.model.EntityInterceptor; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; import org.eclipse.hawkbit.repository.model.Target; import org.junit.After; diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java index dc4cf724a..5dcf1f9ee 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java @@ -104,19 +104,19 @@ public class TestdataFactory { public static final String DS_TYPE_DEFAULT = "test_default_ds_type"; /** - * Key of test "os" {@link SoftwareModuleType} -> mandatory firmware in + * Key of test "os" {@link SoftwareModuleType} : mandatory firmware in * {@link #DS_TYPE_DEFAULT}. */ public static final String SM_TYPE_OS = "os"; /** - * Key of test "runtime" {@link SoftwareModuleType} -> optional firmware in + * Key of test "runtime" {@link SoftwareModuleType} : optional firmware in * {@link #DS_TYPE_DEFAULT}. */ public static final String SM_TYPE_RT = "runtime"; /** - * Key of test "application" {@link SoftwareModuleType} -> optional software + * Key of test "application" {@link SoftwareModuleType} : optional software * in {@link #DS_TYPE_DEFAULT}. */ public static final String SM_TYPE_APP = "application"; @@ -466,9 +466,8 @@ public class TestdataFactory { for (int i = 0; i < 3; i++) { final String artifactData = "some test data" + i; final InputStream stubInputStream = IOUtils.toInputStream(artifactData, Charset.forName("UTF-8")); - artifacts.add( - artifactManagement.create(new ArtifactUpload(stubInputStream, moduleId, "filename" + i, false, - artifactData.length()))); + artifacts.add(artifactManagement.create( + new ArtifactUpload(stubInputStream, moduleId, "filename" + i, false, artifactData.length()))); } diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithUser.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithUser.java index a2a3fcf9c..ace8a82f4 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithUser.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithUser.java @@ -47,7 +47,7 @@ public @interface WithUser { /** * Should tenant auto created. * - * @return = auto create not create + * @return true = auto create false not create */ boolean autoCreateTenant() default true; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java index d6c518ce4..7b759c773 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java @@ -143,11 +143,12 @@ public interface DdiRootControllerRestApi { * resource utilization by controllers, maximum number of * messages that are retrieved from database is limited by * {@link RepositoryConstants#MAX_ACTION_HISTORY_MSG_COUNT}. - * actionHistoryMessageCount < 0, retrieves the maximum allowed - * number of action status messages from history; - * actionHistoryMessageCount = 0, does not retrieve any message; - * and actionHistoryMessageCount > 0, retrieves the specified - * number of messages, limited by maximum allowed number. + * actionHistoryMessageCount less then zero, retrieves the + * maximum allowed number of action status messages from history; + * actionHistoryMessageCount equal to zero, does not retrieve any + * message; and actionHistoryMessageCount greater then zero, + * retrieves the specified number of messages, limited by maximum + * allowed number. * @param request * the HTTP request injected by spring * @return the response diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java index 621610dd7..10f248c48 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java @@ -26,12 +26,13 @@ import org.springframework.security.core.GrantedAuthority; *

* *

- * The Permissions cover CRUD for two data areas of SP:
- *
+ * The Permissions cover CRUD for two data areas: + * * XX_Target_CRUD which covers the following entities: {@link Target} entities - * including metadata, {@link TargetTag}s, {@link TargetRegistrationRule}s
+ * including metadata, {@link TargetTag}s, {@link TargetRegistrationRule}s * XX_Repository CRUD which covers: {@link DistributionSet}s, - * {@link SoftwareModule}s, DS Tags
+ * {@link SoftwareModule}s, DS Tags + *

*/ public final class SpPermission { @@ -179,11 +180,14 @@ public final class SpPermission { } /** + *

* Contains all the spring security evaluation expressions for the * {@link PreAuthorize} annotation for method security. - *

+ *

+ * + *

* Examples: - *

+ * * {@code * hasRole([role]) Returns true if the current principal has the specified role. * hasAnyRole([role1,role2]) Returns true if the current principal has any of the supplied roles (given as a comma-separated list of strings) @@ -196,7 +200,7 @@ public final class SpPermission { * isAuthenticated() Returns true if the user is not anonymous * isFullyAuthenticated() Returns true if the user is not an anonymous or a remember-me user * } - * + *

*/ public static final class SpringEvalExpressions { /* diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenticationFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenticationFilter.java index fe8b6da95..eb55b1fc3 100644 --- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenticationFilter.java +++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenticationFilter.java @@ -22,17 +22,15 @@ public interface PreAuthenticationFilter { /** * Check if the filter is enabled. * - * @param secruityToken - * the secruity info - * @return is enabled diabled + * @param secruityToken the secruity info + * @return true is enabled false diabled */ boolean isEnable(DmfTenantSecurityToken secruityToken); /** * Extract the principal information from the current secruityToken. * - * @param secruityToken - * the secruityToken + * @param secruityToken the secruityToken * @return the extracted tenant and controller id */ HeaderAuthentication getPreAuthenticatedPrincipal(DmfTenantSecurityToken secruityToken); @@ -40,18 +38,16 @@ public interface PreAuthenticationFilter { /** * Extract the principal credentials from the current secruityToken. * - * @param secruityToken - * the secruityToken + * @param secruityToken the secruityToken * @return the extracted tenant and controller id */ Object getPreAuthenticatedCredentials(DmfTenantSecurityToken secruityToken); /** - * Allows to add additional authorities to the successful authenticated - * token. + * Allows to add additional authorities to the successful authenticated token. * - * @return the authorities granted to the principal, or an empty collection - * if the token has not been authenticated. Never null. + * @return the authorities granted to the principal, or an empty collection if + * the token has not been authenticated. Never null. * @see Authentication#getAuthorities() */ default Collection getSuccessfulAuthenticationAuthorities() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java index afa1ed22d..dfb2f8777 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java @@ -85,7 +85,8 @@ public abstract class AbstractHawkbitUI extends UI implements DetachListener { protected AbstractHawkbitUI(final EventPushStrategy pushStrategy, final UIEventBus eventBus, final SpringViewProvider viewProvider, final ApplicationContext context, final DashboardMenu dashboardMenu, - final ErrorView errorview, final NotificationUnreadButton notificationUnreadButton, final UiProperties uiProperties) { + final ErrorView errorview, final NotificationUnreadButton notificationUnreadButton, + final UiProperties uiProperties) { this.pushStrategy = pushStrategy; this.eventBus = eventBus; this.viewProvider = viewProvider; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java index 5b7f34aef..15f290a71 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java @@ -27,7 +27,7 @@ public class SpPermissionChecker implements Serializable { } /** - * Gets the read Target & Dist Permission. + * Gets the read Target and repository Permission. * * @return TARGET_REPOSITORY_READ boolean value */ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java index 071dcc805..4caf8f3a1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java @@ -43,8 +43,6 @@ public class UiProperties implements Serializable { this.gravatar = gravatar; } - - /** * Localization information */ @@ -57,7 +55,7 @@ public class UiProperties implements Serializable { private String defaultLocal = "en"; /** - * List of available localizations + * List of available localizations */ private List availableLocals = Collections.singletonList("en"); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java index 027f91cb7..b215ba8af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java @@ -89,7 +89,7 @@ public class FileTransferHandlerVaadinUpload extends AbstractFileTransferHandler fileUploadId); interruptUploadDueToIllegalFilename(); event.getUpload().interruptUpload(); - }else if (isFileAlreadyContainedInSoftwareModule(fileUploadId, softwareModule)) { + } else if (isFileAlreadyContainedInSoftwareModule(fileUploadId, softwareModule)) { LOG.info("File {} already contained in Software Module {}", fileUploadId.getFilename(), softwareModule); interruptUploadDueToDuplicateFile(); event.getUpload().interruptUpload(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerHelper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerHelper.java index 3749dbae3..cc208beee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerHelper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerHelper.java @@ -42,7 +42,7 @@ public final class ColorPickerHelper { } /** - * Covert RGB code to {@Color}. + * Covert RGB code to {@link Color}. * * @param value * RGB vale diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java index 7aa454aaa..8df39a88e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java @@ -61,8 +61,7 @@ import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; * M is the metadata * */ -public abstract class AbstractMetadataPopupLayout - extends CustomComponent { +public abstract class AbstractMetadataPopupLayout extends CustomComponent { private static final String DELETE_BUTTON = "DELETE_BUTTON"; @@ -136,13 +135,13 @@ public abstract class AbstractMetadataPopupLayout onCancel()) + metadataWindow = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(getMetadataCaption()) + .content(this).cancelButtonClickListener(event -> onCancel()) .id(UIComponentIdProvider.METADATA_POPUP_ID).layout(mainLayout).i18n(i18n) .saveDialogCloseListener(new SaveOnDialogCloseListener()).buildCommonDialogWindow(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index d38a6826f..73821c5d0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -554,22 +554,24 @@ public class CommonDialogWindow extends Window { /** * Checks if the safe action can executed. * - * @return = save action can executed = cannot execute - * safe action . + * @return true = save action can executed + * false = cannot execute safe action . */ boolean canWindowSaveOrUpdate(); /** * Checks if the window can closed after the safe action is executed * - * @return = window will close = will not closed. + * @return true = window will close false = + * will not closed. */ default boolean canWindowClose() { return true; } /** - * Saves/Updates action. Is called if canWindowSaveOrUpdate is . + * Saves/Updates action. Is called if canWindowSaveOrUpdate is + * true. * */ void saveOrUpdate(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java index 5f78c1924..e24da63b8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java @@ -37,9 +37,8 @@ public final class UserDetailsFormatter { /** * Load user details by the user name and format the user name to max 100 - * characters. - * - * @see {@link UserDetailsFormatter#loadAndFormatUsername(String, int)} + * characters. See + * {@link UserDetailsFormatter#loadAndFormatUsername(String, int)}. * * @param username * the user name diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java index 7196db02d..de77fd50e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetMetadataDetailsLayout.java @@ -44,8 +44,7 @@ public class TargetMetadataDetailsLayout extends AbstractMetadataDetailsLayout { * @param targetMetadataPopupLayout * the target metadata popup layout */ - public TargetMetadataDetailsLayout(final VaadinMessageSource i18n, - final TargetManagement targetManagement, + public TargetMetadataDetailsLayout(final VaadinMessageSource i18n, final TargetManagement targetManagement, final TargetMetadataPopupLayout targetMetadataPopupLayout) { super(i18n); this.targetManagement = targetManagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java index 9c1cc268e..18a1de6cc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java @@ -291,53 +291,53 @@ public abstract class AbstractGrid extends Grid implements Re } /** - * Template method invoked by {@link this#addNewContainerDS()} for creating - * a container instance. + * Template method invoked by {@link #addNewContainerDS()} for creating a + * container instance. * * @return new container instance used by the grid. */ protected abstract T createContainer(); /** - * Template method invoked by {@link this#addNewContainerDS()} for adding + * Template method invoked by {@link #addNewContainerDS()} for adding * properties to the container (usually by invoking { @link * Container#addContainerProperty(Object, Class, Object))}) */ protected abstract void addContainerProperties(); /** - * Template method invoked by {@link this#addNewContainerDS()} for setting - * the expand ratio of the columns. + * Template method invoked by {@link #addNewContainerDS()} for setting the + * expand ratio of the columns. */ protected abstract void setColumnExpandRatio(); /** - * Template method invoked by {@link this#addNewContainerDS()} for setting - * the column names. + * Template method invoked by {@link #addNewContainerDS()} for setting the + * column names. */ protected abstract void setColumnHeaderNames(); /** - * Template method invoked by {@link this#addNewContainerDS()} for setting - * the column properties to the grid. + * Template method invoked by {@link #addNewContainerDS()} for setting the + * column properties to the grid. */ protected abstract void setColumnProperties(); /** - * Template method invoked by {@link this#addNewContainerDS()} for adding + * Template method invoked by {@link #addNewContainerDS()} for adding * special column renderers if needed. */ protected abstract void addColumnRenderes(); /** - * Template method invoked by {@link this#addNewContainerDS()} that hides - * columns. If a column is hidable and hidden, it can be made visible via + * Template method invoked by {@link #addNewContainerDS()} that hides + * columns. If a column is hideable and hidden, it can be made visible via * grid column menu. */ protected abstract void setHiddenColumns(); /** - * Template method invoked by {@link this#addNewContainerDS()} for adding a + * Template method invoked by {@link #addNewContainerDS()} for adding a * CellDescriptionGenerator to the grid. */ protected abstract CellDescriptionGenerator getDescriptionGenerator(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java index fe3533b2f..eed96ada4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java @@ -236,8 +236,8 @@ public final class SPUIComponentProvider { } /** - * Create label which represents the - * {@link BaseEntity#getLastModifiedBy()()} by user name + * Create label which represents the {@link BaseEntity#getLastModifiedBy()} + * by user name * * @param i18n * the i18n diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 349628b04..cc5159640 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -244,9 +244,8 @@ public class DistributionSetTable extends AbstractNamedVersionTable new SoftwareModuleIdName[size])); + openConfirmationWindowForAssignment(ds.getName(), softwareModules.stream().map(SoftwareModuleIdName::new) + .toArray(size -> new SoftwareModuleIdName[size])); }); } @@ -256,7 +255,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable softwareModule = softwareModuleManagement.get(softwareModuleId); softwareModule.ifPresent(sm -> { - if (validateAssignment(sm, distributionSet)){ + if (validateAssignment(sm, distributionSet)) { assignableModules.add(sm); } }); @@ -269,15 +268,13 @@ public class DistributionSetTable extends AbstractNamedVersionTable softwareModulesThatNeedToBeAssigned = new HashSet<>(); - getConsolidatedAssignmentMap(distributionSet).values() - .forEach(softwareModulesThatNeedToBeAssigned::addAll); + getConsolidatedAssignmentMap(distributionSet).values().forEach(softwareModulesThatNeedToBeAssigned::addAll); manageDistUIState.getAssignedList().put(new DistributionSetIdName(distributionSet), softwareModulesThatNeedToBeAssigned); } - private Map> getConsolidatedAssignmentMap( - final DistributionSet distributionSet) { + private Map> getConsolidatedAssignmentMap(final DistributionSet distributionSet) { final DistributionSetIdName distributionSetIdName = new DistributionSetIdName(distributionSet); final Map> map; if (manageDistUIState.getConsolidatedDistSoftwareList().containsKey(distributionSetIdName)) { @@ -358,8 +355,8 @@ public class DistributionSetTable extends AbstractNamedVersionTable> entry : manageDistUIState - .getAssignedList().entrySet()) { + for (final Entry> entry : manageDistUIState.getAssignedList() + .entrySet()) { count += entry.getValue().size(); } @@ -378,7 +375,6 @@ public class DistributionSetTable extends AbstractNamedVersionTable 0) { + if (targetManagement.countByFilters(null, null, null, ds.getId(), Boolean.FALSE, new String[] {}) > 0) { /* Distribution is already assigned */ - getNotification().displayValidationError(getI18n().getMessage("message.dist.inuse", - dsNameAndVersion)); + getNotification().displayValidationError(getI18n().getMessage("message.dist.inuse", dsNameAndVersion)); return false; } if (ds.getModules().contains(sm)) { /* Already has software module */ - getNotification().displayValidationError(getI18n().getMessage("message.software.dist.already.assigned", - smNameAndVersion, dsNameAndVersion)); + getNotification().displayValidationError( + getI18n().getMessage("message.software.dist.already.assigned", smNameAndVersion, dsNameAndVersion)); return false; } if (!ds.getType().containsModuleType(sm.getType())) { @@ -408,17 +402,16 @@ public class DistributionSetTable extends AbstractNamedVersionTable> entry : manageDistUIState - .getAssignedList().entrySet()) { + for (final Entry> entry : manageDistUIState.getAssignedList() + .entrySet()) { if (!distId.equals(entry.getKey().getId())) { continue; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java index 5a89c4f61..59b3f6607 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java @@ -32,7 +32,8 @@ import com.vaadin.ui.VerticalLayout; /** * Pop up layout to display software module metadata. */ -public class SwMetadataPopupLayout extends AbstractMetadataPopupLayoutVersioned { +public class SwMetadataPopupLayout + extends AbstractMetadataPopupLayoutVersioned { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java index 8368e9368..cafe56335 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java @@ -186,7 +186,8 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button saveButton = createSaveButton(); searchIcon = createSearchIcon(); - helpLink = SPUIComponentProvider.getHelpLink(i18n, uiProperties.getLinks().getDocumentation().getTargetfilterView()); + helpLink = SPUIComponentProvider.getHelpLink(i18n, + uiProperties.getLinks().getDocumentation().getTargetfilterView()); closeIcon = createSearchResetIcon(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java index 7094dc432..fa02e9dc6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java @@ -144,8 +144,8 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent { progressBar = creatreProgressBar(); targetsCountLabel = getStatusCountLabel(); bulkUploader = getBulkUploadHandler(); - linkToSystemConfigHelp = SPUIComponentProvider - .getHelpLink(i18n, uiproperties.getLinks().getDocumentation().getDeploymentView()); + linkToSystemConfigHelp = SPUIComponentProvider.getHelpLink(i18n, + uiproperties.getLinks().getDocumentation().getDeploymentView()); windowCaption = new Label(i18n.getMessage("caption.bulk.upload.targets")); minimizeButton = getMinimizeButton(); closeButton = getCloseButton(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java index ed8158e20..354aed7a1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java @@ -57,7 +57,7 @@ public class TargetDetails extends AbstractTableDetailsLayout { private static final long serialVersionUID = 1L; private final TargetTagToken targetTagToken; - + private final TargetMetadataDetailsLayout targetMetadataTable; private final TargetAddUpdateWindowLayout targetAddUpdateWindowLayout; @@ -84,14 +84,12 @@ public class TargetDetails extends AbstractTableDetailsLayout { this.targetTagToken = new TargetTagToken(permissionChecker, i18n, uiNotification, eventBus, managementUIState, tagManagement, targetManagement); this.targetAddUpdateWindowLayout = new TargetAddUpdateWindowLayout(i18n, targetManagement, eventBus, - uiNotification, - entityFactory, targetTable); + uiNotification, entityFactory, targetTable); this.uiNotification = uiNotification; this.targetManagement = targetManagement; this.deploymentManagement = deploymentManagement; this.targetMetadataPopupLayout = targetMetadataPopupLayout; - this.targetMetadataTable = new TargetMetadataDetailsLayout(i18n, targetManagement, - targetMetadataPopupLayout); + this.targetMetadataTable = new TargetMetadataDetailsLayout(i18n, targetManagement, targetMetadataPopupLayout); addDetailsTab(); restoreState(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetadataPopupLayout.java index 7e3a9d27d..baad6b186 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetadataPopupLayout.java @@ -49,10 +49,8 @@ public class TargetMetadataPopupLayout extends AbstractMetadataPopupLayout { eventBus, targetManagement, entityFactory, permissionChecker); this.eventBus = eventBus; this.targetDetails = new TargetDetails(i18n, eventBus, permissionChecker, managementUIState, uiNotification, - tagManagement, targetManagement, targetMetadataPopupLayout, deploymentManagement, entityFactory, targetTable); + tagManagement, targetManagement, targetMetadataPopupLayout, deploymentManagement, entityFactory, + targetTable); this.targetTableHeader = new TargetTableHeader(i18n, permissionChecker, eventBus, uiNotification, managementUIState, managementViewClientCriterion, targetManagement, deploymentManagement, uiProperties, entityFactory, uiNotification, tagManagement, distributionSetManagement, uiExecutor, targetTable); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java index dbfe61c93..6d5aba757 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java @@ -310,8 +310,8 @@ public final class DashboardMenu extends CustomComponent { /** * Is a View available. * - * @return the accessibleViewsEmpty no rights for any view a - * view is available + * @return the accessibleViewsEmpty true no rights for any view + * false a view is available */ public boolean isAccessibleViewsEmpty() { return accessibleViewsEmpty; @@ -352,7 +352,7 @@ public final class DashboardMenu extends CustomComponent { * * @param viewName * the view name - * @return = denied, = accessible + * @return true = denied, false = accessible */ public boolean isAccessDenied(final String viewName) { final List accessibleViews = getAccessibleViews(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java index 85c2531ad..2a2fd98a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java @@ -1107,8 +1107,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout { private enum ERROR_THRESHOLD_OPTIONS { - PERCENT("label.errorthreshold.option.percent"), - COUNT("label.errorthreshold.option.count"); + PERCENT("label.errorthreshold.option.percent"), COUNT("label.errorthreshold.option.count"); private final String value; @@ -1117,7 +1116,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout { } private String getValue(final VaadinMessageSource i18n) { - return i18n.getMessage(value); + return i18n.getMessage(value); } } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java index 7a1b0fa55..b8c23e03b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java @@ -128,8 +128,8 @@ public class AuthenticationConfigurationView extends BaseConfigurationView gridLayout.addComponent(downloadAnonymousCheckBox, 0, 3); gridLayout.addComponent(anonymousDownloadAuthenticationConfigurationItem, 1, 3); - final Link linkToSecurityHelp = SPUIComponentProvider - .getHelpLink(i18n, uiProperties.getLinks().getDocumentation().getSecurity()); + final Link linkToSecurityHelp = SPUIComponentProvider.getHelpLink(i18n, + uiProperties.getLinks().getDocumentation().getSecurity()); gridLayout.addComponent(linkToSecurityHelp, 2, 3); gridLayout.setComponentAlignment(linkToSecurityHelp, Alignment.BOTTOM_RIGHT); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java index d14f46058..85e6d1eb5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java @@ -73,8 +73,8 @@ public class RolloutConfigurationView extends BaseConfigurationView hLayout.addComponent(approvalCheckbox); hLayout.addComponent(approvalConfigurationItem); - final Link linkToApprovalHelp = SPUIComponentProvider - .getHelpLink(i18n, uiProperties.getLinks().getDocumentation().getRollout()); + final Link linkToApprovalHelp = SPUIComponentProvider.getHelpLink(i18n, + uiProperties.getLinks().getDocumentation().getRollout()); hLayout.addComponent(linkToApprovalHelp); hLayout.setComponentAlignment(linkToApprovalHelp, Alignment.BOTTOM_RIGHT); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java index 0e61d15c9..a6477fe46 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java @@ -153,8 +153,8 @@ public class TenantConfigurationDashboardView extends CustomComponent implements undoConfigurationBtn.addClickListener(event -> undoConfiguration()); hlayout.addComponent(undoConfigurationBtn); - final Link linkToSystemConfigHelp = SPUIComponentProvider - .getHelpLink(i18n, uiProperties.getLinks().getDocumentation().getSystemConfigurationView()); + final Link linkToSystemConfigHelp = SPUIComponentProvider.getHelpLink(i18n, + uiProperties.getLinks().getDocumentation().getSystemConfigurationView()); hlayout.addComponent(linkToSystemConfigHelp); return hlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java index a443ddb9c..f5161ddf0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java @@ -143,7 +143,7 @@ public class DurationField extends DateField { * Sets the duration value * * @param duration - * duration, only values <= 23:59:59 are excepted + * duration, only values less then 23:59:59 are excepted */ public void setDuration(@NotNull final Duration duration) { if (duration.compareTo(MAXIMUM_DURATION) > 0) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java index 338f7f248..ce84dcd33 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java @@ -134,7 +134,7 @@ public final class SPUILabelDefinitions { */ public static final String AUTO_ASSIGN_DISTRIBUTION_SET = "autoAssignDistributionSet"; /** - * ASSIGNED DISTRIBUTION Name & Version. + * ASSIGNED DISTRIBUTION Name and Version. */ public static final String ASSIGNED_DISTRIBUTION_NAME_VER = "assignedDistNameVersion"; @@ -144,7 +144,7 @@ public final class SPUILabelDefinitions { public static final String INSTALLED_DISTRIBUTION_ID = "installedDistributionSet.id"; /** - * INSTALLED DISTRIBUTION Name & Version. + * INSTALLED DISTRIBUTION Name and Version. */ public static final String INSTALLED_DISTRIBUTION_NAME_VER = "installedDistNameVersion"; diff --git a/pom.xml b/pom.xml index 1427b63d4..484757df8 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 5.0.5 1.8.3 2.7.0 - 2.7.3 + 2.7.4 1.1.8 1.0.2 25.0-jre @@ -302,6 +302,14 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + syntax + + + com.mycila license-maven-plugin @@ -313,7 +321,7 @@ licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt licenses/LICENSE_HEADER_TEMPLATE_BOSCH.txt licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_18.txt - licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt + licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt **/README @@ -490,11 +498,15 @@ - + org.sonatype.plugins nexus-staging-maven-plugin 1.6.7