Skip to content

[SYNCOPE-1709] Provides job status truncate due to varchar length constraints #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilgrosso merged 3 commits into from
Mar 20, 2023
Merged

[SYNCOPE-1709] Provides job status truncate due to varchar length constraints #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68dbb66
[SYNCOPE-1709] provides job status truncate due to varchar length con…
fmartelli Mar 20, 2023
517f00b
[SYNCOPE-1709] remore debug statements
fmartelli Mar 20, 2023
4ea88dc
[SYNCOPE-1709] remove useless check
fmartelli Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...stence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAJobStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import javax.persistence.Entity;
import javax.persistence.Table;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.core.persistence.api.entity.JobStatus;

@Entity
Expand All @@ -30,6 +31,8 @@ public class JPAJobStatus extends AbstractProvidedKeyEntity implements JobStatus

public static final String TABLE = "JobStatus";

private static final int STATUS_MAX_LENGTH = 255;

private String jobStatus;

@Override
Expand All @@ -39,6 +42,6 @@ public String getStatus() {

@Override
public void setStatus(final String status) {
jobStatus = status;
jobStatus = StringUtils.abbreviate(status, STATUS_MAX_LENGTH);
}
}
38 changes: 21 additions & 17 deletions ...java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,28 @@ public Optional<PullMatch> match(

List<ConnectorObject> found = new ArrayList<>();

Name nameAttr = new Name(nameValue);
connector.search(
new ObjectClass(provision.get().getObjectClass()),
provision.get().isIgnoreCaseMatch()
? FilterBuilder.equalsIgnoreCase(nameAttr)
: FilterBuilder.equalTo(nameAttr),
new SearchResultsHandler() {

@Override
public void handleResult(final SearchResult result) {
// nothing to do
}
try {
Name nameAttr = new Name(nameValue);
connector.search(
new ObjectClass(provision.get().getObjectClass()),
provision.get().isIgnoreCaseMatch()
? FilterBuilder.equalsIgnoreCase(nameAttr)
: FilterBuilder.equalTo(nameAttr),
new SearchResultsHandler() {

@Override
public void handleResult(final SearchResult result) {
// nothing to do
}

@Override
public boolean handle(final ConnectorObject connectorObject) {
return found.add(connectorObject);
}
}, MappingUtils.buildOperationOptions(mapItems));
@Override
public boolean handle(final ConnectorObject connectorObject) {
return found.add(connectorObject);
}
}, MappingUtils.buildOperationOptions(mapItems));
} catch (Throwable t) {
LOG.warn("While searching for {} ...", nameValue, t);
}

Optional<PullMatch> result = Optional.empty();

Expand Down