Skip to content
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

Jump to bottom

fix time:now placeholder truncation #1903

Merged
merged 1 commit into from
Feb 23, 2024
Merged

fix time:now placeholder truncation #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions base/model/src/main/java/org/eclipse/ditto/base/model/signals/GlobalErrorRegistry.java
View file
Open in desktop
Expand Up @@ -18,16 +18,17 @@
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;

import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.json.JsonParsableException;
import org.eclipse.ditto.json.JsonFieldSelectorInvalidException;
import org.eclipse.ditto.json.JsonKeyInvalidException;
import org.eclipse.ditto.json.JsonMissingFieldException;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonParseException;
import org.eclipse.ditto.json.JsonPointerInvalidException;
import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.json.JsonParsableException;
import org.eclipse.ditto.json.JsonRuntimeException;

/**
* Contains all strategies to deserialize subclasses of {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException} from a combination of
Expand Down Expand Up @@ -103,6 +104,13 @@ private static final class DittoJsonExceptionRegistry {
private final Map<String, JsonParsable<DittoRuntimeException>> dittoJsonParseRegistries = new HashMap<>();

private DittoJsonExceptionRegistry() {
dittoJsonParseRegistries.put(DittoJsonException.FALLBACK_ERROR_CODE,
(jsonObject, dittoHeaders) -> new DittoJsonException(
JsonRuntimeException.newBuilder(DittoJsonException.FALLBACK_ERROR_CODE)
.message(getMessage(jsonObject))
.description(getDescription(jsonObject))
.build(), dittoHeaders));

dittoJsonParseRegistries.put(JsonParseException.ERROR_CODE,
(jsonObject, dittoHeaders) -> new DittoJsonException(
JsonParseException.newBuilder()
Expand Down
15 changes: 11 additions & 4 deletions placeholders/src/main/java/org/eclipse/ditto/placeholders/ImmutableTimePlaceholder.java
View file
Open in desktop
Expand Up @@ -118,10 +118,9 @@ private boolean isValidTimeRange(final String timeRangeSuffix) {
final String durationWithTruncate = timeRangeSuffix.substring(1);
final String durationString;
if (durationWithTruncate.contains(TRUNCATE_START) && durationWithTruncate.contains(TRUNCATE_END)) {
final String[] durationStringAndTruncateString = durationWithTruncate.split(TRUNCATE_START, 2);
durationString = durationStringAndTruncateString[0];
final String truncateString = durationStringAndTruncateString[1];
if (!isValidTruncateStatement(truncateString.substring(0, truncateString.lastIndexOf(TRUNCATE_END)))) {
durationString = durationWithTruncate
.substring(0, durationWithTruncate.indexOf(TRUNCATE_START));
if (!isValidTruncation(durationWithTruncate)) {
return false;
}
} else {
Expand All @@ -133,11 +132,19 @@ private boolean isValidTimeRange(final String timeRangeSuffix) {
} catch (final Exception e) {
return false;
}
} else if (timeRangeSuffix.contains(TRUNCATE_START) && timeRangeSuffix.contains(TRUNCATE_END)) {
return isValidTruncation(timeRangeSuffix);
} else {
return false;
}
}

private boolean isValidTruncation(final String durationWithTruncate) {
final String truncateString = durationWithTruncate
.substring(durationWithTruncate.indexOf(TRUNCATE_START) + 1);
return isValidTruncateStatement(truncateString.substring(0, truncateString.lastIndexOf(TRUNCATE_END)));
}

private boolean isValidTruncateStatement(final String truncateString) {
return DittoDuration.DittoTimeUnit.forSuffix(truncateString).isPresent();
}
Expand Down