Skip to content

Fix IMX dependencies #2

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@

<dependencies>
<dependency>
<groupId>org.dotwebstack.orchestrate</groupId>
<groupId>nl.geostandaarden.imx.orchestrate</groupId>
<artifactId>orchestrate-gateway</artifactId>
<version>${orchestrate.version}</version>
</dependency>
<dependency>
<groupId>org.dotwebstack.orchestrate</groupId>
<groupId>nl.geostandaarden.imx.orchestrate</groupId>
<artifactId>orchestrate-model</artifactId>
<version>${orchestrate.version}</version>
</dependency>
<dependency>
<groupId>org.dotwebstack.orchestrate</groupId>
<groupId>nl.geostandaarden.imx.orchestrate</groupId>
<artifactId>orchestrate-source</artifactId>
<version>${orchestrate.version}</version>
</dependency>
<dependency>
<groupId>org.dotwebstack.orchestrate</groupId>
<groupId>nl.geostandaarden.imx.orchestrate</groupId>
<artifactId>orchestrate-ext-spatial</artifactId>
<version>${orchestrate.version}</version>
</dependency>
Expand All @@ -68,7 +68,7 @@
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.dotwebstack.orchestrate</groupId>
<groupId>nl.geostandaarden.imx.orchestrate.mim</groupId>
<artifactId>orchestrate-mim</artifactId>
<version>${orchestrate-mim.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import org.dotwebstack.orchestrate.model.Model;
import org.dotwebstack.orchestrate.source.SourceException;
import nl.geostandaarden.imx.orchestrate.model.Model;
import nl.geostandaarden.imx.orchestrate.source.SourceException;
import reactor.netty.http.client.HttpClient;

@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
import java.util.Map;
import java.util.Objects;
import java.util.stream.Stream;
import org.dotwebstack.orchestrate.ext.spatial.GeometryType;
import org.dotwebstack.orchestrate.model.Attribute;
import org.dotwebstack.orchestrate.model.Model;
import org.dotwebstack.orchestrate.model.ObjectType;
import org.dotwebstack.orchestrate.model.Relation;
import org.dotwebstack.orchestrate.source.BatchRequest;
import org.dotwebstack.orchestrate.source.CollectionRequest;
import org.dotwebstack.orchestrate.source.DataRepository;
import org.dotwebstack.orchestrate.source.ObjectRequest;
import org.dotwebstack.orchestrate.source.SelectedProperty;
import org.dotwebstack.orchestrate.source.SourceException;
import nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryType;
import nl.geostandaarden.imx.orchestrate.model.Attribute;
import nl.geostandaarden.imx.orchestrate.model.Model;
import nl.geostandaarden.imx.orchestrate.model.ObjectType;
import nl.geostandaarden.imx.orchestrate.model.Relation;
import nl.geostandaarden.imx.orchestrate.source.BatchRequest;
import nl.geostandaarden.imx.orchestrate.source.CollectionRequest;
import nl.geostandaarden.imx.orchestrate.source.DataRepository;
import nl.geostandaarden.imx.orchestrate.source.ObjectRequest;
import nl.geostandaarden.imx.orchestrate.source.SelectedProperty;
import nl.geostandaarden.imx.orchestrate.source.SourceException;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.io.WKTWriter;
import reactor.core.publisher.Flux;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.ii.orchestrate.ogcapi;

import org.dotwebstack.orchestrate.source.DataRepository;
import org.dotwebstack.orchestrate.source.Source;
import nl.geostandaarden.imx.orchestrate.source.DataRepository;
import nl.geostandaarden.imx.orchestrate.source.Source;

public class OgcApiFeaturesSource implements Source {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.google.auto.service.AutoService;
import java.util.Map;
import java.util.Objects;
import org.dotwebstack.orchestrate.model.Model;
import org.dotwebstack.orchestrate.source.Source;
import org.dotwebstack.orchestrate.source.SourceException;
import org.dotwebstack.orchestrate.source.SourceType;
import nl.geostandaarden.imx.orchestrate.model.Model;
import nl.geostandaarden.imx.orchestrate.source.Source;
import nl.geostandaarden.imx.orchestrate.source.SourceException;
import nl.geostandaarden.imx.orchestrate.source.SourceType;

@AutoService(SourceType.class)
public class OgcApiFeaturesSourceType implements SourceType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.dotwebstack.orchestrate.model.Model;
import nl.geostandaarden.imx.orchestrate.model.Model;
import org.junit.jupiter.api.Test;

public class OgcApiFeaturesConfigurationTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
package de.ii.orchestrate.ogcapi;

import static org.dotwebstack.orchestrate.model.Cardinality.INFINITE;
import static nl.geostandaarden.imx.orchestrate.model.Cardinality.INFINITE;

import graphql.com.google.common.collect.ImmutableMap;
import graphql.com.google.common.collect.ImmutableSet;
import java.util.List;
import java.util.Map;
import org.dotwebstack.orchestrate.ext.spatial.GeometryType;
import org.dotwebstack.orchestrate.model.Attribute;
import org.dotwebstack.orchestrate.model.Cardinality;
import org.dotwebstack.orchestrate.model.Model;
import org.dotwebstack.orchestrate.model.ObjectType;
import org.dotwebstack.orchestrate.model.ObjectTypeRef;
import org.dotwebstack.orchestrate.model.Path;
import org.dotwebstack.orchestrate.model.Relation;
import org.dotwebstack.orchestrate.model.filters.EqualsOperatorType;
import org.dotwebstack.orchestrate.model.filters.FilterExpression;
import org.dotwebstack.orchestrate.model.types.ScalarTypes;
import org.dotwebstack.orchestrate.source.BatchRequest;
import org.dotwebstack.orchestrate.source.CollectionRequest;
import org.dotwebstack.orchestrate.source.ObjectRequest;
import org.dotwebstack.orchestrate.source.SelectedProperty;
import nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryType;
import nl.geostandaarden.imx.orchestrate.model.Attribute;
import nl.geostandaarden.imx.orchestrate.model.Cardinality;
import nl.geostandaarden.imx.orchestrate.model.Model;
import nl.geostandaarden.imx.orchestrate.model.ObjectType;
import nl.geostandaarden.imx.orchestrate.model.ObjectTypeRef;
import nl.geostandaarden.imx.orchestrate.model.Path;
import nl.geostandaarden.imx.orchestrate.model.Relation;
import nl.geostandaarden.imx.orchestrate.model.filters.EqualsOperatorType;
import nl.geostandaarden.imx.orchestrate.model.filters.FilterExpression;
import nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes;
import nl.geostandaarden.imx.orchestrate.source.BatchRequest;
import nl.geostandaarden.imx.orchestrate.source.CollectionRequest;
import nl.geostandaarden.imx.orchestrate.source.ObjectRequest;
import nl.geostandaarden.imx.orchestrate.source.SelectedProperty;
import org.junit.jupiter.api.Test;
import reactor.test.StepVerifier;

Expand Down