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:25 UTC
[syncope] branch master updated (c11127b -> 6690009)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from c11127b Fixed wrong properties files location
new 7a4e1c0 Fix import
new 63cf6dc Upgrading Jackson
new 6690009 Fixing (one more time) @ConditionalOnMissingBean used in regular @Configuration class
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../markup/html/list/ConnConfPropertyListView.java | 2 +-
.../client/console/SyncopeConsoleApplication.java | 76 ++++++++++++++++
.../console/SyncopeIdRepoConsoleContext.java | 101 ---------------------
.../wizards/any/AbstractAttrsWizardStep.java | 5 +-
pom.xml | 2 +-
5 files changed, 80 insertions(+), 106 deletions(-)
delete mode 100644 client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeIdRepoConsoleContext.java
[syncope] 03/03: Fixing (one more time) @ConditionalOnMissingBean
used in regular @Configuration class
Posted by il...@apache.org.
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();
- }
-}
[syncope] 01/03: Fix import
Posted by il...@apache.org.
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 7a4e1c0d57104f1c4272319a1da91a547b42a6b7
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Nov 8 13:15:36 2019 +0100
Fix import
---
.../console/wicket/markup/html/list/ConnConfPropertyListView.java | 2 +-
.../syncope/client/console/wizards/any/AbstractAttrsWizardStep.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
index bafd73d..023bb8c 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java
@@ -92,7 +92,7 @@ public class ConnConfPropertyListView extends ListView<ConnConfProperty> {
try {
propertySchemaClass = ClassUtils.getClass(property.getSchema().getType());
if (ClassUtils.isPrimitiveOrWrapper(propertySchemaClass)) {
- propertySchemaClass = org.apache.commons.lang3.ClassUtils.primitiveToWrapper(propertySchemaClass);
+ propertySchemaClass = ClassUtils.primitiveToWrapper(propertySchemaClass);
}
} catch (ClassNotFoundException e) {
LOG.error("Error parsing attribute type", e);
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
index f64f18e..e5eedc9 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrsWizardStep.java
@@ -235,7 +235,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
schemaTO.getLabel(SyncopeConsoleSession.get().getLocale()), new Model<>(), true);
((AjaxDropDownChoicePanel<String>) panel).setChoices(SchemaUtils.getEnumeratedValues(schemaTO));
- if (org.apache.commons.lang3.StringUtils.isNotBlank(schemaTO.getEnumerationKeys())) {
+ if (StringUtils.isNotBlank(schemaTO.getEnumerationKeys())) {
((AjaxDropDownChoicePanel) panel).setChoiceRenderer(new IChoiceRenderer<String>() {
private static final long serialVersionUID = -3724971416312135885L;
@@ -432,7 +432,7 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
? Optional.empty()
: previousObject.getPlainAttr(attr.getSchema());
if (previousObject != null
- && ((prevAttr.isEmpty() && attr.getValues().stream().anyMatch(StringUtils::isNotBlank))
+ && ((!prevAttr.isPresent() && attr.getValues().stream().anyMatch(StringUtils::isNotBlank))
|| (prevAttr.isPresent() && !ListUtils.isEqualList(
prevAttr.get().getValues().stream().
filter(StringUtils::isNotBlank).collect(Collectors.toList()),
@@ -446,5 +446,4 @@ public abstract class AbstractAttrsWizardStep<S extends SchemaTO> extends Wizard
}
}
}
-
}
[syncope] 02/03: Upgrading Jackson
Posted by il...@apache.org.
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 63cf6dcfb68113b0330086832829ee4483d17aa5
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Nov 11 08:08:26 2019 +0100
Upgrading Jackson
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7706b5d..65df279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,7 +401,7 @@ under the License.
<cxf.version>3.3.4</cxf.version>
- <jackson.version>2.10.0</jackson.version>
+ <jackson.version>2.10.1</jackson.version>
<spring.version>5.2.1.RELEASE</spring.version>
<spring-security.version>5.2.1.RELEASE</spring-security.version>