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

#1951 generate EPOCH timestamp as neutral element for string "format" date-time, date, time #2026

Merged
merged 1 commit into from
Sep 27, 2024
Merged

#1951 generate EPOCH timestamp as neutral element for string "format" date-time, date, time #2026

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions ...i/src/main/java/org/eclipse/ditto/wot/api/generator/DefaultWotThingSkeletonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

import java.net.MalformedURLException;
import java.net.URL;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -492,7 +495,8 @@ private static Optional<JsonValue> provideNeutralElementForDataSchema(final Sing
numberSchema.getExclusiveMaximum().orElse(null));
return Optional.of(JsonValue.of(neutralDouble));
case STRING:
return Optional.of(JsonValue.of(provideNeutralStringElement()));
final String format = dataSchema.getFormat().orElse(null);
return Optional.of(JsonValue.of(provideNeutralStringElement(format)));
case OBJECT:
return Optional.of(JsonObject.empty());
case ARRAY:
Expand Down Expand Up @@ -547,8 +551,13 @@ private static double provideNeutralDoubleElement(@Nullable final Double minimum
return result;
}

private static String provideNeutralStringElement() {
return "";
private static String provideNeutralStringElement(@Nullable final String format) {
return switch (format) {
case "date-time" -> DateTimeFormatter.ISO_INSTANT.format(Instant.EPOCH);
case "date" -> DateTimeFormatter.ISO_LOCAL_DATE.withZone( ZoneId.of("UTC")).format(Instant.EPOCH);
case "time" -> DateTimeFormatter.ISO_OFFSET_TIME.withZone( ZoneId.of("UTC")).format(Instant.EPOCH);
case null, default -> "";
};
}

private CompletionStage<FeatureDefinition> resolveFeatureDefinition(final ThingModel thingModel,
Expand Down
Loading