http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPPasswordSyncActions.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPPasswordSyncActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPPasswordSyncActions.java index 992507b..32f660e 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPPasswordSyncActions.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/LDAPPasswordSyncActions.java @@ -56,10 +56,10 @@ public class LDAPPasswordSyncActions extends DefaultSyncActions { public <T extends AnyTO> SyncDelta beforeProvision( final ProvisioningProfile<?, ?> profile, final SyncDelta delta, - final T subject) throws JobExecutionException { + final T any) throws JobExecutionException { - if (subject instanceof UserTO) { - String password = ((UserTO) subject).getPassword(); + if (any instanceof UserTO) { + String password = ((UserTO) any).getPassword(); parseEncodedPassword(password); } @@ -71,11 +71,11 @@ public class LDAPPasswordSyncActions extends DefaultSyncActions { public <T extends AnyTO, K extends AnyMod> SyncDelta beforeUpdate( final ProvisioningProfile<?, ?> profile, final SyncDelta delta, - final T subject, - final K subjectMod) throws JobExecutionException { + final T any, + final K anyMod) throws JobExecutionException { - if (subjectMod instanceof UserMod) { - String modPassword = ((UserMod) subjectMod).getPassword(); + if (anyMod instanceof UserMod) { + String modPassword = ((UserMod) anyMod).getPassword(); parseEncodedPassword(modPassword); } @@ -104,11 +104,11 @@ public class LDAPPasswordSyncActions extends DefaultSyncActions { public <T extends AnyTO> void after( final ProvisioningProfile<?, ?> profile, final SyncDelta delta, - final T subject, + final T any, final ProvisioningResult result) throws JobExecutionException { - if (subject instanceof UserTO && encodedPassword != null && cipher != null) { - User syncopeUser = userDAO.find(subject.getKey()); + if (any instanceof UserTO && encodedPassword != null && cipher != null) { + User syncopeUser = userDAO.find(any.getKey()); if (syncopeUser != null) { byte[] encodedPasswordBytes = Base64.decode(encodedPassword.getBytes()); char[] encodedHex = Hex.encode(encodedPasswordBytes);
http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java index e751522..8982824 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java @@ -163,10 +163,10 @@ public class SyncUtils { return result; } - private AnyDAO<?> getAnyDAO(final MappingItem accountIdItem) { - return AnyTypeKind.USER == accountIdItem.getIntMappingType().getAnyTypeKind() + private AnyDAO<?> getAnyDAO(final MappingItem connObjectKeyItem) { + return AnyTypeKind.USER == connObjectKeyItem.getIntMappingType().getAnyTypeKind() ? userDAO - : AnyTypeKind.ANY_OBJECT == accountIdItem.getIntMappingType().getAnyTypeKind() + : AnyTypeKind.ANY_OBJECT == connObjectKeyItem.getIntMappingType().getAnyTypeKind() ? anyObjectDAO : groupDAO; } @@ -238,7 +238,7 @@ public class SyncUtils { break; default: - LOG.error("Invalid accountId type '{}'", connObjectKeyItem.getIntMappingType()); + LOG.error("Invalid connObjectKey type '{}'", connObjectKeyItem.getIntMappingType()); } return result; @@ -356,7 +356,7 @@ public class SyncUtils { /** * Find users / groups based on mapped uid value (or previous uid value, if updated). * - * @param uid for finding by account id + * @param uid for finding by connObjectKey * @param connObj for finding by attribute value * @param provision external resource * @param anyUtils any util http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java index dc1ea5a..e4a436f 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java @@ -113,8 +113,8 @@ public class UserPushResultHandlerImpl extends AbstractPushResultHandler impleme } @Override - protected String getName(final Any<?, ?, ?> subject) { - return User.class.cast(subject).getUsername(); + protected String getName(final Any<?, ?, ?> any) { + return User.class.cast(any).getUsername(); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java index 3e99286..8487fa8 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java @@ -40,8 +40,8 @@ public class UserSyncResultHandlerImpl extends AbstractSyncResultHandler impleme } @Override - protected String getName(final AnyTO subjectTO) { - return UserTO.class.cast(subjectTO).getUsername(); + protected String getName(final AnyTO anyTO) { + return UserTO.class.cast(anyTO).getUsername(); } @Override @@ -55,8 +55,8 @@ public class UserSyncResultHandlerImpl extends AbstractSyncResultHandler impleme } @Override - protected AnyTO doCreate(final AnyTO subjectTO, final SyncDelta delta, final ProvisioningResult result) { - UserTO userTO = UserTO.class.cast(subjectTO); + protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final ProvisioningResult result) { + UserTO userTO = UserTO.class.cast(anyTO); Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getTask()); Map.Entry<Long, List<PropagationStatus>> created = userProvisioningManager.create(userTO, true, true, enabled, http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderTest.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderTest.java b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderTest.java index 51245e4..969dd89 100644 --- a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderTest.java +++ b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderTest.java @@ -92,7 +92,7 @@ public class ResourceDataBinderTest extends AbstractTest { item.setIntAttrName("userId"); item.setIntMappingType(IntMappingType.UserPlainSchema); item.setExtAttrName("campo1"); - item.setAccountid(true); + item.setConnObjectKey(true); item.setMandatoryCondition("false"); item.setPurpose(MappingPurpose.BOTH); mapping.setConnObjectKeyItem(item); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java ---------------------------------------------------------------------- diff --git a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java index e13018f..e2ddbc9 100644 --- a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java +++ b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java @@ -82,7 +82,7 @@ public class CamelRouteLoader implements SyncopeLoader { } private boolean loadRoutesFor(final AnyTypeKind anyTypeKind) { - final String sql = String.format("SELECT * FROM %s WHERE SUBJECTTYPE = ?", CamelRoute.class.getSimpleName()); + final String sql = String.format("SELECT * FROM %s WHERE ANYTYPEKIND = ?", CamelRoute.class.getSimpleName()); final JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); final List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql, new Object[] { anyTypeKind.name() }); return rows.isEmpty(); @@ -104,7 +104,7 @@ public class CamelRouteLoader implements SyncopeLoader { private void loadRoutes(final Resource resource, final AnyTypeKind anyTypeKind) { if (loadRoutesFor(anyTypeKind)) { - String query = String.format("INSERT INTO %s(NAME, SUBJECTTYPE, CONTENT) VALUES (?, ?, ?)", + String query = String.format("INSERT INTO %s(NAME, ANYTYPEKIND, CONTENT) VALUES (?, ?, ?)", CamelRoute.class.getSimpleName()); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java index 7c132a1..18aadcc 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelGroupProvisioningManager.java @@ -36,8 +36,8 @@ public class CamelGroupProvisioningManager extends AbstractCamelProvisioningManager implements GroupProvisioningManager { @Override - public Pair<Long, List<PropagationStatus>> create(final GroupTO subject) { - return create(subject, Collections.<String>emptySet()); + public Pair<Long, List<PropagationStatus>> create(final GroupTO any) { + return create(any, Collections.<String>emptySet()); } @Override @@ -82,21 +82,21 @@ public class CamelGroupProvisioningManager } @Override - public Pair<Long, List<PropagationStatus>> update(final GroupMod subjectMod) { - return update(subjectMod, Collections.<String>emptySet()); + public Pair<Long, List<PropagationStatus>> update(final GroupMod anyMod) { + return update(anyMod, Collections.<String>emptySet()); } @Override @SuppressWarnings("unchecked") public Pair<Long, List<PropagationStatus>> update( - final GroupMod subjectMod, final Set<String> excludedResources) { + final GroupMod anyMod, final Set<String> excludedResources) { PollingConsumer pollingConsumer = getConsumer("direct:updateGroupPort"); Map<String, Object> props = new HashMap<>(); props.put("excludedResources", excludedResources); - sendMessage("direct:updateGroup", subjectMod, props); + sendMessage("direct:updateGroup", anyMod, props); Exchange exchange = pollingConsumer.receive(); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java index 5b20fa1..a258751 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java @@ -214,10 +214,10 @@ public class CamelUserProvisioningManager extends AbstractCamelProvisioningManag } @Override - public Long link(final UserMod subjectMod) { + public Long link(final UserMod anyMod) { PollingConsumer pollingConsumer = getConsumer("direct:linkPort"); - sendMessage("direct:linkUser", subjectMod); + sendMessage("direct:linkUser", anyMod); Exchange exchange = pollingConsumer.receive(); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java index a22f2eb..8dc8bde 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java @@ -48,7 +48,7 @@ public class GroupCreateInSyncProcessor implements Processor { public void process(final Exchange exchange) { WorkflowResult<Long> created = (WorkflowResult) exchange.getIn().getBody(); - GroupTO actual = exchange.getProperty("subject", GroupTO.class); + GroupTO actual = exchange.getProperty("any", GroupTO.class); Map<Long, String> groupOwnerMap = exchange.getProperty("groupOwnerMap", Map.class); Set<String> excludedResources = exchange.getProperty("excludedResources", Set.class); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java index 6805a5e..4ab62e3 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java @@ -51,11 +51,11 @@ public class GroupCreateProcessor implements Processor { @Override public void process(final Exchange exchange) { WorkflowResult<Long> created = (WorkflowResult) exchange.getIn().getBody(); - GroupTO subject = exchange.getProperty("subject", GroupTO.class); + GroupTO any = exchange.getProperty("any", GroupTO.class); Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class); List<PropagationTask> tasks = - propagationManager.getGroupCreateTasks(created, subject.getVirAttrs(), excludedResource); + propagationManager.getGroupCreateTasks(created, any.getVirAttrs(), excludedResource); PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().getBean(PropagationReporter.class); try { http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java index 212cccd..f452ffd 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java @@ -59,8 +59,8 @@ public class GroupDeleteProcessor implements Processor { @Override public void process(final Exchange exchange) throws Exception { - Long subjectKey = exchange.getIn().getBody(Long.class); - Group group = groupDAO.find(subjectKey); + Long anyKey = exchange.getIn().getBody(Long.class); + Group group = groupDAO.find(anyKey); final List<PropagationTask> tasks = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java index fc18e83..7a2f455 100644 --- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java +++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java @@ -51,11 +51,11 @@ public class GroupUpdateProcessor implements Processor { @Override public void process(final Exchange exchange) { WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody(); - GroupMod subjectMod = exchange.getProperty("subjectMod", GroupMod.class); + GroupMod anyMod = exchange.getProperty("anyMod", GroupMod.class); Set<String> excludedResources = exchange.getProperty("excludedResources", Set.class); List<PropagationTask> tasks = propagationManager.getGroupUpdateTasks(updated, - subjectMod.getVirAttrsToRemove(), subjectMod.getVirAttrsToUpdate(), excludedResources); + anyMod.getVirAttrsToRemove(), anyMod.getVirAttrsToUpdate(), excludedResources); PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().getBean(PropagationReporter.class); try { http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml b/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml index 63aa0d3..f897f90 100644 --- a/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml +++ b/ext/camel/provisioning-camel/src/main/resources/groupRoutes.xml @@ -21,7 +21,7 @@ under the License. <route id="createGroup"> <from uri="direct:createGroup"/> - <setProperty propertyName="subject"> + <setProperty propertyName="any"> <simple>${body}</simple> </setProperty> <doTry> @@ -40,7 +40,7 @@ under the License. <route id="createGroupSync"> <from uri="direct:createGroupInSync"/> - <setProperty propertyName="subject"> + <setProperty propertyName="any"> <simple>${body}</simple> </setProperty> <doTry> @@ -59,7 +59,7 @@ under the License. <route id="updateGroup"> <from uri="direct:updateGroup"/> - <setProperty propertyName="subjectMod"> + <setProperty propertyName="anyMod"> <simple>${body}</simple> </setProperty> <doTry> http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAnyTransformer.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAnyTransformer.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAnyTransformer.java new file mode 100644 index 0000000..b92d976 --- /dev/null +++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAnyTransformer.java @@ -0,0 +1,75 @@ +/* + * 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.fit.core.reference; + +import java.util.ArrayList; +import java.util.List; +import org.apache.syncope.common.lib.mod.AnyMod; +import org.apache.syncope.common.lib.mod.AttrMod; +import org.apache.syncope.common.lib.to.AnyTO; +import org.apache.syncope.common.lib.to.AttrTO; +import org.apache.syncope.core.provisioning.api.AnyTransformer; + +/** + * Class for integration tests: transform (by making it double) any attribute value for defined schema. + */ +public class DoubleValueAnyTransformer implements AnyTransformer { + + private static final String NAME = "makeItDouble"; + + @Override + public <T extends AnyTO> T transform(final T input) { + for (AttrTO attr : input.getPlainAttrs()) { + if (NAME.equals(attr.getSchema())) { + List<String> values = new ArrayList<>(attr.getValues().size()); + for (String value : attr.getValues()) { + try { + values.add(String.valueOf(2 * Long.valueOf(value))); + } catch (NumberFormatException e) { + // ignore + } + } + attr.getValues().clear(); + attr.getValues().addAll(values); + } + } + + return input; + } + + @Override + public <T extends AnyMod> T transform(final T input) { + for (AttrMod attr : input.getPlainAttrsToUpdate()) { + if (NAME.equals(attr.getSchema())) { + List<String> values = new ArrayList<>(attr.getValuesToBeAdded().size()); + for (String value : attr.getValuesToBeAdded()) { + try { + values.add(String.valueOf(2 * Long.valueOf(value))); + } catch (NumberFormatException e) { + // ignore + } + } + attr.getValuesToBeAdded().clear(); + attr.getValuesToBeAdded().addAll(values); + } + } + + return input; + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAttributableTransformer.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAttributableTransformer.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAttributableTransformer.java deleted file mode 100644 index ec5d437..0000000 --- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/DoubleValueAttributableTransformer.java +++ /dev/null @@ -1,75 +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.fit.core.reference; - -import java.util.ArrayList; -import java.util.List; -import org.apache.syncope.common.lib.mod.AnyMod; -import org.apache.syncope.common.lib.mod.AttrMod; -import org.apache.syncope.common.lib.to.AnyTO; -import org.apache.syncope.common.lib.to.AttrTO; -import org.apache.syncope.core.provisioning.api.AnyTransformer; - -/** - * Class for integration tests: transform (by making it double) any attribute value for defined schema. - */ -public class DoubleValueAttributableTransformer implements AnyTransformer { - - private static final String NAME = "makeItDouble"; - - @Override - public <T extends AnyTO> T transform(final T input) { - for (AttrTO attr : input.getPlainAttrs()) { - if (NAME.equals(attr.getSchema())) { - List<String> values = new ArrayList<>(attr.getValues().size()); - for (String value : attr.getValues()) { - try { - values.add(String.valueOf(2 * Long.valueOf(value))); - } catch (NumberFormatException e) { - // ignore - } - } - attr.getValues().clear(); - attr.getValues().addAll(values); - } - } - - return input; - } - - @Override - public <T extends AnyMod> T transform(final T input) { - for (AttrMod attr : input.getPlainAttrsToUpdate()) { - if (NAME.equals(attr.getSchema())) { - List<String> values = new ArrayList<>(attr.getValuesToBeAdded().size()); - for (String value : attr.getValuesToBeAdded()) { - try { - values.add(String.valueOf(2 * Long.valueOf(value))); - } catch (NumberFormatException e) { - // ignore - } - } - attr.getValuesToBeAdded().clear(); - attr.getValuesToBeAdded().addAll(values); - } - } - - return input; - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java index 9e37c09..8974c82 100644 --- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java +++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/TestSyncActions.java @@ -39,12 +39,12 @@ public class TestSyncActions extends DefaultSyncActions { @Override public <T extends AnyTO> SyncDelta beforeProvision( - final ProvisioningProfile<?, ?> profile, final SyncDelta delta, final T subject) + final ProvisioningProfile<?, ?> profile, final SyncDelta delta, final T any) throws JobExecutionException { AttrTO attrTO = null; - for (int i = 0; i < subject.getPlainAttrs().size(); i++) { - AttrTO plainAttr = CollectionUtils.get(subject.getPlainAttrs(), i); + for (int i = 0; i < any.getPlainAttrs().size(); i++) { + AttrTO plainAttr = CollectionUtils.get(any.getPlainAttrs(), i); if ("fullname".equals(plainAttr.getSchema())) { attrTO = plainAttr; } @@ -52,7 +52,7 @@ public class TestSyncActions extends DefaultSyncActions { if (attrTO == null) { attrTO = new AttrTO(); attrTO.setSchema("fullname"); - subject.getPlainAttrs().add(attrTO); + any.getPlainAttrs().add(attrTO); } attrTO.getValues().clear(); attrTO.getValues().add(String.valueOf(counter++)); @@ -62,10 +62,10 @@ public class TestSyncActions extends DefaultSyncActions { @Override public <T extends AnyTO> SyncDelta beforeAssign( - final ProvisioningProfile<?, ?> profile, final SyncDelta delta, final T subject) + final ProvisioningProfile<?, ?> profile, final SyncDelta delta, final T any) throws JobExecutionException { - if (subject instanceof UserTO && "test2".equals(UserTO.class.cast(subject).getUsername())) { + if (any instanceof UserTO && "test2".equals(UserTO.class.cast(any).getUsername())) { throw new IgnoreProvisionException(); } @@ -76,13 +76,13 @@ public class TestSyncActions extends DefaultSyncActions { public <T extends AnyTO, K extends AnyMod> SyncDelta beforeUpdate( final ProvisioningProfile<?, ?> profile, final SyncDelta delta, - final T subject, - final K subjectMod) throws JobExecutionException { + final T any, + final K anyMod) throws JobExecutionException { - subjectMod.getPlainAttrsToRemove().add("fullname"); + anyMod.getPlainAttrsToRemove().add("fullname"); AttrMod fullnameMod = null; - for (AttrMod attrMod : subjectMod.getPlainAttrsToUpdate()) { + for (AttrMod attrMod : anyMod.getPlainAttrsToUpdate()) { if ("fullname".equals(attrMod.getSchema())) { fullnameMod = attrMod; } @@ -90,7 +90,7 @@ public class TestSyncActions extends DefaultSyncActions { if (fullnameMod == null) { fullnameMod = new AttrMod(); fullnameMod.setSchema("fullname"); - subjectMod.getPlainAttrsToUpdate().add(fullnameMod); + anyMod.getPlainAttrsToUpdate().add(fullnameMod); } fullnameMod.getValuesToBeAdded().clear(); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/main/resources/logic.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/logic.properties b/fit/core-reference/src/main/resources/logic.properties index 2fcb844..7ff308d 100644 --- a/fit/core-reference/src/main/resources/logic.properties +++ b/fit/core-reference/src/main/resources/logic.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -attributableTransformer=org.apache.syncope.fit.core.reference.DoubleValueAttributableTransformer +anyTransformer=org.apache.syncope.fit.core.reference.DoubleValueAnyTransformer logicInvocationHandler=org.apache.syncope.core.logic.LogicInvocationHandler http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java index 019c1c8..8005b24 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java @@ -198,7 +198,7 @@ public class AuthenticationITCase extends AbstractITCase { getService(UserService.class); PagedResult<UserTO> matchedUsers = userService2.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNotNull("key").query()).build()); assertNotNull(matchedUsers); assertFalse(matchedUsers.getResult().isEmpty()); @@ -217,7 +217,7 @@ public class AuthenticationITCase extends AbstractITCase { UserService userService3 = clientFactory.create("puccini", ADMIN_PWD).getService(UserService.class); matchedUsers = userService3.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm("/even/two"). + SyncopeClient.getAnySearchQueryBuilder().realm("/even/two"). fiql(SyncopeClient.getUserSearchConditionBuilder().isNotNull("loginDate").query()).build()); assertNotNull(matchedUsers); assertTrue(matchedUsers.getResult().isEmpty()); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java index 5fcc1e9..5d75e7c 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java @@ -660,7 +660,7 @@ public class ConnectorITCase extends AbstractITCase { mapItem.setExtAttrName("uid"); mapItem.setIntAttrName("userId"); mapItem.setIntMappingType(IntMappingType.UserPlainSchema); - mapItem.setAccountid(true); + mapItem.setConnObjectKey(true); mapping.setConnObjectKeyItem(mapItem); // ---------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java index 281fb1a..d0a4be1 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java @@ -149,7 +149,7 @@ public class GroupITCase extends AbstractITCase { @Test public void list() { PagedResult<GroupTO> groupTOs = - groupService.list(SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + groupService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); assertNotNull(groupTOs); assertTrue(groupTOs.getResult().size() >= 8); for (GroupTO groupTO : groupTOs.getResult()) { @@ -546,14 +546,14 @@ public class GroupITCase extends AbstractITCase { GroupService unauthenticated = clientFactory.createAnonymous().getService(GroupService.class); try { unauthenticated. - list(SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + list(SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); fail(); } catch (AccessControlException e) { assertNotNull(e); } GroupService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(GroupService.class); - assertFalse(anonymous.list(SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + assertFalse(anonymous.list(SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). build()). getResult().isEmpty()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java index ef525d5..1f498cc 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java @@ -291,7 +291,7 @@ public class PushTaskITCase extends AbstractTaskITCase { item.setIntMappingType(IntMappingType.GroupPlainSchema); item.setExtAttrName("cn"); item.setIntAttrName(newPlainSchemaTO.getKey()); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.BOTH); rmapping.setConnObjectKeyItem(item); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java index 21c3e92..2e6cf21 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java @@ -86,7 +86,7 @@ public class ResourceITCase extends AbstractITCase { item.setExtAttrName("fullname"); item.setIntAttrName("cn"); item.setIntMappingType(IntMappingType.UserPlainSchema); - item.setAccountid(false); + item.setConnObjectKey(false); item.setPurpose(MappingPurpose.BOTH); mapping.add(item); @@ -138,7 +138,7 @@ public class ResourceITCase extends AbstractITCase { item.setExtAttrName("username"); item.setIntAttrName("fullname"); item.setIntMappingType(IntMappingType.UserId); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.BOTH); mapping.setConnObjectKeyItem(item); @@ -146,7 +146,7 @@ public class ResourceITCase extends AbstractITCase { item.setExtAttrName("fullname"); item.setIntAttrName("cn"); item.setIntMappingType(IntMappingType.UserPlainSchema); - item.setAccountid(false); + item.setConnObjectKey(false); item.setPurpose(MappingPurpose.BOTH); mapping.add(item); @@ -191,7 +191,7 @@ public class ResourceITCase extends AbstractITCase { MappingItemTO item = new MappingItemTO(); item.setIntMappingType(IntMappingType.UserId); item.setExtAttrName("userId"); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.PROPAGATION); mapping.setConnObjectKeyItem(item); @@ -205,7 +205,7 @@ public class ResourceITCase extends AbstractITCase { item = new MappingItemTO(); item.setIntMappingType(IntMappingType.GroupId); item.setExtAttrName("groupId"); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.SYNCHRONIZATION); mapping.setConnObjectKeyItem(item); @@ -241,7 +241,7 @@ public class ResourceITCase extends AbstractITCase { MappingItemTO item = new MappingItemTO(); item.setIntMappingType(IntMappingType.UserId); item.setExtAttrName("userId"); - item.setAccountid(true); + item.setConnObjectKey(true); mapping.setConnObjectKeyItem(item); item = new MappingItemTO(); @@ -277,7 +277,7 @@ public class ResourceITCase extends AbstractITCase { MappingItemTO item = new MappingItemTO(); item.setIntMappingType(IntMappingType.UserId); item.setExtAttrName("userId"); - item.setAccountid(true); + item.setConnObjectKey(true); mapping.setConnObjectKeyItem(item); item = new MappingItemTO(); @@ -309,7 +309,7 @@ public class ResourceITCase extends AbstractITCase { item.setExtAttrName("userId"); item.setIntAttrName("userId"); item.setIntMappingType(IntMappingType.UserPlainSchema); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.BOTH); mapping.setConnObjectKeyItem(item); @@ -374,7 +374,7 @@ public class ResourceITCase extends AbstractITCase { item.setExtAttrName("username"); item.setIntAttrName("fullname"); item.setIntMappingType(IntMappingType.UserId); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.BOTH); mapping.setConnObjectKeyItem(item); @@ -599,13 +599,13 @@ public class ResourceITCase extends AbstractITCase { MappingItemTO item = new MappingItemTO(); item.setIntMappingType(IntMappingType.UserId); item.setExtAttrName("userId"); - item.setAccountid(true); + item.setConnObjectKey(true); item.setPurpose(MappingPurpose.PROPAGATION); mapping.setConnObjectKeyItem(item); MappingItemTO item2 = new MappingItemTO(); item2.setIntMappingType(IntMappingType.UserPlainSchema); - item2.setAccountid(false); + item2.setConnObjectKey(false); item2.setIntAttrName("gender"); item2.setExtAttrName("gender"); item2.setPurpose(MappingPurpose.NONE); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java index 02ccb5e..3f1eb0a 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java @@ -45,7 +45,7 @@ public class SearchITCase extends AbstractITCase { public void searchUser() { // LIKE PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("fullname").equalTo("*o*").and("fullname").equalTo("*i*").query()).build()); assertNotNull(matchedUsers); @@ -57,7 +57,7 @@ public class SearchITCase extends AbstractITCase { // ISNULL matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNull("loginDate").query()).build()); assertNotNull(matchedUsers); assertFalse(matchedUsers.getResult().isEmpty()); @@ -75,7 +75,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByUsernameAndKey() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("username").equalTo("rossini").and("key").lessThan(2).query()).build()); assertNotNull(matchingUsers); @@ -87,7 +87,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByGroupNameAndKey() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("name").equalTo("root").and("key").lessThan(2).query()).build()); assertNotNull(matchingGroups); @@ -99,7 +99,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByGroup() { PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inGroups(1L).query()). build()); assertNotNull(matchedUsers); @@ -122,7 +122,7 @@ public class SearchITCase extends AbstractITCase { assertNotNull(group); PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inGroups(group.getKey()).query()). build()); assertNotNull(matchedUsers); @@ -140,7 +140,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByRole() { PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inRoles(3L).query()). build()); assertNotNull(matchedUsers); @@ -164,7 +164,7 @@ public class SearchITCase extends AbstractITCase { assertNotNull(role); PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inRoles(role.getKey()).query()). build()); assertNotNull(matchedUsers); @@ -182,7 +182,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchUserByResourceName() { PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().hasResources(RESOURCE_NAME_MAPPINGS2).query()). build()); assertNotNull(matchedUsers); @@ -201,7 +201,7 @@ public class SearchITCase extends AbstractITCase { public void paginatedSearch() { // LIKE PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("fullname").equalTo("*o*").and("fullname").equalTo("*i*").query()).page(1).size(2).build()); assertNotNull(matchingUsers); @@ -213,7 +213,7 @@ public class SearchITCase extends AbstractITCase { // ISNULL matchingUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNull("loginDate").query()).page(2).size(2). build()); assertNotNull(matchingUsers); @@ -222,18 +222,18 @@ public class SearchITCase extends AbstractITCase { } @Test - public void searchByBooleanSubjectCond() { + public void searchByBooleanAnyCond() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("show").equalTo("true").query()).build()); assertNotNull(matchingGroups); assertFalse(matchingGroups.getResult().isEmpty()); } @Test - public void searchByRelationshipSubjectCond() { + public void searchByRelationshipAnyCond() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("userOwner").equalTo(5).query()).build()); assertNotNull(matchingGroups); assertEquals(1, matchingGroups.getResult().size()); @@ -243,7 +243,7 @@ public class SearchITCase extends AbstractITCase { @Test public void nested() { PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql("((fullname==*o*,fullname==*i*);$resources!=ws-target-resource-1)").page(1).size(2).build()); assertNotNull(matchedUsers); @@ -256,7 +256,7 @@ public class SearchITCase extends AbstractITCase { @Test public void orderBy() { PagedResult<UserTO> matchedUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("userId").equalTo("*@apache.org").query()). orderBy(SyncopeClient.getOrderByClauseBuilder().asc("status").desc("firstname").build()).build()); assertNotNull(matchedUsers); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java index 868deee..479c96f 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java @@ -156,7 +156,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // ----------------------------- try { int usersPre = userService.list( - SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). page(1).size(1).build()).getTotalCount(); assertNotNull(usersPre); @@ -212,7 +212,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // check for sync results int usersPost = userService.list( - SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). page(1).size(1).build()).getTotalCount(); assertNotNull(usersPost); assertEquals(usersPre + 8, usersPost); @@ -282,7 +282,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { */ private void ldapCleanup() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo("testLDAPGroup").query()). build()); if (matchingGroups.getSize() > 0) { @@ -294,7 +294,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { } } PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("syncFromLDAP").query()). build()); if (matchingUsers.getSize() > 0) { @@ -322,14 +322,14 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 2. verify that synchronized group is found, with expected attributes PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo("testLDAPGroup").query()). build()); assertNotNull(matchingGroups); assertEquals(1, matchingGroups.getResult().size()); PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("syncFromLDAP").query()). build()); assertNotNull(matchingUsers); @@ -352,7 +352,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 3. verify that LDAP group membership is propagated as Syncope group membership PagedResult<UserTO> members = userService.search( - SyncopeClient.getSubjectSearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inGroups(groupTO.getKey()).query()).build()); assertNotNull(members); assertEquals(1, members.getResult().size()); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java index 9c67d13..107c953 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java @@ -531,7 +531,7 @@ public class UserITCase extends AbstractITCase { @Test public void list() { PagedResult<UserTO> users = userService.list( - SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); assertNotNull(users); assertFalse(users.getResult().isEmpty()); @@ -543,7 +543,7 @@ public class UserITCase extends AbstractITCase { @Test public void paginatedList() { PagedResult<UserTO> users = userService.list( - SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).page(1).size(2).build()); + SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).page(1).size(2).build()); assertNotNull(users); assertFalse(users.getResult().isEmpty()); assertEquals(2, users.getResult().size()); @@ -552,13 +552,13 @@ public class UserITCase extends AbstractITCase { assertNotNull(user); } - users = userService.list(SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + users = userService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). page(2).size(2).build()); assertNotNull(users); assertEquals(2, users.getPage()); assertEquals(2, users.getResult().size()); - users = userService.list(SyncopeClient.getSubjectListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + users = userService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). page(100).size(2).build()); assertNotNull(users); assertTrue(users.getResult().isEmpty()); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java index e161258..a373df5 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java @@ -465,7 +465,7 @@ public class VirAttrITCase extends AbstractITCase { item.setIntMappingType(IntMappingType.UserPlainSchema); item.setExtAttrName(groupName); item.setPurpose(MappingPurpose.PROPAGATION); - item.setAccountid(true); + item.setConnObjectKey(true); mapping.setConnObjectKeyItem(item); item = new MappingItemTO(); http://git-wip-us.apache.org/repos/asf/syncope/blob/a78a6f1f/src/site/xdoc/security.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml index fc5619e..436c083 100644 --- a/src/site/xdoc/security.xml +++ b/src/site/xdoc/security.xml @@ -63,7 +63,7 @@ under the License. <subsection name="CVE-2014-0111: Remote code execution by an authenticated administrator"> <p>In the various places in which Apache Commons JEXL expressions are allowed (derived schema definition, - user / group templates, account links of resource mappings) a malicious administrator can inject Java code + user / group templates, connObjectLinks of resource mappings) a malicious administrator can inject Java code that can be executed remotely by the JEE container running the Apache Syncope core.</p> <p>
