You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/11/11 07:28:28 UTC
[syncope] 03/03: Fixing (one more time) @ConditionalOnMissingBean
used in regular @Configuration class
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 6690009218b47e53063a6e4c8bde1af090eda717
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 11 08:28:06 2019 +0100
Fixing (one more time) @ConditionalOnMissingBean used in regular @Configuration class
---
.../client/console/SyncopeConsoleApplication.java | 76 ++++++++++++++++
.../console/SyncopeIdRepoConsoleContext.java | 101 ---------------------
2 files changed, 76 insertions(+), 101 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 0fda265..9d7c234 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -19,12 +19,30 @@
package org.apache.syncope.client.console;
import com.giffing.wicket.spring.boot.starter.web.config.WicketWebInitializerAutoConfig.WebSocketWicketWebInitializerAutoConfiguration;
+import org.apache.syncope.client.console.commons.AnyDirectoryPanelAditionalActionLinksProvider;
+import org.apache.syncope.client.console.commons.AnyWizardBuilderAdditionalSteps;
+import org.apache.syncope.client.console.commons.ExternalResourceProvider;
+import org.apache.syncope.client.console.commons.IdRepoAnyDirectoryPanelAditionalActionLinksProvider;
+import org.apache.syncope.client.console.commons.IdRepoAnyWizardBuilderAdditionalSteps;
+import org.apache.syncope.client.console.commons.IdRepoExternalResourceProvider;
+import org.apache.syncope.client.console.commons.IdRepoImplementationInfoProvider;
+import org.apache.syncope.client.console.commons.IdRepoPolicyTabProvider;
+import org.apache.syncope.client.console.commons.IdRepoStatusProvider;
+import org.apache.syncope.client.console.commons.IdRepoVirSchemaDetailsPanelProvider;
+import org.apache.syncope.client.console.commons.ImplementationInfoProvider;
+import org.apache.syncope.client.console.commons.PolicyTabProvider;
+import org.apache.syncope.client.console.commons.StatusProvider;
+import org.apache.syncope.client.console.commons.VirSchemaDetailsPanelProvider;
+import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
+import org.apache.syncope.client.console.init.MIMETypesLoader;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
@SpringBootApplication(exclude = {
ErrorMvcAutoConfiguration.class,
@@ -40,4 +58,62 @@ public class SyncopeConsoleApplication extends SpringBootServletInitializer {
builder.properties(WebSocketWicketWebInitializerAutoConfiguration.REGISTER_SERVER_ENDPOINT_ENABLED + "=false");
return super.configure(builder);
}
+
+ @ConditionalOnMissingBean(name = "classPathScanImplementationLookup")
+ @Bean
+ public ClassPathScanImplementationLookup classPathScanImplementationLookup() {
+ ClassPathScanImplementationLookup lookup = new ClassPathScanImplementationLookup();
+ lookup.load();
+ return lookup;
+ }
+
+ @ConditionalOnMissingBean(name = "mimeTypesLoader")
+ @Bean
+ public MIMETypesLoader mimeTypesLoader() {
+ MIMETypesLoader mimeTypesLoader = new MIMETypesLoader();
+ mimeTypesLoader.load();
+ return mimeTypesLoader;
+ }
+
+ @ConditionalOnMissingBean(name = "resourceProvider")
+ @Bean
+ public ExternalResourceProvider resourceProvider() {
+ return new IdRepoExternalResourceProvider();
+ }
+
+ @ConditionalOnMissingBean(name = "anyWizardBuilderAdditionalSteps")
+ @Bean
+ public AnyWizardBuilderAdditionalSteps anyWizardBuilderAdditionalSteps() {
+ return new IdRepoAnyWizardBuilderAdditionalSteps();
+ }
+
+ @ConditionalOnMissingBean(name = "statusProvider")
+ @Bean
+ public StatusProvider statusProvider() {
+ return new IdRepoStatusProvider();
+ }
+
+ @ConditionalOnMissingBean(name = "virSchemaDetailsPanelProvider")
+ @Bean
+ public VirSchemaDetailsPanelProvider virSchemaDetailsPanelProvider() {
+ return new IdRepoVirSchemaDetailsPanelProvider();
+ }
+
+ @ConditionalOnMissingBean(name = "anyDirectoryPanelAditionalActionLinksProvider")
+ @Bean
+ public AnyDirectoryPanelAditionalActionLinksProvider anyDirectoryPanelAditionalActionLinksProvider() {
+ return new IdRepoAnyDirectoryPanelAditionalActionLinksProvider();
+ }
+
+ @ConditionalOnMissingBean(name = "implementationInfoProvider")
+ @Bean
+ public ImplementationInfoProvider implementationInfoProvider() {
+ return new IdRepoImplementationInfoProvider();
+ }
+
+ @ConditionalOnMissingBean(name = "policyTabProvider")
+ @Bean
+ public PolicyTabProvider policyTabProvider() {
+ return new IdRepoPolicyTabProvider();
+ }
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeIdRepoConsoleContext.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeIdRepoConsoleContext.java
deleted file mode 100644
index b38185a..0000000
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeIdRepoConsoleContext.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console;
-
-import org.apache.syncope.client.console.commons.AnyDirectoryPanelAditionalActionLinksProvider;
-import org.apache.syncope.client.console.commons.AnyWizardBuilderAdditionalSteps;
-import org.apache.syncope.client.console.commons.ExternalResourceProvider;
-import org.apache.syncope.client.console.commons.IdRepoAnyDirectoryPanelAditionalActionLinksProvider;
-import org.apache.syncope.client.console.commons.IdRepoAnyWizardBuilderAdditionalSteps;
-import org.apache.syncope.client.console.commons.IdRepoExternalResourceProvider;
-import org.apache.syncope.client.console.commons.IdRepoImplementationInfoProvider;
-import org.apache.syncope.client.console.commons.IdRepoPolicyTabProvider;
-import org.apache.syncope.client.console.commons.IdRepoStatusProvider;
-import org.apache.syncope.client.console.commons.IdRepoVirSchemaDetailsPanelProvider;
-import org.apache.syncope.client.console.commons.ImplementationInfoProvider;
-import org.apache.syncope.client.console.commons.PolicyTabProvider;
-import org.apache.syncope.client.console.commons.StatusProvider;
-import org.apache.syncope.client.console.commons.VirSchemaDetailsPanelProvider;
-import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
-import org.apache.syncope.client.console.init.MIMETypesLoader;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class SyncopeIdRepoConsoleContext {
-
- @ConditionalOnMissingBean(name = "classPathScanImplementationLookup")
- @Bean
- public ClassPathScanImplementationLookup classPathScanImplementationLookup() {
- ClassPathScanImplementationLookup lookup = new ClassPathScanImplementationLookup();
- lookup.load();
- return lookup;
- }
-
- @ConditionalOnMissingBean(name = "mimeTypesLoader")
- @Bean
- public MIMETypesLoader mimeTypesLoader() {
- MIMETypesLoader mimeTypesLoader = new MIMETypesLoader();
- mimeTypesLoader.load();
- return mimeTypesLoader;
- }
-
- @ConditionalOnMissingBean(name = "resourceProvider")
- @Bean
- public ExternalResourceProvider resourceProvider() {
- return new IdRepoExternalResourceProvider();
- }
-
- @ConditionalOnMissingBean(name = "anyWizardBuilderAdditionalSteps")
- @Bean
- public AnyWizardBuilderAdditionalSteps anyWizardBuilderAdditionalSteps() {
- return new IdRepoAnyWizardBuilderAdditionalSteps();
- }
-
- @ConditionalOnMissingBean(name = "statusProvider")
- @Bean
- public StatusProvider statusProvider() {
- return new IdRepoStatusProvider();
- }
-
- @ConditionalOnMissingBean(name = "virSchemaDetailsPanelProvider")
- @Bean
- public VirSchemaDetailsPanelProvider virSchemaDetailsPanelProvider() {
- return new IdRepoVirSchemaDetailsPanelProvider();
- }
-
- @ConditionalOnMissingBean(name = "anyDirectoryPanelAditionalActionLinksProvider")
- @Bean
- public AnyDirectoryPanelAditionalActionLinksProvider anyDirectoryPanelAditionalActionLinksProvider() {
- return new IdRepoAnyDirectoryPanelAditionalActionLinksProvider();
- }
-
- @ConditionalOnMissingBean(name = "implementationInfoProvider")
- @Bean
- public ImplementationInfoProvider implementationInfoProvider() {
- return new IdRepoImplementationInfoProvider();
- }
-
- @ConditionalOnMissingBean(name = "policyTabProvider")
- @Bean
- public PolicyTabProvider policyTabProvider() {
- return new IdRepoPolicyTabProvider();
- }
-}