diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java index 820b233ae..5c9440957 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java @@ -203,90 +203,166 @@ public class RepositoryApplicationConfiguration extends JpaBaseConfiguration { return new MultiTenantJpaTransactionManager(); } + /** + * {@link JpaSystemManagement} bean. + * + * @return a new {@link SystemManagement} + */ @Bean @ConditionalOnMissingBean public SystemManagement systemManagement() { return new JpaSystemManagement(); } + /** + * {@link JpaReportManagement} bean. + * + * @return a new {@link ReportManagement} + */ @Bean @ConditionalOnMissingBean public ReportManagement reportManagement() { return new JpaReportManagement(); } + /** + * {@link JpaDistributionSetManagement} bean. + * + * @return a new {@link DistributionSetManagement} + */ @Bean @ConditionalOnMissingBean public DistributionSetManagement distributionSetManagement() { return new JpaDistributionSetManagement(); } + /** + * {@link JpaTenantStatsManagement} bean. + * + * @return a new {@link TenantStatsManagement} + */ @Bean @ConditionalOnMissingBean public TenantStatsManagement tenantStatsManagement() { return new JpaTenantStatsManagement(); } + /** + * {@link JpaTenantConfigurationManagement} bean. + * + * @return a new {@link TenantConfigurationManagement} + */ @Bean @ConditionalOnMissingBean public TenantConfigurationManagement tenantConfigurationManagement() { return new JpaTenantConfigurationManagement(); } + /** + * {@link JpaTenantConfigurationManagement} bean. + * + * @return a new {@link TenantConfigurationManagement} + */ @Bean @ConditionalOnMissingBean public TargetManagement targetManagement() { return new JpaTargetManagement(); } + /** + * {@link JpaTargetFilterQueryManagement} bean. + * + * @return a new {@link TargetFilterQueryManagement} + */ @Bean @ConditionalOnMissingBean public TargetFilterQueryManagement targetFilterQueryManagement() { return new JpaTargetFilterQueryManagement(); } + /** + * {@link JpaTagManagement} bean. + * + * @return a new {@link TagManagement} + */ @Bean @ConditionalOnMissingBean public TagManagement tagManagement() { return new JpaTagManagement(); } + /** + * {@link JpaSoftwareManagement} bean. + * + * @return a new {@link SoftwareManagement} + */ @Bean @ConditionalOnMissingBean public SoftwareManagement softwareManagement() { return new JpaSoftwareManagement(); } + /** + * {@link JpaRolloutManagement} bean. + * + * @return a new {@link RolloutManagement} + */ @Bean @ConditionalOnMissingBean public RolloutManagement rolloutManagement() { return new JpaRolloutManagement(); } + /** + * {@link JpaRolloutGroupManagement} bean. + * + * @return a new {@link RolloutGroupManagement} + */ @Bean @ConditionalOnMissingBean public RolloutGroupManagement rolloutGroupManagement() { return new JpaRolloutGroupManagement(); } + /** + * {@link JpaDeploymentManagement} bean. + * + * @return a new {@link DeploymentManagement} + */ @Bean @ConditionalOnMissingBean public DeploymentManagement deploymentManagement() { return new JpaDeploymentManagement(); } + /** + * {@link JpaControllerManagement} bean. + * + * @return a new {@link ControllerManagement} + */ @Bean @ConditionalOnMissingBean public ControllerManagement controllerManagement() { return new JpaControllerManagement(); } + /** + * {@link JpaArtifactManagement} bean. + * + * @return a new {@link ArtifactManagement} + */ + @Bean @ConditionalOnMissingBean public ArtifactManagement artifactManagement() { return new JpaArtifactManagement(); } + /** + * {@link JpaEntityFactory} bean. + * + * @return a new {@link EntityFactory} + */ @Bean @ConditionalOnMissingBean public EntityFactory entityFactory() { diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java index 783d5344c..472e32493 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java @@ -25,7 +25,7 @@ public class SpringSecurityAuditorAware implements AuditorAware { final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (isAuthentifactionInvalid(authentication)) { + if (isAuthenticationInvalid(authentication)) { return null; } @@ -39,7 +39,7 @@ public class SpringSecurityAuditorAware implements AuditorAware { return authentication.getPrincipal().toString(); } - private static boolean isAuthentifactionInvalid(final Authentication authentication) { + private static boolean isAuthenticationInvalid(final Authentication authentication) { return authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal() == null; } }