Skip to content

Set default roles in new resolver #362

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
azahnen merged 2 commits into from
Jun 29, 2025
Merged

Set default roles in new resolver #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be8376
remove checks
cportele Jun 26, 2025
8c625a5
add DefaultRolesResolver
cportele Jun 27, 2025
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
4 changes: 3 additions & 1 deletion ...le/src/main/java/de/ii/xtraplatform/features/oracle/app/FeatureProviderOracleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import de.ii.xtraplatform.features.domain.SchemaFragmentResolver;
import de.ii.xtraplatform.features.domain.SchemaReferenceResolver;
import de.ii.xtraplatform.features.domain.TypesResolver;
import de.ii.xtraplatform.features.domain.transform.DefaultRolesResolver;
import de.ii.xtraplatform.features.domain.transform.FeatureRefEmbedder;
import de.ii.xtraplatform.features.domain.transform.FeatureRefResolver;
import de.ii.xtraplatform.features.domain.transform.ImplicitMappingResolver;
Expand Down Expand Up @@ -160,7 +161,8 @@ public EntityData hydrateData(EntityData entityData) {
new ImplicitMappingResolver(),
new ConstantsResolver(),
new LabelTemplateResolver(data.getLabelTemplate()),
new MappingOperationResolver());
new MappingOperationResolver(),
new DefaultRolesResolver());

for (TypesResolver resolver : resolvers) {
data = applyTypesResolver(data, resolver);
Expand Down
4 changes: 3 additions & 1 deletion ...ures-sql/src/main/java/de/ii/xtraplatform/features/sql/app/FeatureProviderSqlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import de.ii.xtraplatform.features.domain.SchemaFragmentResolver;
import de.ii.xtraplatform.features.domain.SchemaReferenceResolver;
import de.ii.xtraplatform.features.domain.TypesResolver;
import de.ii.xtraplatform.features.domain.transform.DefaultRolesResolver;
import de.ii.xtraplatform.features.domain.transform.FeatureRefEmbedder;
import de.ii.xtraplatform.features.domain.transform.FeatureRefResolver;
import de.ii.xtraplatform.features.domain.transform.ImplicitMappingResolver;
Expand Down Expand Up @@ -199,7 +200,8 @@ public EntityData hydrateData(EntityData entityData) {
new ImplicitMappingResolver(),
new ConstantsResolver(),
new LabelTemplateResolver(data.getLabelTemplate()),
new MappingOperationResolver());
new MappingOperationResolver(),
new DefaultRolesResolver());

for (TypesResolver resolver : resolvers) {
data = applyTypesResolver(data, resolver);
Expand Down
107 changes: 0 additions & 107 deletions xtraplatform-features/src/main/java/de/ii/xtraplatform/features/domain/FeatureSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import de.ii.xtraplatform.features.domain.transform.PropertyTransformation;
import de.ii.xtraplatform.geometries.domain.SimpleFeatureGeometry;
import java.util.AbstractMap.SimpleEntry;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -776,112 +775,6 @@ default void concatConstraints() {
}
}

@Value.Check
default FeatureSchema primaryGeometry() {
if (isFeature()
&& getPrimaryGeometry().isPresent()
&& getPrimaryGeometry().filter(FeatureSchema::isPrimaryGeometry).isEmpty()) {
FeatureSchema primaryGeometry = getPrimaryGeometry().get();
ImmutableFeatureSchema.Builder builder =
new ImmutableFeatureSchema.Builder().from(this).propertyMap(new HashMap<>());

getPropertyMap()
.forEach(
(name, property) -> {
if (property.isSpatial()
&& Objects.equals(property.getName(), primaryGeometry.getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(property)
.role(Role.PRIMARY_GEOMETRY)
.build());
} else {
builder.putPropertyMap(name, property);
}
});

return builder.build();
}

return this;
}

