Skip to content

Commit 8efbe00

Browse files
committed
improve tile provider auto generation
1 parent eb806bc commit 8efbe00

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/app/TileProviderFeaturesFactory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.Map.Entry;
4343
import java.util.Optional;
4444
import java.util.function.Consumer;
45+
import java.util.stream.Stream;
4546
import javax.inject.Inject;
4647
import javax.inject.Singleton;
4748
import org.slf4j.Logger;
@@ -120,6 +121,11 @@ public EntityDataBuilder<? extends EntityData> emptySuperDataBuilder() {
120121
return new ImmutableProviderCommonData.Builder();
121122
}
122123

124+
@Override
125+
public List<String> getIgnoreKeys() {
126+
return Stream.concat(super.getIgnoreKeys().stream(), Stream.of("levels")).toList();
127+
}
128+
123129
@Override
124130
public Class<? extends EntityData> dataClass() {
125131
return TileProviderFeaturesData.class;

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/domain/MinMax.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
package de.ii.xtraplatform.tiles.domain;
99

10+
import com.fasterxml.jackson.annotation.JsonIgnore;
11+
import com.fasterxml.jackson.annotation.JsonInclude;
12+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
1013
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1114
import com.google.common.collect.Range;
1215
import de.ii.xtraplatform.entities.domain.maptobuilder.Buildable;
@@ -30,10 +33,13 @@ static MinMax of(int min, int max) {
3033
return new ImmutableMinMax.Builder().min(min).max(max).build();
3134
}
3235

36+
@JsonInclude(Include.ALWAYS)
3337
int getMin();
3438

39+
@JsonInclude(Include.ALWAYS)
3540
int getMax();
3641

42+
@JsonInclude(Include.NON_ABSENT)
3743
Optional<Integer> getDefault();
3844

3945
@Override
@@ -43,6 +49,7 @@ default ImmutableMinMax.Builder getBuilder() {
4349

4450
abstract class Builder implements BuildableBuilder<MinMax> {}
4551

52+
@JsonIgnore
4653
@Value.Lazy
4754
default Range<Integer> asRange() {
4855
return Range.closed(getMin(), getMax());

0 commit comments

Comments
 (0)