You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/01/17 08:30:47 UTC
[syncope] branch master updated (50af303 -> d4afae9)
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 50af303 Upgrading Spring Boot and Hibernate Validator
new 302c1fb analysis: minor fixes to typos in docs/logs
new 648c607 fix parameter placeholders for log messages
new d4afae9 add group key to toString()
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:
.../java/org/apache/syncope/client/console/status/ReconTaskPanel.java | 3 ++-
.../syncope/client/console/panels/TypeExtensionDirectoryPanel.java | 4 ++--
.../syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java | 2 +-
.../markup/html/repeater/data/table/BatchResponseColumn.java | 2 +-
.../src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java | 1 +
.../syncope/core/logic/init/ClassPathScanImplementationLookup.java | 2 +-
.../org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 4 ++--
.../core/provisioning/java/job/AbstractSchedTaskJobDelegate.java | 2 +-
.../java/propagation/AbstractPropagationTaskExecutor.java | 2 +-
.../java/propagation/LDAPMembershipPropagationActions.java | 2 +-
.../provisioning/java/pushpull/AbstractProvisioningJobDelegate.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java | 2 +-
.../main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java | 2 +-
.../org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java | 2 +-
.../test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java | 2 +-
.../test/java/org/apache/syncope/fit/core/AuthenticationITCase.java | 2 +-
.../src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java | 2 +-
18 files changed, 21 insertions(+), 19 deletions(-)
[syncope] 02/03: fix parameter placeholders for log messages
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 648c6071a6b5f37509a21de3f429a554940da30b
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Jan 16 22:20:51 2020 +0400
fix parameter placeholders for log messages
---
.../java/org/apache/syncope/client/console/status/ReconTaskPanel.java | 3 ++-
.../syncope/core/logic/init/ClassPathScanImplementationLookup.java | 2 +-
.../java/propagation/LDAPMembershipPropagationActions.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java | 2 +-
.../src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java | 2 +-
.../main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
index 520555e..dfcd6a9 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java
@@ -185,7 +185,8 @@ public class ReconTaskPanel extends MultilevelPanel.SecondLevel {
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (Exception e) {
- LOG.error("While attempting reconciliation on {}", reconQuery, form.getModelObject(), e);
+ LOG.error("While attempting reconciliation using query {} on {}",
+ reconQuery, form.getModelObject(), e);
SyncopeConsoleSession.get().error(resource + ": "
+ (StringUtils.isBlank(e.getMessage())
? e.getClass().getName()
diff --git a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
index 655224f..a9ecdb0 100644
--- a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
+++ b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java
@@ -116,7 +116,7 @@ public class ClassPathScanImplementationLookup implements ImplementationLookup {
scanner.addIncludeFilter(new AssignableTypeFilter(
ClassUtils.resolveClassName(typeInterface, ClassUtils.getDefaultClassLoader())));
} catch (IllegalArgumentException e) {
- LOG.error("Could not find class {}, ignoring...", e);
+ LOG.error("Could not find class, ignoring...", e);
}
});
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPMembershipPropagationActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPMembershipPropagationActions.java
index 854340d..1a4e5c4 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPMembershipPropagationActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPMembershipPropagationActions.java
@@ -128,7 +128,7 @@ public class LDAPMembershipPropagationActions implements PropagationActions {
forEach(value -> groups.add(String.valueOf(value)));
}
}
- LOG.debug("Add ldapGroups to attributes: {}" + groups);
+ LOG.debug("Add ldapGroups to attributes: {}", groups);
attributes.add(AttributeBuilder.build(getGroupMembershipAttrName(), groups));
task.setAttributes(attributes);
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
index 31c3a12..f988610 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2IdPLogic.java
@@ -77,7 +77,7 @@ public class SAML2IdPLogic extends AbstractSAML2Logic<SAML2IdPTO> {
try {
idpEntity = cache.put(idp);
} catch (Exception e) {
- LOG.error("Could not build SAML 2.0 IdP with key ", idp.getEntityID(), e);
+ LOG.error("Could not build SAML 2.0 IdP with key {}", idp.getEntityID(), e);
}
}
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index de8eb2f..cb73614 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -242,7 +242,7 @@ public class SAML2SPLogic extends AbstractSAML2Logic<EntityTO> {
try {
idp = cache.put(saml2IdP);
} catch (Exception e) {
- LOG.error("Could not build SAML 2.0 IdP with key ", entityID, e);
+ LOG.error("Could not build SAML 2.0 IdP with key {}", entityID, e);
SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.Unknown);
sce.getElements().add(e.getMessage());
throw sce;
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java
index cbbf37c..a8d4997 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/init/SAML2SPLoader.java
@@ -147,7 +147,7 @@ public class SAML2SPLoader implements SyncopeCoreLoader {
try {
cache.put(idp);
} catch (Exception e) {
- LOG.error("Could not cache the SAML 2.0 IdP with key ", idp.getEntityID(), e);
+ LOG.error("Could not cache the SAML 2.0 IdP with key {}", idp.getEntityID(), e);
}
});
return null;
[syncope] 03/03: add group key to toString()
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit d4afae90c844544de90808f749240e23abaefa8d
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Fri Jan 17 12:29:42 2020 +0400
add group key to toString()
---
.../lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
index 8588210..6625654 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/MembershipTO.java
@@ -194,6 +194,7 @@ public class MembershipTO implements Serializable, Attributable {
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).
+ append(this.groupKey).
append(this.groupName).
build();
}
[syncope] 01/03: analysis: minor fixes to typos in docs/logs
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 302c1fb00c70dafebb71b7ae4398ba23f0270b92
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Jan 16 22:18:45 2020 +0400
analysis: minor fixes to typos in docs/logs
---
.../syncope/client/console/panels/TypeExtensionDirectoryPanel.java | 4 ++--
.../syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java | 2 +-
.../markup/html/repeater/data/table/BatchResponseColumn.java | 2 +-
.../org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 4 ++--
.../core/provisioning/java/job/AbstractSchedTaskJobDelegate.java | 2 +-
.../java/propagation/AbstractPropagationTaskExecutor.java | 2 +-
.../provisioning/java/pushpull/AbstractProvisioningJobDelegate.java | 2 +-
.../org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java | 2 +-
.../test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java | 2 +-
.../test/java/org/apache/syncope/fit/core/AuthenticationITCase.java | 2 +-
.../src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
index aaa6ed0..5c1bcc6 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
@@ -197,13 +197,13 @@ public class TypeExtensionDirectoryPanel
@Override
protected void customActionCallback(final AjaxRequestTarget target) {
- // change modal foter visibility
+ // change modal footer visibility
send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target));
}
@Override
protected void customActionOnCancelCallback(final AjaxRequestTarget target) {
- // change modal foter visibility
+ // change modal footer visibility
send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target));
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java
index 36a61fe..733946f 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/ajax/form/AjaxDownloadBehavior.java
@@ -56,7 +56,7 @@ public class AjaxDownloadBehavior extends AbstractAjaxBehavior {
new ResourceStreamRequestHandler(
getResourceStream(), getFileName()).setCacheDuration(Duration.NONE));
} catch (Exception e) {
- // cannot be notifies beacause the use of scheduleRequestHandlerAfterCurrent
+ // cannot be notifies because the use of scheduleRequestHandlerAfterCurrent
LOG.error("Error downloading file", e);
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/BatchResponseColumn.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/BatchResponseColumn.java
index d5e60cb..273c62f 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/BatchResponseColumn.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/BatchResponseColumn.java
@@ -72,7 +72,7 @@ public class BatchResponseColumn<T, S> extends AbstractColumn<T, S> {
item.add(new Label(componentId, new StringResourceModel(status, item, new Model<>(status))));
} catch (BeansException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- LOG.error("Errore retrieving target key value", e);
+ LOG.error("Error retrieving target key value", e);
}
}
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 0be1f96..35e2a0c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -339,7 +339,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
// Contains used identifiers in order to avoid replications
Set<String> used = new HashSet<>();
- // Create several clauses: one for eanch identifiers
+ // Create several clauses: one for each identifiers
for (int i = 0; i < identifiers.size(); i++) {
if (!used.contains(identifiers.get(i))) {
// verify schema existence and get schema type
@@ -363,7 +363,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
bld.append(" AND ");
- // use a value clause different for eanch different schema type
+ // use a value clause different for each different schema type
switch (schema.getType()) {
case Boolean:
bld.append("v.booleanValue = '").append(attrValues.get(i)).append('\'');
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java
index ab952cd..cc3c556 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java
@@ -175,7 +175,7 @@ public abstract class AbstractSchedTaskJobDelegate implements SchedTaskJobDelega
* Template method to determine whether this job's task execution has to be persisted or not.
*
* @param execution task execution
- * @return wether to persist or not
+ * @return whether to persist or not
*/
protected boolean hasToBeRegistered(final TaskExec execution) {
return false;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 7895244..e7ba307 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -226,7 +226,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
attributes.remove(newName);
}
- // 2. check wether anything is actually needing to be propagated, i.e. if there is attribute
+ // 2. check whether anything is actually needing to be propagated, i.e. if there is attribute
// difference between beforeObj - just read above from the connector - and the values to be propagated
Map<String, Attribute> originalAttrMap = beforeObj.getAttributes().stream().
collect(Collectors.toMap(attr -> attr.getName().toUpperCase(), Function.identity()));
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
index 25a85c4..c5cea62 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
@@ -110,7 +110,7 @@ public abstract class AbstractProvisioningJobDelegate<T extends ProvisioningTask
protected PolicyDAO policyDAO;
/**
- * Create a textual report of the provisionig operation, based on the trace level.
+ * Create a textual report of the provisioning operation, based on the trace level.
*
* @param provResults Provisioning results
* @param resource Provisioning resource
diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java
index f239a5b..af3b223 100644
--- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java
+++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/ApacheDSStartStopListener.java
@@ -255,7 +255,7 @@ public class ApacheDSStartStopListener implements ServletContextListener {
if (result == null) {
throw new RuntimeException("Base DN not found");
} else {
- LOG.info("ApacheDS startup completed succesfully");
+ LOG.info("ApacheDS startup completed successfully");
}
}
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
index 8659c6e..0347d60 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AjaxBrowseITCase.java
@@ -31,7 +31,7 @@ import org.apache.syncope.client.console.topology.Topology;
import org.junit.jupiter.api.Test;
// Please, keep the class name as is in order to respect the execution order. It seems that from wicket 7.5.0 the
-// session creted never expire and the unsuccessfulLogin test fail
+// session created never expire and the unsuccessfulLogin test fail
public class AjaxBrowseITCase extends AbstractConsoleITCase {
@Test
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
index 14f04e0..fcd51c1 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
@@ -237,7 +237,7 @@ public class AuthenticationITCase extends AbstractITCase {
UserTO delegatedAdmin = createUser(delegatedAdminCR).getEntity();
delegatedAdminKey = delegatedAdmin.getKey();
- // 3. instantiate a delegate user service client, for further operatins
+ // 3. instantiate a delegate user service client, for further operations
UserService delegatedUserService =
clientFactory.create(delegatedAdmin.getUsername(), "password123").getService(UserService.class);
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index 91fb3e6..07125d8 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -1360,7 +1360,7 @@ public class UserIssuesITCase extends AbstractITCase {
// 4. remove user
userService.delete(user.getKey());
- // 5. verify that user is not in LDAP anynmore
+ // 5. verify that user is not in LDAP anymore
assertNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, userDn.getValues().get(0)));
}