@Value.Check
default FeatureSchema primaryInstant() {
if (isFeature()
&& getPrimaryInstant().isPresent()
&& getPrimaryInstant().filter(FeatureSchema::isPrimaryInstant).isEmpty()) {
FeatureSchema primaryInstant = getPrimaryInstant().get();
ImmutableFeatureSchema.Builder builder =
new ImmutableFeatureSchema.Builder().from(this).propertyMap(new HashMap<>());

getPropertyMap()
.forEach(
(name, property) -> {
if (property.isTemporal()
&& Objects.equals(property.getName(), primaryInstant.getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(property)
.role(Role.PRIMARY_INSTANT)
.build());
} else {
builder.putPropertyMap(name, property);
}
});

return builder.build();
}

return this;
}

@Value.Check
default FeatureSchema primaryInterval() {
if (isFeature()
&& getPrimaryInterval().isPresent()
&& getPrimaryInterval()
.filter(
interval ->
interval.first().isPrimaryIntervalStart()
&& interval.second().isPrimaryIntervalEnd())
.isEmpty()) {
Tuple<FeatureSchema, FeatureSchema> primaryInterval = getPrimaryInterval().get();
ImmutableFeatureSchema.Builder builder =
new ImmutableFeatureSchema.Builder().from(this).propertyMap(new HashMap<>());

getPropertyMap()
.forEach(
(name, property) -> {
if (property.isTemporal()
&& Objects.equals(property.getName(), primaryInterval.first().getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(property)
.role(Role.PRIMARY_INTERVAL_START)
.build());
} else if (property.isTemporal()
&& Objects.equals(property.getName(), primaryInterval.second().getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(property)
.role(Role.PRIMARY_INTERVAL_END)
.build());
} else {
builder.putPropertyMap(name, property);
}
});

return builder.build();
}

return this;
}

@Value.Check
default void disallowFlattening() {
Preconditions.checkState(
Expand Down
68 changes: 68 additions & 0 deletions ...ures/src/main/java/de/ii/xtraplatform/features/domain/transform/DefaultRolesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2022 interactive instruments GmbH
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package de.ii.xtraplatform.features.domain.transform;

import de.ii.xtraplatform.features.domain.FeatureSchema;
import de.ii.xtraplatform.features.domain.ImmutableFeatureSchema;
import de.ii.xtraplatform.features.domain.SchemaBase.Role;
import de.ii.xtraplatform.features.domain.TypesResolver;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

public class DefaultRolesResolver implements TypesResolver {

@Override
public boolean needsResolving(
FeatureSchema property, boolean isFeature, boolean isInConcat, boolean isInCoalesce) {
return isFeature
&& ((property.getPrimaryGeometry().isPresent()
&& property.getPrimaryGeometry().filter(FeatureSchema::isPrimaryGeometry).isEmpty())
|| (property.getPrimaryInstant().isPresent()
&& property.getPrimaryInstant().filter(FeatureSchema::isPrimaryInstant).isEmpty()));
}

@Override
public FeatureSchema resolve(FeatureSchema property, List<FeatureSchema> parents) {
Optional<FeatureSchema> primaryGeometry = property.getPrimaryGeometry();
Optional<FeatureSchema> primaryInstant = property.getPrimaryInstant();

ImmutableFeatureSchema.Builder builder =
new ImmutableFeatureSchema.Builder().from(property).propertyMap(new HashMap<>());

property
.getPropertyMap()
.forEach(
(name, prop) -> {
if (primaryGeometry.isPresent()
&& prop.isSpatial()
&& Objects.equals(prop.getName(), primaryGeometry.get().getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(prop)
.role(Role.PRIMARY_GEOMETRY)
.build());
} else if (primaryInstant.isPresent()
&& prop.isTemporal()
&& Objects.equals(prop.getName(), primaryInstant.get().getName())) {
builder.putPropertyMap(
name,
new ImmutableFeatureSchema.Builder()
.from(prop)
.role(Role.PRIMARY_INSTANT)
.build());
} else {
builder.putPropertyMap(name, prop);
}
});

return builder.build();
}
}