diff --git a/LICENSE.md b/LICENSE.md index e3719c2b..71c31393 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2023 DotWebStack +Copyright (c) 2023 IMX Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 2cf1c82d..d01390df 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Orchestrate +# IMX Orchestrate -![Build status](https://github.com/dotwebstack/orchestrate/actions/workflows/build.yml/badge.svg) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.dotwebstack.orchestrate%3Aorchestrate&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.dotwebstack.orchestrate%3Aorchestrate) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=org.dotwebstack.orchestrate%3Aorchestrate&metric=coverage)](https://sonarcloud.io/dashboard?id=org.dotwebstack.orchestrate%3Aorchestrate) +![Build status](https://github.com/imx-org/imx-orchestrate/actions/workflows/build.yml/badge.svg) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nl.geostandaarden.imx.orchestrate%3Aorchestrate&metric=alert_status)](https://sonarcloud.io/dashboard?id=nl.geostandaarden.imx.orchestrate%3Aorchestrate) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=nl.geostandaarden.imx.orchestrate%3Aorchestrate&metric=coverage)](https://sonarcloud.io/dashboard?id=nl.geostandaarden.imx.orchestrate%3Aorchestrate) ## Documentation -The documentation can be found here: https://dotwebstack.org/orchestrate/ +The documentation can be found here: https://imx-org.github.io/imx-orchestrate/ ## License diff --git a/docs/README.md b/docs/README.md index 937f34a9..f3cd4602 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# Orchestrate +# IMX Orchestrate This library offers an open-source engine for model-driven orchestration. diff --git a/docs/index.html b/docs/index.html index 3e5d6d10..9a190539 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,7 +13,7 @@ diff --git a/engine/pom.xml b/engine/pom.xml index 8702fcb4..20bad39c 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,12 +14,12 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-model ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source ${project.version} @@ -37,13 +37,13 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source-file ${project.version} test - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-parser-yaml ${project.version} test diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateException.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateException.java similarity index 82% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateException.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateException.java index f148ceb6..797b05eb 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateException.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine; +package nl.geostandaarden.imx.orchestrate.engine; public final class OrchestrateException extends RuntimeException { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateExtension.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateExtension.java similarity index 69% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateExtension.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateExtension.java index ef843e15..f6ee222f 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/OrchestrateExtension.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateExtension.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.engine; +package nl.geostandaarden.imx.orchestrate.engine; import graphql.schema.GraphQLCodeRegistry; import graphql.schema.idl.TypeDefinitionRegistry; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; public interface OrchestrateExtension { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/Orchestration.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/Orchestration.java similarity index 68% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/Orchestration.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/Orchestration.java index c27fd394..b532c8ce 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/Orchestration.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/Orchestration.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.engine; +package nl.geostandaarden.imx.orchestrate.engine; import java.util.Map; import java.util.Set; import lombok.Builder; import lombok.Getter; import lombok.Singular; -import org.dotwebstack.orchestrate.model.ModelMapping; -import org.dotwebstack.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.model.ModelMapping; +import nl.geostandaarden.imx.orchestrate.source.Source; @Getter @Builder(toBuilder = true) diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/AbstractFetchOperation.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/AbstractFetchOperation.java similarity index 81% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/AbstractFetchOperation.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/AbstractFetchOperation.java index 7e6b85d6..23df463c 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/AbstractFetchOperation.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/AbstractFetchOperation.java @@ -1,14 +1,14 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import java.util.List; import java.util.Set; import java.util.function.Function; import lombok.Singular; import lombok.experimental.SuperBuilder; -import org.dotwebstack.orchestrate.model.ObjectResult; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.Source; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/CollectionFetchOperation.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/CollectionFetchOperation.java similarity index 77% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/CollectionFetchOperation.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/CollectionFetchOperation.java index 1a735b2d..83002221 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/CollectionFetchOperation.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/CollectionFetchOperation.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import java.util.List; import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.model.ObjectResult; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.model.filters.FilterDefinition; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.source.CollectionRequest; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterDefinition; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchInput.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchInput.java similarity index 87% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchInput.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchInput.java index d7e9cb4a..6ae34683 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchInput.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchInput.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import java.util.Map; import lombok.Builder; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchOperation.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchOperation.java similarity index 63% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchOperation.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchOperation.java index f6d6cf38..f2d2b9fb 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchOperation.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchOperation.java @@ -1,7 +1,7 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import java.util.List; -import org.dotwebstack.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; import reactor.core.publisher.Flux; interface FetchOperation { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchPlanner.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchPlanner.java similarity index 88% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchPlanner.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchPlanner.java index 761d5e35..3829f547 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchPlanner.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchPlanner.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import static graphql.schema.GraphQLTypeUtil.isList; import static graphql.schema.GraphQLTypeUtil.unwrapNonNull; @@ -7,11 +7,11 @@ import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toSet; -import static org.dotwebstack.orchestrate.engine.fetch.FetchUtils.castToMap; -import static org.dotwebstack.orchestrate.engine.fetch.FetchUtils.isReservedField; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.QUERY_FILTER_ARGUMENTS; -import static org.dotwebstack.orchestrate.model.ModelUtils.extractKey; -import static org.dotwebstack.orchestrate.model.ModelUtils.keyExtractor; +import static nl.geostandaarden.imx.orchestrate.engine.fetch.FetchUtils.castToMap; +import static nl.geostandaarden.imx.orchestrate.engine.fetch.FetchUtils.isReservedField; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaConstants.QUERY_FILTER_ARGUMENTS; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.extractKey; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.keyExtractor; import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingFieldSelectionSet; @@ -23,20 +23,20 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.model.AbstractRelation; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.InverseRelation; -import org.dotwebstack.orchestrate.model.ModelMapping; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.ObjectTypeRef; -import org.dotwebstack.orchestrate.model.Path; -import org.dotwebstack.orchestrate.model.PathMapping; -import org.dotwebstack.orchestrate.model.Property; -import org.dotwebstack.orchestrate.model.Relation; -import org.dotwebstack.orchestrate.model.filters.FilterDefinition; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.model.AbstractRelation; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.InverseRelation; +import nl.geostandaarden.imx.orchestrate.model.ModelMapping; +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.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.Property; +import nl.geostandaarden.imx.orchestrate.model.Relation; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterDefinition; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.Source; import org.reactivestreams.Publisher; @RequiredArgsConstructor diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchUtils.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchUtils.java similarity index 78% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchUtils.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchUtils.java index 903b3b52..80d4c29c 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/FetchUtils.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchUtils.java @@ -1,21 +1,21 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import static graphql.introspection.Introspection.INTROSPECTION_SYSTEM_FIELDS; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.HAS_LINEAGE_FIELD; import graphql.schema.SelectedField; import java.util.Map; import java.util.function.UnaryOperator; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.schema.SchemaConstants; @NoArgsConstructor(access = AccessLevel.PRIVATE) final class FetchUtils { public static boolean isReservedField(SelectedField selectedField, UnaryOperator lineageRenamer) { var fieldName = selectedField.getName(); - return INTROSPECTION_SYSTEM_FIELDS.contains(fieldName) || lineageRenamer.apply(HAS_LINEAGE_FIELD).equals(fieldName); + return INTROSPECTION_SYSTEM_FIELDS.contains(fieldName) || lineageRenamer.apply(SchemaConstants.HAS_LINEAGE_FIELD).equals(fieldName); } @SuppressWarnings("unchecked") diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/GenericDataFetcher.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/GenericDataFetcher.java similarity index 87% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/GenericDataFetcher.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/GenericDataFetcher.java index 21a4b598..e4c0ac7d 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/GenericDataFetcher.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/GenericDataFetcher.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import static graphql.schema.GraphQLTypeUtil.unwrapAll; @@ -7,7 +7,7 @@ import graphql.schema.GraphQLObjectType; import java.util.Map; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; import org.reactivestreams.Publisher; @RequiredArgsConstructor diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/NextOperation.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/NextOperation.java similarity index 88% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/NextOperation.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/NextOperation.java index 6dccc2bd..299deedb 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/NextOperation.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/NextOperation.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import static java.util.function.Function.identity; -import static org.dotwebstack.orchestrate.engine.fetch.FetchUtils.cast; -import static org.dotwebstack.orchestrate.model.ModelUtils.extractKey; +import static nl.geostandaarden.imx.orchestrate.engine.fetch.FetchUtils.cast; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.extractKey; import java.util.List; import java.util.Map; @@ -10,10 +10,10 @@ import lombok.Getter; import org.dataloader.DataLoader; import org.dataloader.DataLoaderFactory; -import org.dotwebstack.orchestrate.model.CollectionResult; -import org.dotwebstack.orchestrate.model.ObjectResult; -import org.dotwebstack.orchestrate.model.Property; -import org.dotwebstack.orchestrate.model.Relation; +import nl.geostandaarden.imx.orchestrate.model.CollectionResult; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.model.Property; +import nl.geostandaarden.imx.orchestrate.model.Relation; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectFetchOperation.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectFetchOperation.java similarity index 86% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectFetchOperation.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectFetchOperation.java index 0375853f..50344b41 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectFetchOperation.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectFetchOperation.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import java.util.List; import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; -import org.dotwebstack.orchestrate.model.ObjectResult; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.source.BatchRequest; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectKeyFetcher.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectKeyFetcher.java similarity index 92% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectKeyFetcher.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectKeyFetcher.java index 0a886829..d77b3515 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectKeyFetcher.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectKeyFetcher.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectLineageFetcher.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectLineageFetcher.java similarity index 74% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectLineageFetcher.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectLineageFetcher.java index 6eea1de1..74e5742b 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectLineageFetcher.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectLineageFetcher.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; -import static org.dotwebstack.orchestrate.engine.fetch.FetchUtils.cast; +import static nl.geostandaarden.imx.orchestrate.engine.fetch.FetchUtils.cast; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,9 +10,9 @@ import java.util.Map; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.engine.schema.SchemaConstants; -import org.dotwebstack.orchestrate.model.lineage.ObjectLineage; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.schema.SchemaConstants; +import nl.geostandaarden.imx.orchestrate.model.lineage.ObjectLineage; @RequiredArgsConstructor public class ObjectLineageFetcher implements DataFetcher> { @@ -28,7 +28,7 @@ public Map get(DataFetchingEnvironment environment) { var hasLineageValue = source.get(SchemaConstants.HAS_LINEAGE_FIELD); if (hasLineageValue instanceof ObjectLineage objectLineage) { - return renameKeys(cast(OBJECT_MAPPER.convertValue(objectLineage, Map.class))); + return renameKeys(FetchUtils.cast(OBJECT_MAPPER.convertValue(objectLineage, Map.class))); } throw new OrchestrateException("Could not fetch object lineage."); @@ -42,14 +42,14 @@ private Map renameKeys(Map map) { var value = entry.getValue(); if (value instanceof Map mapValue) { - return renameKeys(cast(mapValue)); + return renameKeys(FetchUtils.cast(mapValue)); } if (value instanceof List listValue) { return listValue.stream() .map(item -> { if (item instanceof Map mapItem) { - return renameKeys(cast(mapItem)); + return renameKeys(FetchUtils.cast(mapItem)); } return item; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectResultMapper.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectResultMapper.java similarity index 79% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectResultMapper.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectResultMapper.java index 55ad824b..28f412ad 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/ObjectResultMapper.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/ObjectResultMapper.java @@ -1,40 +1,24 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableMap; -import static org.dotwebstack.orchestrate.engine.fetch.FetchUtils.cast; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.HAS_LINEAGE_FIELD; -import static org.dotwebstack.orchestrate.model.ModelUtils.noopCombiner; +import static nl.geostandaarden.imx.orchestrate.engine.fetch.FetchUtils.cast; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaConstants.HAS_LINEAGE_FIELD; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.noopCombiner; import graphql.schema.DataFetchingFieldSelectionSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.Builder; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.model.AbstractRelation; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.CollectionResult; -import org.dotwebstack.orchestrate.model.ModelMapping; -import org.dotwebstack.orchestrate.model.ObjectResult; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.Path; -import org.dotwebstack.orchestrate.model.PathMapping; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.Property; -import org.dotwebstack.orchestrate.model.PropertyMapping; -import org.dotwebstack.orchestrate.model.PropertyResult; -import org.dotwebstack.orchestrate.model.combiners.CoalesceCombinerType; -import org.dotwebstack.orchestrate.model.combiners.NoopCombinerType; -import org.dotwebstack.orchestrate.model.lineage.ObjectLineage; -import org.dotwebstack.orchestrate.model.lineage.ObjectReference; -import org.dotwebstack.orchestrate.model.lineage.OrchestratedProperty; -import org.dotwebstack.orchestrate.model.lineage.PropertyMappingExecution; -import org.dotwebstack.orchestrate.model.lineage.SourceProperty; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.PropertyMapping; +import nl.geostandaarden.imx.orchestrate.model.*; +import nl.geostandaarden.imx.orchestrate.model.combiners.CoalesceCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.NoopCombinerType; +import nl.geostandaarden.imx.orchestrate.model.lineage.*; @Builder public final class ObjectResultMapper { @@ -138,8 +122,8 @@ private PropertyResult mapProperty(ObjectResult objectResult, Property property, var pathResults = propertyMapping.getPathMappings() .stream() .flatMap(pathMapping -> pathResult(objectResult, property, pathMapping) - .map(pathResult -> pathResult.withPathMapping(org.dotwebstack.orchestrate.model.lineage.PathMapping.builder() - .addPath(org.dotwebstack.orchestrate.model.lineage.Path.builder() + .map(pathResult -> pathResult.withPathMapping(nl.geostandaarden.imx.orchestrate.model.lineage.PathMapping.builder() + .addPath(nl.geostandaarden.imx.orchestrate.model.lineage.Path.builder() .startNode(ObjectReference.fromResult(objectResult)) .segments(pathMapping.getPath() .getSegments()) @@ -161,7 +145,7 @@ private PropertyResult mapProperty(ObjectResult objectResult, Property property, : new CoalesceCombinerType().create(Map.of()); } - var propertyMappingExecution = org.dotwebstack.orchestrate.model.lineage.PropertyMapping.builder() + var propertyMappingExecution = nl.geostandaarden.imx.orchestrate.model.lineage.PropertyMapping.builder() .pathMapping(pathResults.stream() .map(PathResult::getPathMapping) .collect(Collectors.toSet())) diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/PropertyValueFetcher.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/PropertyValueFetcher.java similarity index 90% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/PropertyValueFetcher.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/PropertyValueFetcher.java index 33d04162..c5acb404 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/fetch/PropertyValueFetcher.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/PropertyValueFetcher.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.engine.fetch; +package nl.geostandaarden.imx.orchestrate.engine.fetch; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import java.util.Map; import java.util.function.UnaryOperator; import lombok.AllArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; @AllArgsConstructor public final class PropertyValueFetcher implements DataFetcher> { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaConstants.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaConstants.java similarity index 89% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaConstants.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaConstants.java index 84fd40eb..f3b3c1d8 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaConstants.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaConstants.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.schema; +package nl.geostandaarden.imx.orchestrate.engine.schema; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaFactory.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaFactory.java similarity index 84% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaFactory.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaFactory.java index 0e604fb3..44ed9a19 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaFactory.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaFactory.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.schema; +package nl.geostandaarden.imx.orchestrate.engine.schema; import static graphql.language.FieldDefinition.newFieldDefinition; import static graphql.language.ObjectTypeDefinition.newObjectTypeDefinition; @@ -7,19 +7,16 @@ import static graphql.schema.SchemaTransformer.transformSchema; import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring; import static org.apache.commons.lang3.StringUtils.uncapitalize; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.QUERY_COLLECTION_SUFFIX; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.QUERY_FILTER_ARGUMENTS; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.QUERY_FILTER_SUFFIX; -import static org.dotwebstack.orchestrate.engine.schema.SchemaConstants.QUERY_TYPE; -import static org.dotwebstack.orchestrate.engine.schema.SchemaUtils.applyCardinality; -import static org.dotwebstack.orchestrate.engine.schema.SchemaUtils.requiredListType; -import static org.dotwebstack.orchestrate.engine.schema.SchemaUtils.requiredType; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaUtils.applyCardinality; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaUtils.requiredListType; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaUtils.requiredType; import graphql.language.InputObjectTypeDefinition; import graphql.language.InputValueDefinition; import graphql.language.ObjectTypeDefinition; import graphql.language.Type; import graphql.language.TypeName; +import graphql.schema.FieldCoordinates; import graphql.schema.GraphQLCodeRegistry; import graphql.schema.GraphQLSchema; import graphql.schema.idl.SchemaGenerator; @@ -29,27 +26,27 @@ import java.util.function.UnaryOperator; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.engine.OrchestrateExtension; -import org.dotwebstack.orchestrate.engine.Orchestration; -import org.dotwebstack.orchestrate.engine.fetch.FetchPlanner; -import org.dotwebstack.orchestrate.engine.fetch.GenericDataFetcher; -import org.dotwebstack.orchestrate.engine.fetch.ObjectKeyFetcher; -import org.dotwebstack.orchestrate.engine.fetch.ObjectLineageFetcher; -import org.dotwebstack.orchestrate.engine.fetch.PropertyValueFetcher; -import org.dotwebstack.orchestrate.model.AbstractRelation; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ModelMapping; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.Property; -import org.dotwebstack.orchestrate.model.lineage.ObjectLineage; -import org.dotwebstack.orchestrate.model.lineage.ObjectReference; -import org.dotwebstack.orchestrate.model.lineage.OrchestratedProperty; -import org.dotwebstack.orchestrate.model.lineage.Path; -import org.dotwebstack.orchestrate.model.lineage.PathMapping; -import org.dotwebstack.orchestrate.model.lineage.PropertyMapping; -import org.dotwebstack.orchestrate.model.lineage.PropertyMappingExecution; -import org.dotwebstack.orchestrate.model.lineage.SourceProperty; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateExtension; +import nl.geostandaarden.imx.orchestrate.engine.fetch.FetchPlanner; +import nl.geostandaarden.imx.orchestrate.engine.Orchestration; +import nl.geostandaarden.imx.orchestrate.engine.fetch.GenericDataFetcher; +import nl.geostandaarden.imx.orchestrate.engine.fetch.ObjectKeyFetcher; +import nl.geostandaarden.imx.orchestrate.engine.fetch.ObjectLineageFetcher; +import nl.geostandaarden.imx.orchestrate.engine.fetch.PropertyValueFetcher; +import nl.geostandaarden.imx.orchestrate.model.AbstractRelation; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ModelMapping; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.Property; +import nl.geostandaarden.imx.orchestrate.model.lineage.ObjectLineage; +import nl.geostandaarden.imx.orchestrate.model.lineage.ObjectReference; +import nl.geostandaarden.imx.orchestrate.model.lineage.OrchestratedProperty; +import nl.geostandaarden.imx.orchestrate.model.lineage.Path; +import nl.geostandaarden.imx.orchestrate.model.lineage.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.lineage.PropertyMapping; +import nl.geostandaarden.imx.orchestrate.model.lineage.PropertyMappingExecution; +import nl.geostandaarden.imx.orchestrate.model.lineage.SourceProperty; @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public final class SchemaFactory { @@ -58,7 +55,7 @@ public final class SchemaFactory { private final GraphQLCodeRegistry.Builder codeRegistryBuilder = newCodeRegistry(); - private final ObjectTypeDefinition.Builder queryTypeBuilder = newObjectTypeDefinition().name(QUERY_TYPE); + private final ObjectTypeDefinition.Builder queryTypeBuilder = newObjectTypeDefinition().name(SchemaConstants.QUERY_TYPE); private final ModelMapping modelMapping; @@ -114,7 +111,7 @@ private void registerObjectType(ObjectType objectType) { typeDefinitionRegistry.add(objectTypeDefinition); var baseName = uncapitalize(objectTypeDefinition.getName()); - var collectionName = baseName.concat(QUERY_COLLECTION_SUFFIX); + var collectionName = baseName.concat(SchemaConstants.QUERY_COLLECTION_SUFFIX); var objectField = newFieldDefinition() .name(baseName) @@ -145,14 +142,14 @@ private void registerObjectType(ObjectType objectType) { if (!filterFields.isEmpty()) { typeDefinitionRegistry.add(InputObjectTypeDefinition.newInputObjectDefinition() .name(objectType.getName() - .concat(QUERY_FILTER_SUFFIX)) + .concat(SchemaConstants.QUERY_FILTER_SUFFIX)) .inputValueDefinitions(filterFields) .build()); var filterArgument = InputValueDefinition.newInputValueDefinition() - .name(QUERY_FILTER_ARGUMENTS) + .name(SchemaConstants.QUERY_FILTER_ARGUMENTS) .type(new TypeName(objectType.getName() - .concat(QUERY_FILTER_SUFFIX))) + .concat(SchemaConstants.QUERY_FILTER_SUFFIX))) .build(); collectionField = collectionField.transform(builder -> builder.inputValueDefinition(filterArgument)); @@ -161,8 +158,8 @@ private void registerObjectType(ObjectType objectType) { queryTypeBuilder.fieldDefinition(objectField) .fieldDefinition(collectionField); - codeRegistryBuilder.dataFetcher(coordinates(QUERY_TYPE, baseName), genericDataFetcher) - .dataFetcher(coordinates(QUERY_TYPE, collectionName), genericDataFetcher); + codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(SchemaConstants.QUERY_TYPE, baseName), genericDataFetcher) + .dataFetcher(FieldCoordinates.coordinates(SchemaConstants.QUERY_TYPE, collectionName), genericDataFetcher); } private boolean isFilterable(ObjectType objectType, Attribute attribute) { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaUtils.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaUtils.java similarity index 80% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaUtils.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaUtils.java index 5a168637..fce6f47f 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaUtils.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaUtils.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.engine.schema; +package nl.geostandaarden.imx.orchestrate.engine.schema; -import static org.dotwebstack.orchestrate.model.Cardinality.REQUIRED; +import static nl.geostandaarden.imx.orchestrate.model.Cardinality.REQUIRED; import graphql.language.ListType; import graphql.language.NonNullType; @@ -8,7 +8,7 @@ import graphql.language.TypeName; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.model.Cardinality; +import nl.geostandaarden.imx.orchestrate.model.Cardinality; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class SchemaUtils { diff --git a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaVisitor.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaVisitor.java similarity index 96% rename from engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaVisitor.java rename to engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaVisitor.java index 79103a58..54489a82 100644 --- a/engine/src/main/java/org/dotwebstack/orchestrate/engine/schema/SchemaVisitor.java +++ b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/schema/SchemaVisitor.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine.schema; +package nl.geostandaarden.imx.orchestrate.engine.schema; import static graphql.schema.DataFetcherFactories.wrapDataFetcher; import static graphql.util.TraversalControl.CONTINUE; diff --git a/engine/src/test/java/org/dotwebstack/orchestrate/engine/EngineIT.java b/engine/src/test/java/nl/geostandaarden/imx/orchestrate/engine/EngineIT.java similarity index 87% rename from engine/src/test/java/org/dotwebstack/orchestrate/engine/EngineIT.java rename to engine/src/test/java/nl/geostandaarden/imx/orchestrate/engine/EngineIT.java index 25cd90ba..26cac1e4 100644 --- a/engine/src/test/java/org/dotwebstack/orchestrate/engine/EngineIT.java +++ b/engine/src/test/java/nl/geostandaarden/imx/orchestrate/engine/EngineIT.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.engine; +package nl.geostandaarden.imx.orchestrate.engine; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.list; @@ -15,16 +15,16 @@ import java.nio.file.Paths; import java.util.List; import java.util.Map; -import org.dotwebstack.orchestrate.engine.schema.SchemaFactory; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.loader.ModelLoaderRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelLoader; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParser; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.DataRepository; -import org.dotwebstack.orchestrate.source.ObjectRequest; -import org.dotwebstack.orchestrate.source.file.FileSource; +import nl.geostandaarden.imx.orchestrate.engine.schema.SchemaFactory; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoaderRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelLoader; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParser; +import nl.geostandaarden.imx.orchestrate.source.BatchRequest; +import nl.geostandaarden.imx.orchestrate.source.DataRepository; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.file.FileSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/ext-spatial/pom.xml b/ext-spatial/pom.xml index c5ef5103..c4781b4e 100644 --- a/ext-spatial/pom.xml +++ b/ext-spatial/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,7 +14,7 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-engine ${project.version} @@ -28,13 +28,13 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source-file ${project.version} test - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-parser-yaml ${project.version} test diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryExtension.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryExtension.java similarity index 82% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryExtension.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryExtension.java index 6ce1ca6b..9577486e 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryExtension.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryExtension.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.ext.spatial; +package nl.geostandaarden.imx.orchestrate.ext.spatial; import static graphql.language.FieldDefinition.newFieldDefinition; import static graphql.language.ObjectTypeDefinition.newObjectTypeDefinition; -import static org.dotwebstack.orchestrate.engine.schema.SchemaUtils.requiredType; -import static org.dotwebstack.orchestrate.model.types.ScalarTypes.STRING; +import static nl.geostandaarden.imx.orchestrate.engine.schema.SchemaUtils.requiredType; +import static nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes.STRING; import graphql.language.InputObjectTypeDefinition; import graphql.language.InputValueDefinition; @@ -11,10 +11,10 @@ import graphql.schema.GraphQLCodeRegistry; import graphql.schema.idl.TypeDefinitionRegistry; import java.util.Map; -import org.dotwebstack.orchestrate.engine.OrchestrateExtension; -import org.dotwebstack.orchestrate.ext.spatial.filters.IntersectsOperatorType; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateExtension; +import nl.geostandaarden.imx.orchestrate.ext.spatial.filters.IntersectsOperatorType; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; public final class GeometryExtension implements OrchestrateExtension { diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryFetcher.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryFetcher.java similarity index 74% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryFetcher.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryFetcher.java index 46a20573..e8f2601a 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryFetcher.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryFetcher.java @@ -1,13 +1,13 @@ -package org.dotwebstack.orchestrate.ext.spatial; +package nl.geostandaarden.imx.orchestrate.ext.spatial; -import static org.dotwebstack.orchestrate.ext.spatial.GeometryExtension.AS_GEOJSON; -import static org.dotwebstack.orchestrate.ext.spatial.GeometryExtension.AS_WKB; -import static org.dotwebstack.orchestrate.ext.spatial.GeometryExtension.AS_WKT; +import static nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryExtension.AS_GEOJSON; +import static nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryExtension.AS_WKB; +import static nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryExtension.AS_WKT; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import java.util.Base64; -import org.dotwebstack.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.WKBWriter; import org.locationtech.jts.io.geojson.GeoJsonWriter; diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryType.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryType.java similarity index 86% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryType.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryType.java index 9afff873..8f89e082 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryType.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.ext.spatial; +package nl.geostandaarden.imx.orchestrate.ext.spatial; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -7,11 +7,11 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; -import org.dotwebstack.orchestrate.engine.OrchestrateException; -import org.dotwebstack.orchestrate.ext.spatial.filters.IntersectsOperatorType; -import org.dotwebstack.orchestrate.model.Path; -import org.dotwebstack.orchestrate.model.filters.FilterDefinition; -import org.dotwebstack.orchestrate.model.types.ValueType; +import nl.geostandaarden.imx.orchestrate.engine.OrchestrateException; +import nl.geostandaarden.imx.orchestrate.ext.spatial.filters.IntersectsOperatorType; +import nl.geostandaarden.imx.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterDefinition; +import nl.geostandaarden.imx.orchestrate.model.types.ValueType; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.PrecisionModel; diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryTypeFactory.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryTypeFactory.java similarity index 71% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryTypeFactory.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryTypeFactory.java index 7da7e6ec..1832def4 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/GeometryTypeFactory.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/GeometryTypeFactory.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.ext.spatial; +package nl.geostandaarden.imx.orchestrate.ext.spatial; import java.util.Map; -import org.dotwebstack.orchestrate.model.ModelException; -import org.dotwebstack.orchestrate.model.types.ValueTypeFactory; +import nl.geostandaarden.imx.orchestrate.model.ModelException; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeFactory; public class GeometryTypeFactory implements ValueTypeFactory { diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperator.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperator.java similarity index 63% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperator.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperator.java index fa7e917b..4875771d 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperator.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperator.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.ext.spatial.filters; +package nl.geostandaarden.imx.orchestrate.ext.spatial.filters; import lombok.Builder; import lombok.Getter; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; @Getter @Builder(toBuilder = true) diff --git a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperatorType.java b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperatorType.java similarity index 60% rename from ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperatorType.java rename to ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperatorType.java index 245fd624..51ddf514 100644 --- a/ext-spatial/src/main/java/org/dotwebstack/orchestrate/ext/spatial/filters/IntersectsOperatorType.java +++ b/ext-spatial/src/main/java/nl/geostandaarden/imx/orchestrate/ext/spatial/filters/IntersectsOperatorType.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.ext.spatial.filters; +package nl.geostandaarden.imx.orchestrate.ext.spatial.filters; import java.util.Map; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; -import org.dotwebstack.orchestrate.model.filters.FilterOperatorType; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperatorType; public class IntersectsOperatorType implements FilterOperatorType { diff --git a/gateway/pom.xml b/gateway/pom.xml index d2ec8d93..43510cc8 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,22 +14,22 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-engine ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-ext-spatial ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-parser-yaml ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source-file ${project.version} diff --git a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayApplication.java b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayApplication.java similarity index 84% rename from gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayApplication.java rename to gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayApplication.java index a441471e..815323cc 100644 --- a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayApplication.java +++ b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayApplication.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayConfiguration.java b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayConfiguration.java similarity index 82% rename from gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayConfiguration.java rename to gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayConfiguration.java index bd7e6986..b117f400 100644 --- a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayConfiguration.java +++ b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayConfiguration.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import static java.util.stream.Collectors.toUnmodifiableMap; import static java.util.stream.Collectors.toUnmodifiableSet; @@ -13,17 +13,17 @@ import java.util.function.Function; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.engine.Orchestration; -import org.dotwebstack.orchestrate.engine.schema.SchemaFactory; -import org.dotwebstack.orchestrate.ext.spatial.GeometryExtension; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.loader.ModelLoader; -import org.dotwebstack.orchestrate.model.loader.ModelLoaderRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParser; -import org.dotwebstack.orchestrate.source.Source; -import org.dotwebstack.orchestrate.source.SourceType; +import nl.geostandaarden.imx.orchestrate.engine.Orchestration; +import nl.geostandaarden.imx.orchestrate.engine.schema.SchemaFactory; +import nl.geostandaarden.imx.orchestrate.ext.spatial.GeometryExtension; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoader; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoaderRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParser; +import nl.geostandaarden.imx.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.source.SourceType; import org.springframework.boot.autoconfigure.graphql.GraphQlProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayException.java b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayException.java similarity index 86% rename from gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayException.java rename to gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayException.java index 08397e46..95fcce54 100644 --- a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayException.java +++ b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import java.io.Serial; diff --git a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayProperties.java b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayProperties.java similarity index 86% rename from gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayProperties.java rename to gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayProperties.java index aa42387f..dac3b461 100644 --- a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewayProperties.java +++ b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayProperties.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import java.util.Map; diff --git a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewaySource.java b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewaySource.java similarity index 74% rename from gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewaySource.java rename to gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewaySource.java index 98b0c847..7470a659 100644 --- a/gateway/src/main/java/org/dotwebstack/orchestrate/gateway/GatewaySource.java +++ b/gateway/src/main/java/nl/geostandaarden/imx/orchestrate/gateway/GatewaySource.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import java.util.Map; import lombok.Data; diff --git a/gateway/src/main/resources/application-local.yml b/gateway/src/main/resources/application-local.yml index c2b412e3..e1f9b115 100644 --- a/gateway/src/main/resources/application-local.yml +++ b/gateway/src/main/resources/application-local.yml @@ -1,7 +1,7 @@ logging: level: root: INFO - org.dotwebstack.orchestrate: DEBUG + nl.geostandaarden.imx.orchestrate: DEBUG orchestrate: mapping: ../data/geo/mapping.yaml diff --git a/gateway/src/test/java/org/dotwebstack/orchestrate/gateway/GatewayIT.java b/gateway/src/test/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayIT.java similarity index 96% rename from gateway/src/test/java/org/dotwebstack/orchestrate/gateway/GatewayIT.java rename to gateway/src/test/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayIT.java index 7c3c6998..8f894a92 100644 --- a/gateway/src/test/java/org/dotwebstack/orchestrate/gateway/GatewayIT.java +++ b/gateway/src/test/java/nl/geostandaarden/imx/orchestrate/gateway/GatewayIT.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.gateway; +package nl.geostandaarden.imx.orchestrate.gateway; import static org.assertj.core.api.Assertions.assertThat; diff --git a/model/pom.xml b/model/pom.xml index 80b123eb..c85c63da 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/AbstractProperty.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractProperty.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/AbstractProperty.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractProperty.java index 3f7bf4bf..e2a86ca8 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/AbstractProperty.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractProperty.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Builder; import lombok.Getter; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/AbstractRelation.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractRelation.java similarity index 90% rename from model/src/main/java/org/dotwebstack/orchestrate/model/AbstractRelation.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractRelation.java index 92ab35f1..a4c34db7 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/AbstractRelation.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/AbstractRelation.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Getter; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Attribute.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Attribute.java similarity index 72% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Attribute.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Attribute.java index cdc88180..a2378680 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Attribute.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Attribute.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Getter; import lombok.ToString; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import org.dotwebstack.orchestrate.model.types.ValueType; +import nl.geostandaarden.imx.orchestrate.model.types.ValueType; @Getter @Jacksonized diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Cardinality.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Cardinality.java similarity index 96% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Cardinality.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Cardinality.java index 1072923d..50275e38 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Cardinality.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Cardinality.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.regex.Pattern; import lombok.AccessLevel; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/CollectionResult.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/CollectionResult.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/CollectionResult.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/CollectionResult.java index 2182a011..5825d6c0 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/CollectionResult.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/CollectionResult.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.List; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ComponentRegistry.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ComponentRegistry.java similarity index 67% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ComponentRegistry.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ComponentRegistry.java index 35116233..413f9c9d 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ComponentRegistry.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ComponentRegistry.java @@ -1,30 +1,30 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.dotwebstack.orchestrate.model.combiners.CoalesceCombinerType; -import org.dotwebstack.orchestrate.model.combiners.JoinCombinerType; -import org.dotwebstack.orchestrate.model.combiners.MergeCombinerType; -import org.dotwebstack.orchestrate.model.combiners.NoopCombinerType; -import org.dotwebstack.orchestrate.model.combiners.ResultCombiner; -import org.dotwebstack.orchestrate.model.combiners.ResultCombinerType; -import org.dotwebstack.orchestrate.model.combiners.SumCombinerType; -import org.dotwebstack.orchestrate.model.filters.EqualsOperatorType; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; -import org.dotwebstack.orchestrate.model.filters.FilterOperatorType; -import org.dotwebstack.orchestrate.model.mappers.AppendMapperType; -import org.dotwebstack.orchestrate.model.mappers.CelMapperType; -import org.dotwebstack.orchestrate.model.mappers.PrependMapperType; -import org.dotwebstack.orchestrate.model.mappers.ResultMapper; -import org.dotwebstack.orchestrate.model.mappers.ResultMapperType; -import org.dotwebstack.orchestrate.model.matchers.CelMatcherType; -import org.dotwebstack.orchestrate.model.matchers.EqualsMatcherType; -import org.dotwebstack.orchestrate.model.matchers.IsNullMatcherType; -import org.dotwebstack.orchestrate.model.matchers.Matcher; -import org.dotwebstack.orchestrate.model.matchers.MatcherType; -import org.dotwebstack.orchestrate.model.matchers.NotEqualsMatcherType; -import org.dotwebstack.orchestrate.model.matchers.NotNullMatcherType; +import nl.geostandaarden.imx.orchestrate.model.filters.EqualsOperatorType; +import nl.geostandaarden.imx.orchestrate.model.combiners.CoalesceCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.JoinCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.MergeCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.NoopCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.ResultCombiner; +import nl.geostandaarden.imx.orchestrate.model.combiners.ResultCombinerType; +import nl.geostandaarden.imx.orchestrate.model.combiners.SumCombinerType; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperatorType; +import nl.geostandaarden.imx.orchestrate.model.mappers.AppendMapperType; +import nl.geostandaarden.imx.orchestrate.model.mappers.CelMapperType; +import nl.geostandaarden.imx.orchestrate.model.mappers.PrependMapperType; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapper; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapperType; +import nl.geostandaarden.imx.orchestrate.model.matchers.CelMatcherType; +import nl.geostandaarden.imx.orchestrate.model.matchers.EqualsMatcherType; +import nl.geostandaarden.imx.orchestrate.model.matchers.IsNullMatcherType; +import nl.geostandaarden.imx.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.matchers.MatcherType; +import nl.geostandaarden.imx.orchestrate.model.matchers.NotEqualsMatcherType; +import nl.geostandaarden.imx.orchestrate.model.matchers.NotNullMatcherType; public final class ComponentRegistry { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/InverseRelation.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/InverseRelation.java similarity index 90% rename from model/src/main/java/org/dotwebstack/orchestrate/model/InverseRelation.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/InverseRelation.java index b1f10422..dacc67f2 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/InverseRelation.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/InverseRelation.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Getter; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Model.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Model.java similarity index 96% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Model.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Model.java index 1f63bbf3..dd75c004 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Model.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Model.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import static java.util.stream.Collectors.toMap; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelException.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelException.java similarity index 81% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ModelException.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelException.java index 73b1538e..fdfdcf54 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelException.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; public final class ModelException extends RuntimeException { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelMapping.java similarity index 97% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ModelMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelMapping.java index 88c2d7fe..76428428 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelMapping.java @@ -1,7 +1,6 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import static java.util.stream.Collectors.toMap; -import static org.dotwebstack.orchestrate.model.ModelUtils.noopCombiner; import java.util.Map; import java.util.Optional; @@ -90,7 +89,7 @@ private Model resolveInverseRelations(Model model) { .appendProperty(targetRelation.getValue()); return acc.replaceObjectType(targetObjectType); - }, noopCombiner()); + }, ModelUtils.noopCombiner()); } private Set resolveInverseRelations(Set models) { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelUtils.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelUtils.java similarity index 98% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ModelUtils.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelUtils.java index 98874be3..e4a4e4a7 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ModelUtils.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ModelUtils.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.HashMap; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectResult.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectResult.java similarity index 81% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ObjectResult.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectResult.java index 74f6f02b..af94cab6 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectResult.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectResult.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; -import static org.dotwebstack.orchestrate.model.ModelUtils.keyExtractor; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.keyExtractor; import java.util.Map; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectType.java similarity index 97% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ObjectType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectType.java index 057aa31c..221ae824 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Collections; import java.util.List; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeMapping.java similarity index 93% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeMapping.java index 250a02cd..699b8761 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeMapping.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Map; import java.util.Optional; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeRef.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRef.java similarity index 95% rename from model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeRef.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRef.java index 1be2ea10..36fa6b1e 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/ObjectTypeRef.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRef.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.regex.Pattern; import lombok.AccessLevel; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Path.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Path.java similarity index 96% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Path.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Path.java index 4f22b65d..37f45366 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Path.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Path.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Arrays; import java.util.List; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/PathMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathMapping.java similarity index 70% rename from model/src/main/java/org/dotwebstack/orchestrate/model/PathMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathMapping.java index bc87c027..9d6f0882 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/PathMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathMapping.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.List; import lombok.Builder; import lombok.Getter; import lombok.Singular; import lombok.extern.jackson.Jacksonized; -import org.dotwebstack.orchestrate.model.mappers.ResultMapper; -import org.dotwebstack.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapper; @Getter @Jacksonized diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/PathRepeat.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathRepeat.java similarity index 64% rename from model/src/main/java/org/dotwebstack/orchestrate/model/PathRepeat.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathRepeat.java index 8a68ebe2..8d10edfc 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/PathRepeat.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathRepeat.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Builder; import lombok.Getter; import lombok.extern.jackson.Jacksonized; -import org.dotwebstack.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.matchers.Matcher; @Getter @Jacksonized diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/PathResult.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathResult.java similarity index 70% rename from model/src/main/java/org/dotwebstack/orchestrate/model/PathResult.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathResult.java index 955f443e..4be7bcdf 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/PathResult.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PathResult.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Builder; import lombok.Getter; -import org.dotwebstack.orchestrate.model.lineage.PathMapping; -import org.dotwebstack.orchestrate.model.lineage.SourceProperty; +import nl.geostandaarden.imx.orchestrate.model.lineage.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.lineage.SourceProperty; @Getter @Builder(toBuilder = true) @@ -13,7 +13,7 @@ public class PathResult { private final SourceProperty sourceProperty; - private final PathMapping pathMapping; + private final nl.geostandaarden.imx.orchestrate.model.lineage.PathMapping pathMapping; public boolean isNull() { return value == null; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Property.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Property.java similarity index 69% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Property.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Property.java index bead4b73..61956e7b 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Property.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Property.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; public interface Property { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/PropertyMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyMapping.java similarity index 72% rename from model/src/main/java/org/dotwebstack/orchestrate/model/PropertyMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyMapping.java index a9cfc896..aef98eb7 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/PropertyMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyMapping.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.List; import lombok.Builder; import lombok.Getter; import lombok.Singular; import lombok.extern.jackson.Jacksonized; -import org.dotwebstack.orchestrate.model.combiners.ResultCombiner; +import nl.geostandaarden.imx.orchestrate.model.combiners.ResultCombiner; @Getter @Jacksonized diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/PropertyResult.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyResult.java similarity index 65% rename from model/src/main/java/org/dotwebstack/orchestrate/model/PropertyResult.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyResult.java index 05ad4555..013fa0e9 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/PropertyResult.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/PropertyResult.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Set; import lombok.Builder; import lombok.Getter; -import org.dotwebstack.orchestrate.model.lineage.PropertyMapping; -import org.dotwebstack.orchestrate.model.lineage.SourceProperty; +import nl.geostandaarden.imx.orchestrate.model.lineage.PropertyMapping; +import nl.geostandaarden.imx.orchestrate.model.lineage.SourceProperty; @Getter @Builder(toBuilder = true) @@ -14,7 +14,7 @@ public final class PropertyResult { private final Set sourceProperties; - private final PropertyMapping propertyMapping; + private final nl.geostandaarden.imx.orchestrate.model.lineage.PropertyMapping propertyMapping; public boolean isEmpty() { return value == null; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/Relation.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Relation.java similarity index 92% rename from model/src/main/java/org/dotwebstack/orchestrate/model/Relation.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Relation.java index 88dd3dac..9e27ff93 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/Relation.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/Relation.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.List; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/RelationFilterMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/RelationFilterMapping.java similarity index 75% rename from model/src/main/java/org/dotwebstack/orchestrate/model/RelationFilterMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/RelationFilterMapping.java index 844c846b..6aab190b 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/RelationFilterMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/RelationFilterMapping.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import java.util.Map; import lombok.Builder; import lombok.Getter; import lombok.extern.jackson.Jacksonized; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; @Getter @Jacksonized diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/SourceRelation.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/SourceRelation.java similarity index 83% rename from model/src/main/java/org/dotwebstack/orchestrate/model/SourceRelation.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/SourceRelation.java index 4701f777..fa4a94de 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/SourceRelation.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/SourceRelation.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import lombok.Builder; import lombok.Getter; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/CoalesceCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/CoalesceCombinerType.java similarity index 80% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/CoalesceCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/CoalesceCombinerType.java index 84990342..e19fa184 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/CoalesceCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/CoalesceCombinerType.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import static java.util.Collections.emptySet; import java.util.Map; import java.util.Optional; import java.util.Set; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; public final class CoalesceCombinerType implements ResultCombinerType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/JoinCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/JoinCombinerType.java similarity index 83% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/JoinCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/JoinCombinerType.java index 55dcff15..58737eab 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/JoinCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/JoinCombinerType.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import java.util.Map; import java.util.stream.Collectors; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; public final class JoinCombinerType implements ResultCombinerType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/MergeCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/MergeCombinerType.java similarity index 81% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/MergeCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/MergeCombinerType.java index 12b4ce5c..d77701c1 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/MergeCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/MergeCombinerType.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.dotwebstack.orchestrate.model.CollectionResult; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.CollectionResult; +import nl.geostandaarden.imx.orchestrate.model.PathResult; public final class MergeCombinerType implements ResultCombinerType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/NoopCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/NoopCombinerType.java similarity index 80% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/NoopCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/NoopCombinerType.java index 3dfded8f..89ad3968 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/NoopCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/NoopCombinerType.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import static java.util.stream.Collectors.toSet; import java.util.Map; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; public final class NoopCombinerType implements ResultCombinerType { diff --git a/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombiner.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombiner.java new file mode 100644 index 00000000..281fdde0 --- /dev/null +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombiner.java @@ -0,0 +1,8 @@ +package nl.geostandaarden.imx.orchestrate.model.combiners; + +import java.util.List; +import java.util.function.Function; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; + +public interface ResultCombiner extends Function, PropertyResult> {} diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerException.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerException.java similarity index 80% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerException.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerException.java index 687c6c5e..e396f42f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerException.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; public final class ResultCombinerException extends RuntimeException { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerType.java similarity index 70% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerType.java index db5d204c..55ed6cd9 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/ResultCombinerType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/SumCombinerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/SumCombinerType.java similarity index 80% rename from model/src/main/java/org/dotwebstack/orchestrate/model/combiners/SumCombinerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/SumCombinerType.java index 28fa075d..6dcf8f10 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/SumCombinerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/combiners/SumCombinerType.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model.combiners; +package nl.geostandaarden.imx.orchestrate.model.combiners; import java.util.Map; import java.util.stream.Collectors; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.PropertyResult; public final class SumCombinerType implements ResultCombinerType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperator.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperator.java similarity index 80% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperator.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperator.java index 94381c33..77bb0d20 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperator.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperator.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; import lombok.Builder; import lombok.Getter; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperatorType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperatorType.java similarity index 84% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperatorType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperatorType.java index ec5c412f..d39a7540 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/EqualsOperatorType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/EqualsOperatorType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterDefinition.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterDefinition.java similarity index 85% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterDefinition.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterDefinition.java index aa78746b..a3d1f535 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterDefinition.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterDefinition.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; import java.util.Map; import java.util.function.Function; import lombok.Builder; -import org.dotwebstack.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.Path; @Builder(toBuilder = true) public final class FilterDefinition { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterExpression.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterExpression.java similarity index 78% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterExpression.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterExpression.java index 1a96d93f..15c1e28d 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterExpression.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterExpression.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; import lombok.Builder; import lombok.Getter; -import org.dotwebstack.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.Path; @Getter @Builder(toBuilder = true) diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperator.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperator.java similarity index 50% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperator.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperator.java index 4ac51fbf..4f1ee62c 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperator.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperator.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; public interface FilterOperator { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperatorType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperatorType.java similarity index 71% rename from model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperatorType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperatorType.java index 00d932c6..66971d9f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/filters/FilterOperatorType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/filters/FilterOperatorType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.filters; +package nl.geostandaarden.imx.orchestrate.model.filters; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectLineage.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectLineage.java similarity index 81% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectLineage.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectLineage.java index 4bc05489..c1265b5d 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectLineage.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectLineage.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.Set; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectReference.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectReference.java similarity index 71% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectReference.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectReference.java index 2349a188..0aa87b04 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/ObjectReference.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/ObjectReference.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; -import static org.dotwebstack.orchestrate.model.ModelUtils.extractKey; +import static nl.geostandaarden.imx.orchestrate.model.ModelUtils.extractKey; import java.util.Map; import lombok.Builder; import lombok.Getter; -import org.dotwebstack.orchestrate.model.ObjectResult; +import nl.geostandaarden.imx.orchestrate.model.ObjectResult; @Getter @Builder(toBuilder = true) diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/OrchestratedProperty.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/OrchestratedProperty.java similarity index 87% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/OrchestratedProperty.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/OrchestratedProperty.java index 4de9cf11..29c7532f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/OrchestratedProperty.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/OrchestratedProperty.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.Set; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/Path.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/Path.java similarity index 86% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/Path.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/Path.java index 768378cf..8053b407 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/Path.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/Path.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.LinkedHashSet; import java.util.List; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PathMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PathMapping.java similarity index 78% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PathMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PathMapping.java index 1d779c89..9d5b4d48 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PathMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PathMapping.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.List; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyLineage.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyLineage.java similarity index 67% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyLineage.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyLineage.java index 2bb0ba8d..85f91162 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyLineage.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyLineage.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; public interface PropertyLineage { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMapping.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMapping.java similarity index 76% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMapping.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMapping.java index 12f90c4f..f42cc4d8 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMapping.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMapping.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.Set; import lombok.Builder; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMappingExecution.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMappingExecution.java similarity index 74% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMappingExecution.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMappingExecution.java index fcdd5ac1..59938c1f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/PropertyMappingExecution.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/PropertyMappingExecution.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import lombok.Builder; import lombok.Getter; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/SourceProperty.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/SourceProperty.java similarity index 84% rename from model/src/main/java/org/dotwebstack/orchestrate/model/lineage/SourceProperty.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/SourceProperty.java index c644de89..a4c73a21 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/lineage/SourceProperty.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/lineage/SourceProperty.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.lineage; +package nl.geostandaarden.imx.orchestrate.model.lineage; import java.util.List; import lombok.Builder; diff --git a/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoader.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoader.java new file mode 100644 index 00000000..6dd6a8b1 --- /dev/null +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoader.java @@ -0,0 +1,11 @@ +package nl.geostandaarden.imx.orchestrate.model.loader; + +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; + +public interface ModelLoader { + + String getName(); + + Model load(String location, ValueTypeRegistry valueTypeRegistry); +} diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoaderRegistry.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoaderRegistry.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoaderRegistry.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoaderRegistry.java index ac88d155..3a87bb20 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoaderRegistry.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/loader/ModelLoaderRegistry.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.loader; +package nl.geostandaarden.imx.orchestrate.model.loader; import java.util.Arrays; import java.util.HashMap; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/AppendMapperType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/AppendMapperType.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/mappers/AppendMapperType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/AppendMapperType.java index b33a6ab2..31c045a3 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/AppendMapperType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/AppendMapperType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.mappers; +package nl.geostandaarden.imx.orchestrate.model.mappers; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/CelMapperType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/CelMapperType.java similarity index 91% rename from model/src/main/java/org/dotwebstack/orchestrate/model/mappers/CelMapperType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/CelMapperType.java index 6ec83fcb..632378a1 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/CelMapperType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/CelMapperType.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.model.mappers; +package nl.geostandaarden.imx.orchestrate.model.mappers; import java.util.HashMap; import java.util.Map; -import org.dotwebstack.orchestrate.model.ModelException; +import nl.geostandaarden.imx.orchestrate.model.ModelException; import org.projectnessie.cel.checker.Decls; import org.projectnessie.cel.tools.Script; import org.projectnessie.cel.tools.ScriptCreateException; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/PrependMapperType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/PrependMapperType.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/mappers/PrependMapperType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/PrependMapperType.java index 9fdbbb3a..1328f989 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/PrependMapperType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/PrependMapperType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.mappers; +package nl.geostandaarden.imx.orchestrate.model.mappers; import java.util.Map; diff --git a/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapper.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapper.java new file mode 100644 index 00000000..3f8f8be5 --- /dev/null +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapper.java @@ -0,0 +1,7 @@ +package nl.geostandaarden.imx.orchestrate.model.mappers; + +import java.util.function.BiFunction; +import nl.geostandaarden.imx.orchestrate.model.PathResult; +import nl.geostandaarden.imx.orchestrate.model.Property; + +public interface ResultMapper extends BiFunction {} diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperException.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperException.java similarity index 81% rename from model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperException.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperException.java index 068ce1f8..6ee37478 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperException.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.mappers; +package nl.geostandaarden.imx.orchestrate.model.mappers; public final class ResultMapperException extends RuntimeException { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperType.java similarity index 70% rename from model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperType.java index c670e7bf..d074b24f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapperType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/mappers/ResultMapperType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.mappers; +package nl.geostandaarden.imx.orchestrate.model.mappers; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/CelMatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/CelMatcherType.java similarity index 90% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/CelMatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/CelMatcherType.java index b1b3b779..ce087e74 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/CelMatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/CelMatcherType.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.HashMap; import java.util.Map; -import org.dotwebstack.orchestrate.model.ModelException; +import nl.geostandaarden.imx.orchestrate.model.ModelException; import org.projectnessie.cel.checker.Decls; import org.projectnessie.cel.tools.Script; import org.projectnessie.cel.tools.ScriptCreateException; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/EqualsMatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/EqualsMatcherType.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/EqualsMatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/EqualsMatcherType.java index b7681303..34ec1450 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/EqualsMatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/EqualsMatcherType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.Collection; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/IsNullMatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/IsNullMatcherType.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/IsNullMatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/IsNullMatcherType.java index 02653293..d858ebad 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/IsNullMatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/IsNullMatcherType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.Map; import java.util.Objects; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/Matcher.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/Matcher.java similarity index 61% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/Matcher.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/Matcher.java index fa6ae01d..fa32236b 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/Matcher.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/Matcher.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.function.Predicate; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherException.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherException.java similarity index 79% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherException.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherException.java index 4ab3bcdb..00e0b177 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherException.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; public final class MatcherException extends RuntimeException { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherType.java similarity index 68% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherType.java index 3f92147a..305ca52f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/MatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/MatcherType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotEqualsMatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotEqualsMatcherType.java similarity index 89% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotEqualsMatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotEqualsMatcherType.java index b1d048f1..9924f4f0 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotEqualsMatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotEqualsMatcherType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.Collection; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotNullMatcherType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotNullMatcherType.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotNullMatcherType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotNullMatcherType.java index 8ab9e7db..fab3585f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/matchers/NotNullMatcherType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/matchers/NotNullMatcherType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.matchers; +package nl.geostandaarden.imx.orchestrate.model.matchers; import java.util.Map; import java.util.Objects; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/BooleanType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/BooleanType.java similarity index 83% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/BooleanType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/BooleanType.java index 66054575..7a8936b0 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/BooleanType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/BooleanType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/DoubleType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/DoubleType.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/DoubleType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/DoubleType.java index 1f7e2c34..c4459731 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/DoubleType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/DoubleType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/FloatType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/FloatType.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/FloatType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/FloatType.java index f8490b24..5878435f 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/FloatType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/FloatType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/IntegerType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/IntegerType.java similarity index 83% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/IntegerType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/IntegerType.java index 0b016694..1961c960 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/IntegerType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/IntegerType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/LongType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/LongType.java similarity index 82% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/LongType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/LongType.java index 0aff713b..fbfd65fa 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/LongType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/LongType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.ToString; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarType.java similarity index 59% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarType.java index 74cf73d8..09b46dbf 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; public interface ScalarType extends ValueType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarTypes.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarTypes.java similarity index 90% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarTypes.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarTypes.java index e938f36e..e07c5a66 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ScalarTypes.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ScalarTypes.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/StringType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/StringType.java similarity index 87% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/StringType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/StringType.java index 964e4510..0d052469 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/StringType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/StringType.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueType.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueType.java similarity index 65% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueType.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueType.java index 13f4e18e..6876dae2 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueType.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueType.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import java.util.Map; -import org.dotwebstack.orchestrate.model.Path; -import org.dotwebstack.orchestrate.model.filters.EqualsOperatorType; -import org.dotwebstack.orchestrate.model.filters.FilterDefinition; +import nl.geostandaarden.imx.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.filters.EqualsOperatorType; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterDefinition; public interface ValueType { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeFactory.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeFactory.java similarity index 73% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeFactory.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeFactory.java index bb3a44f9..e23a9e21 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeFactory.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeFactory.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import java.util.Map; diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeRegistry.java b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeRegistry.java similarity index 91% rename from model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeRegistry.java rename to model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeRegistry.java index 2284e4fe..852635f7 100644 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/types/ValueTypeRegistry.java +++ b/model/src/main/java/nl/geostandaarden/imx/orchestrate/model/types/ValueTypeRegistry.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.model.types; +package nl.geostandaarden.imx.orchestrate.model.types; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.dotwebstack.orchestrate.model.ModelException; +import nl.geostandaarden.imx.orchestrate.model.ModelException; public final class ValueTypeRegistry { diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombiner.java b/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombiner.java deleted file mode 100644 index 21dd7e71..00000000 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/combiners/ResultCombiner.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.dotwebstack.orchestrate.model.combiners; - -import java.util.List; -import java.util.function.Function; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.PropertyResult; - -public interface ResultCombiner extends Function, PropertyResult> {} diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoader.java b/model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoader.java deleted file mode 100644 index 46e3fc4b..00000000 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/loader/ModelLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.dotwebstack.orchestrate.model.loader; - -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; - -public interface ModelLoader { - - String getName(); - - Model load(String location, ValueTypeRegistry valueTypeRegistry); -} diff --git a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapper.java b/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapper.java deleted file mode 100644 index bfbbbc47..00000000 --- a/model/src/main/java/org/dotwebstack/orchestrate/model/mappers/ResultMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.dotwebstack.orchestrate.model.mappers; - -import java.util.function.BiFunction; -import org.dotwebstack.orchestrate.model.PathResult; -import org.dotwebstack.orchestrate.model.Property; - -public interface ResultMapper extends BiFunction {} diff --git a/model/src/test/java/org/dotwebstack/orchestrate/model/ModelMappingTest.java b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelMappingTest.java similarity index 96% rename from model/src/test/java/org/dotwebstack/orchestrate/model/ModelMappingTest.java rename to model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelMappingTest.java index c4bc3c87..d345a3de 100644 --- a/model/src/test/java/org/dotwebstack/orchestrate/model/ModelMappingTest.java +++ b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelMappingTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/model/src/test/java/org/dotwebstack/orchestrate/model/ModelTest.java b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelTest.java similarity index 92% rename from model/src/test/java/org/dotwebstack/orchestrate/model/ModelTest.java rename to model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelTest.java index 63de3ea5..b98fb91c 100644 --- a/model/src/test/java/org/dotwebstack/orchestrate/model/ModelTest.java +++ b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ModelTest.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import static org.assertj.core.api.Assertions.assertThat; -import org.dotwebstack.orchestrate.model.types.ScalarTypes; +import nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes; import org.junit.jupiter.api.Test; class ModelTest { diff --git a/model/src/test/java/org/dotwebstack/orchestrate/model/ObjectTypeRefTest.java b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRefTest.java similarity index 93% rename from model/src/test/java/org/dotwebstack/orchestrate/model/ObjectTypeRefTest.java rename to model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRefTest.java index a15b46f4..6c989278 100644 --- a/model/src/test/java/org/dotwebstack/orchestrate/model/ObjectTypeRefTest.java +++ b/model/src/test/java/nl/geostandaarden/imx/orchestrate/model/ObjectTypeRefTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.model; +package nl.geostandaarden.imx.orchestrate.model; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/parser-yaml/pom.xml b/parser-yaml/pom.xml index a4713936..f78d85c6 100644 --- a/parser-yaml/pom.xml +++ b/parser-yaml/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,7 +14,7 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-model ${project.version} diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelLoader.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelLoader.java similarity index 71% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelLoader.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelLoader.java index 4adbb463..c2caf48b 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelLoader.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelLoader.java @@ -1,11 +1,11 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import com.google.auto.service.AutoService; import java.io.FileInputStream; import java.io.FileNotFoundException; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.loader.ModelLoader; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoader; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; @AutoService(ModelLoader.class) public final class YamlModelLoader implements ModelLoader { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParser.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParser.java similarity index 51% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParser.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParser.java index 8792334d..59d05309 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParser.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParser.java @@ -1,30 +1,30 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; import java.io.IOException; import java.io.InputStream; -import org.dotwebstack.orchestrate.model.Cardinality; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.ModelMapping; -import org.dotwebstack.orchestrate.model.PathMapping; -import org.dotwebstack.orchestrate.model.PropertyMapping; -import org.dotwebstack.orchestrate.model.combiners.ResultCombiner; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; -import org.dotwebstack.orchestrate.model.loader.ModelLoaderRegistry; -import org.dotwebstack.orchestrate.model.mappers.ResultMapper; -import org.dotwebstack.orchestrate.model.matchers.Matcher; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.CardinalityDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.FilterOperatorDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.MatcherDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ModelLoaderDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ResultCombinerDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ResultMapperDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.mixins.ModelMappingMixin; -import org.dotwebstack.orchestrate.parser.yaml.mixins.PathMappingMixin; -import org.dotwebstack.orchestrate.parser.yaml.mixins.PropertyMappingMixin; +import nl.geostandaarden.imx.orchestrate.model.Cardinality; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.ModelMapping; +import nl.geostandaarden.imx.orchestrate.model.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.PropertyMapping; +import nl.geostandaarden.imx.orchestrate.model.combiners.ResultCombiner; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoaderRegistry; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapper; +import nl.geostandaarden.imx.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.CardinalityDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.MatcherDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ResultCombinerDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ResultMapperDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.mixins.PathMappingMixin; +import nl.geostandaarden.imx.orchestrate.parser.yaml.mixins.PropertyMappingMixin; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.FilterOperatorDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ModelLoaderDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.mixins.ModelMappingMixin; public final class YamlModelMappingParser { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserException.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserException.java similarity index 87% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserException.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserException.java index b2d61207..3df8dafb 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserException.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import java.io.Serial; diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParser.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParser.java similarity index 67% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParser.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParser.java index addee2c9..51493c9c 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParser.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParser.java @@ -1,18 +1,18 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; import java.io.IOException; import java.io.InputStream; -import org.dotwebstack.orchestrate.model.Cardinality; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.model.types.ValueType; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.CardinalityDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ModelDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ObjectTypeDeserializer; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.ValueTypeDeserializer; +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.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueType; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.CardinalityDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ModelDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ObjectTypeDeserializer; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ValueTypeDeserializer; public final class YamlModelParser { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserException.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserException.java similarity index 86% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserException.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserException.java index db376b24..69f54b50 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserException.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import java.io.Serial; diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java similarity index 77% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java index bbbbb3f9..7ea9ceab 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/CardinalityDeserializer.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.INVALID_TEXT_OR_INT_NODE; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParser.INVALID_TEXT_OR_INT_NODE; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.node.TextNode; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.Cardinality; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParserException; +import nl.geostandaarden.imx.orchestrate.model.Cardinality; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParserException; public final class CardinalityDeserializer extends StdDeserializer { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ComponentUtils.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ComponentUtils.java similarity index 89% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ComponentUtils.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ComponentUtils.java index d1a8cf04..64878c9a 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ComponentUtils.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ComponentUtils.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.TreeNode; import com.fasterxml.jackson.core.type.TypeReference; @@ -9,7 +9,7 @@ import java.util.Optional; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParserException; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParserException; @NoArgsConstructor(access = AccessLevel.PRIVATE) final class ComponentUtils { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java similarity index 63% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java index 4bc19770..31dc516c 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/FilterOperatorDeserializer.java @@ -1,15 +1,12 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; - -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; public final class FilterOperatorDeserializer extends StdDeserializer { @@ -28,6 +25,6 @@ public FilterOperator deserialize(JsonParser parser, DeserializationContext cont var node = parser.getCodec() .readTree(parser); - return componentRegistry.createFilterOperator(parseType(node), parseOptions(node)); + return componentRegistry.createFilterOperator(ComponentUtils.parseType(node), ComponentUtils.parseOptions(node)); } } diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java similarity index 67% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java index a482db0b..b2a95c6b 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/MatcherDeserializer.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.matchers.Matcher; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.matchers.Matcher; public final class MatcherDeserializer extends StdDeserializer { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelDeserializer.java similarity index 72% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelDeserializer.java index 9ec90f68..9e80395f 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelDeserializer.java @@ -1,6 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; - -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.OBJECT_TYPES_KEY; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -8,10 +6,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelParser; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelParserException; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParser; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParserException; public class ModelDeserializer extends StdDeserializer { @@ -31,7 +29,7 @@ public Model deserialize(JsonParser parser, DeserializationContext context) thro throw new YamlModelParserException("Model is not an object node."); } - if (modelNode.get(OBJECT_TYPES_KEY) instanceof ObjectNode objectTypesNode) { + if (modelNode.get(YamlModelParser.OBJECT_TYPES_KEY) instanceof ObjectNode objectTypesNode) { var modelBuilder = Model.builder(); objectTypesNode.fields() @@ -49,6 +47,6 @@ public Model deserialize(JsonParser parser, DeserializationContext context) thro return modelBuilder.build(); } - throw new YamlModelParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, OBJECT_TYPES_KEY)); + throw new YamlModelParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, YamlModelParser.OBJECT_TYPES_KEY)); } } diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java similarity index 83% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java index ced742fe..2adb6bc9 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ModelLoaderDeserializer.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -9,10 +9,10 @@ import java.io.IOException; import java.io.Serial; import java.util.Optional; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.loader.ModelLoaderRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParserException; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoaderRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParserException; public class ModelLoaderDeserializer extends StdDeserializer { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java similarity index 64% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java index 6414e68f..e4ab1134 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ObjectTypeDeserializer.java @@ -1,9 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; - -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.ATTRIBUTES_KEY; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.INVALID_OBJECT_NODE; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.OBJECT_TYPES_KEY; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.RELATIONS_KEY; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -13,10 +8,11 @@ import java.io.IOException; import java.io.Serial; import java.util.Map; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.Relation; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelParserException; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.Relation; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParser; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParserException; public class ObjectTypeDeserializer extends StdDeserializer { @@ -36,27 +32,27 @@ public ObjectType deserialize(JsonParser parser, DeserializationContext context) return createObjectType(objectTypeNode, context); } - throw new YamlModelParserException(String.format(INVALID_OBJECT_NODE, OBJECT_TYPES_KEY)); + throw new YamlModelParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, YamlModelParser.OBJECT_TYPES_KEY)); } private ObjectType createObjectType(ObjectNode objectTypeNode, DeserializationContext context) { var objectTypeBuilder = ObjectType.builder(); - if (objectTypeNode.has(ATTRIBUTES_KEY)) { - if (objectTypeNode.get(ATTRIBUTES_KEY) instanceof ObjectNode attributesNode) { + if (objectTypeNode.has(YamlModelParser.ATTRIBUTES_KEY)) { + if (objectTypeNode.get(YamlModelParser.ATTRIBUTES_KEY) instanceof ObjectNode attributesNode) { attributesNode.fields() .forEachRemaining(entry -> objectTypeBuilder.property(createAttribute(entry, context))); } else { - throw new YamlModelParserException(String.format(INVALID_OBJECT_NODE, ATTRIBUTES_KEY)); + throw new YamlModelParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, YamlModelParser.ATTRIBUTES_KEY)); } } - if (objectTypeNode.has(RELATIONS_KEY)) { - if (objectTypeNode.get(RELATIONS_KEY) instanceof ObjectNode relationsNode) { + if (objectTypeNode.has(YamlModelParser.RELATIONS_KEY)) { + if (objectTypeNode.get(YamlModelParser.RELATIONS_KEY) instanceof ObjectNode relationsNode) { relationsNode.fields() .forEachRemaining(entry -> objectTypeBuilder.property(createRelation(entry, context))); } else { - throw new YamlModelParserException(String.format(INVALID_OBJECT_NODE, RELATIONS_KEY)); + throw new YamlModelParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, YamlModelParser.RELATIONS_KEY)); } } diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java similarity index 68% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java index 80c27c79..2b877041 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultCombinerDeserializer.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.combiners.ResultCombiner; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.combiners.ResultCombiner; public final class ResultCombinerDeserializer extends StdDeserializer { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java similarity index 68% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java index 26a7f15c..5e1110fe 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ResultMapperDeserializer.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; -import static org.dotwebstack.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseOptions; +import static nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.ComponentUtils.parseType; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.io.Serial; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.mappers.ResultMapper; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapper; public final class ResultMapperDeserializer extends StdDeserializer { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java similarity index 67% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java index dcba6fd4..99df6337 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/SourceModelDeserializer.java @@ -1,8 +1,6 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import static java.util.Collections.unmodifiableSet; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParser.SOURCE_MODELS_KEY; -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.INVALID_OBJECT_NODE; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -11,9 +9,11 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelMappingParserException; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelParserException; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParser; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelMappingParserException; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParser; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParserException; public final class SourceModelDeserializer extends JsonDeserializer> { @@ -40,6 +40,6 @@ public Set deserialize(JsonParser parser, DeserializationContext context) return unmodifiableSet(models); } - throw new YamlModelMappingParserException(String.format(INVALID_OBJECT_NODE, SOURCE_MODELS_KEY)); + throw new YamlModelMappingParserException(String.format(YamlModelParser.INVALID_OBJECT_NODE, YamlModelMappingParser.SOURCE_MODELS_KEY)); } } diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java similarity index 78% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java index 6ac8897d..5cdaecc3 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializer.java @@ -1,6 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; - -import static org.dotwebstack.orchestrate.parser.yaml.YamlModelParser.INVALID_TEXT_NODE; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -11,9 +9,10 @@ import java.io.Serial; import java.util.Map; import java.util.Optional; -import org.dotwebstack.orchestrate.model.types.ValueType; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; -import org.dotwebstack.orchestrate.parser.yaml.YamlModelParserException; +import nl.geostandaarden.imx.orchestrate.model.types.ValueType; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParser; +import nl.geostandaarden.imx.orchestrate.parser.yaml.YamlModelParserException; public class ValueTypeDeserializer extends StdDeserializer { @@ -55,6 +54,6 @@ public ValueType deserialize(JsonParser parser, DeserializationContext context) .create(options); } - throw new YamlModelParserException(String.format(INVALID_TEXT_NODE, "type")); + throw new YamlModelParserException(String.format(YamlModelParser.INVALID_TEXT_NODE, "type")); } } diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/ModelMappingMixin.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/ModelMappingMixin.java similarity index 52% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/ModelMappingMixin.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/ModelMappingMixin.java index 251fab36..7f179c13 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/ModelMappingMixin.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/ModelMappingMixin.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.parser.yaml.mixins; +package nl.geostandaarden.imx.orchestrate.parser.yaml.mixins; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.Set; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.parser.yaml.deserializers.SourceModelDeserializer; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers.SourceModelDeserializer; public abstract class ModelMappingMixin { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PathMappingMixin.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PathMappingMixin.java similarity index 70% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PathMappingMixin.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PathMappingMixin.java index 2b4e3d49..723e9f31 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PathMappingMixin.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PathMappingMixin.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.parser.yaml.mixins; +package nl.geostandaarden.imx.orchestrate.parser.yaml.mixins; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.List; -import org.dotwebstack.orchestrate.model.PathMapping; -import org.dotwebstack.orchestrate.model.mappers.ResultMapper; +import nl.geostandaarden.imx.orchestrate.model.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.mappers.ResultMapper; public abstract class PathMappingMixin { diff --git a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java similarity index 72% rename from parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java rename to parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java index e41b64dd..9ff33a78 100644 --- a/parser-yaml/src/main/java/org/dotwebstack/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java +++ b/parser-yaml/src/main/java/nl/geostandaarden/imx/orchestrate/parser/yaml/mixins/PropertyMappingMixin.java @@ -1,9 +1,9 @@ -package org.dotwebstack.orchestrate.parser.yaml.mixins; +package nl.geostandaarden.imx.orchestrate.parser.yaml.mixins; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.List; -import org.dotwebstack.orchestrate.model.PathMapping; +import nl.geostandaarden.imx.orchestrate.model.PathMapping; public abstract class PropertyMappingMixin { diff --git a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserTest.java b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserTest.java similarity index 69% rename from parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserTest.java rename to parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserTest.java index 342363cb..a17ea2c1 100644 --- a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelMappingParserTest.java +++ b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelMappingParserTest.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import static org.assertj.core.api.Assertions.assertThat; -import org.dotwebstack.orchestrate.model.ComponentRegistry; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.loader.ModelLoader; -import org.dotwebstack.orchestrate.model.loader.ModelLoaderRegistry; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoader; +import nl.geostandaarden.imx.orchestrate.model.loader.ModelLoaderRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; import org.junit.jupiter.api.Test; class YamlModelMappingParserTest { diff --git a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserTest.java b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserTest.java similarity index 76% rename from parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserTest.java rename to parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserTest.java index afbca6e1..d0a48dc9 100644 --- a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/YamlModelParserTest.java +++ b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/YamlModelParserTest.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.parser.yaml; +package nl.geostandaarden.imx.orchestrate.parser.yaml; import static org.assertj.core.api.Assertions.assertThat; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; import org.junit.jupiter.api.Test; class YamlModelParserTest { diff --git a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java similarity index 92% rename from parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java rename to parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java index a758de3e..0a39e290 100644 --- a/parser-yaml/src/test/java/org/dotwebstack/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java +++ b/parser-yaml/src/test/java/nl/geostandaarden/imx/orchestrate/parser/yaml/deserializers/ValueTypeDeserializerTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.parser.yaml.deserializers; +package nl.geostandaarden.imx.orchestrate.parser.yaml.deserializers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -16,9 +16,9 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.assertj.core.api.InstanceOfAssertFactories; -import org.dotwebstack.orchestrate.model.types.ValueType; -import org.dotwebstack.orchestrate.model.types.ValueTypeFactory; -import org.dotwebstack.orchestrate.model.types.ValueTypeRegistry; +import nl.geostandaarden.imx.orchestrate.model.types.ValueType; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeFactory; +import nl.geostandaarden.imx.orchestrate.model.types.ValueTypeRegistry; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/pom.xml b/pom.xml index 79b28c86..8e9686d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate pom 0.0.1-SNAPSHOT @@ -39,7 +39,7 @@ 5.4.0 0.8.10 3.9.1.2184 - dotwebstack + imx-org https://sonarcloud.io ${project.basedir}/../report-aggregate/target/site/jacoco-aggregate/jacoco.xml 3.1.2 diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml index 5d8b1c86..5366fafa 100644 --- a/report-aggregate/pom.xml +++ b/report-aggregate/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -18,42 +18,42 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-engine ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-ext-spatial ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-gateway ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-model ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-parser-yaml ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source-file ${project.version} - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source-graphql ${project.version} diff --git a/source-file/pom.xml b/source-file/pom.xml index 593e9399..621ef86d 100644 --- a/source-file/pom.xml +++ b/source-file/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,7 +14,7 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source ${project.version} diff --git a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileRepository.java b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepository.java similarity index 84% rename from source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileRepository.java rename to source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepository.java index 1d82c2b4..74f82d35 100644 --- a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileRepository.java +++ b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepository.java @@ -1,7 +1,7 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import static java.util.Collections.emptyList; -import static org.dotwebstack.orchestrate.source.file.FileUtils.getObjectProperties; +import static nl.geostandaarden.imx.orchestrate.source.file.FileUtils.getObjectProperties; import com.fasterxml.jackson.core.JsonPointer; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,13 +10,13 @@ import java.util.Map; import java.util.Optional; import java.util.function.Predicate; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.DataRepository; -import org.dotwebstack.orchestrate.source.DataRequest; -import org.dotwebstack.orchestrate.model.filters.FilterExpression; -import org.dotwebstack.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.source.BatchRequest; +import nl.geostandaarden.imx.orchestrate.source.CollectionRequest; +import nl.geostandaarden.imx.orchestrate.source.DataRequest; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.DataRepository; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterExpression; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSource.java b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSource.java similarity index 87% rename from source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSource.java rename to source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSource.java index 2b86c27e..b76f5150 100644 --- a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSource.java +++ b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSource.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,11 +10,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.PathMatcher; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.DataRepository; -import org.dotwebstack.orchestrate.source.Source; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.source.DataRepository; +import nl.geostandaarden.imx.orchestrate.source.SourceException; public final class FileSource implements Source { diff --git a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSourceType.java b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceType.java similarity index 75% rename from source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSourceType.java rename to source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceType.java index db85a2a8..9ad334d3 100644 --- a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileSourceType.java +++ b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceType.java @@ -1,13 +1,13 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import java.nio.file.Path; import java.util.Map; import com.google.auto.service.AutoService; -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 FileSourceType implements SourceType { diff --git a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileUtils.java b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtils.java similarity index 85% rename from source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileUtils.java rename to source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtils.java index 7ac94886..7f13dba1 100644 --- a/source-file/src/main/java/org/dotwebstack/orchestrate/source/file/FileUtils.java +++ b/source-file/src/main/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtils.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -8,10 +8,10 @@ import java.util.Map; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.Property; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.Property; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.SourceException; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class FileUtils { diff --git a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileRepositoryTest.java b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepositoryTest.java similarity index 87% rename from source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileRepositoryTest.java rename to source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepositoryTest.java index 36e473f4..82ce871e 100644 --- a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileRepositoryTest.java +++ b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileRepositoryTest.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.List; import java.util.Map; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.types.ScalarTypes; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.ObjectRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes; +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; diff --git a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileSourceTest.java b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceTest.java similarity index 82% rename from source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileSourceTest.java rename to source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceTest.java index d3d89622..2c62f951 100644 --- a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileSourceTest.java +++ b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileSourceTest.java @@ -1,18 +1,18 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.nio.file.Paths; import java.util.List; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.Model; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.ObjectTypeRef; -import org.dotwebstack.orchestrate.model.Relation; -import org.dotwebstack.orchestrate.model.types.ScalarTypes; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; +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.ObjectTypeRef; +import nl.geostandaarden.imx.orchestrate.model.Relation; +import nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes; +import nl.geostandaarden.imx.orchestrate.source.CollectionRequest; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileUtilsTest.java b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtilsTest.java similarity index 83% rename from source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileUtilsTest.java rename to source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtilsTest.java index 67cb9319..a901c3ef 100644 --- a/source-file/src/test/java/org/dotwebstack/orchestrate/source/file/FileUtilsTest.java +++ b/source-file/src/test/java/nl/geostandaarden/imx/orchestrate/source/file/FileUtilsTest.java @@ -1,20 +1,20 @@ -package org.dotwebstack.orchestrate.source.file; +package nl.geostandaarden.imx.orchestrate.source.file; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.dotwebstack.orchestrate.source.file.FileUtils.getBaseName; -import static org.dotwebstack.orchestrate.source.file.FileUtils.getObjectKey; -import static org.dotwebstack.orchestrate.source.file.FileUtils.getObjectProperties; +import static nl.geostandaarden.imx.orchestrate.source.file.FileUtils.getBaseName; +import static nl.geostandaarden.imx.orchestrate.source.file.FileUtils.getObjectKey; +import static nl.geostandaarden.imx.orchestrate.source.file.FileUtils.getObjectProperties; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import java.nio.file.Paths; import java.util.List; import java.util.stream.Stream; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.types.ScalarTypes; -import org.dotwebstack.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.types.ScalarTypes; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/source-graphql/pom.xml b/source-graphql/pom.xml index a002ae77..d3172acf 100644 --- a/source-graphql/pom.xml +++ b/source-graphql/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,7 +14,7 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-source ${project.version} diff --git a/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSource.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSource.java new file mode 100644 index 00000000..fe1e3f14 --- /dev/null +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSource.java @@ -0,0 +1,26 @@ +package nl.geostandaarden.imx.orchestrate.source.graphql; + +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.executor.RemoteExecutor; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.BatchGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ResponseMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.repository.GraphQlRepository; +import nl.geostandaarden.imx.orchestrate.source.DataRepository; +import nl.geostandaarden.imx.orchestrate.source.Source; + +public class GraphQlSource implements Source { + + private final GraphQlOrchestrateConfig config; + + GraphQlSource(GraphQlOrchestrateConfig config) { + this.config = config; + } + + @Override + public DataRepository getDataRepository() { + return new GraphQlRepository(RemoteExecutor.create(config), new ObjectGraphQlMapper(config), + new CollectionGraphQlMapper(config), new BatchGraphQlMapper(config), new ResponseMapper(config)); + } +} diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceType.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceType.java similarity index 80% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceType.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceType.java index c01748d2..094f20c7 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceType.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceType.java @@ -1,12 +1,12 @@ -package org.dotwebstack.orchestrate.source.graphql; +package nl.geostandaarden.imx.orchestrate.source.graphql; import com.google.auto.service.AutoService; import java.util.Map; -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 org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.source.Source; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.SourceType; @AutoService(SourceType.class) public class GraphQlSourceType implements SourceType { diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java similarity index 81% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java index a83dbae4..11826f4e 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfig.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.config; +package nl.geostandaarden.imx.orchestrate.source.graphql.config; import lombok.Builder; import lombok.Getter; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/Executor.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/Executor.java similarity index 73% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/Executor.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/Executor.java index a552b6b7..38da81b2 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/Executor.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/Executor.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.executor; +package nl.geostandaarden.imx.orchestrate.source.graphql.executor; import graphql.ExecutionInput; import graphql.ExecutionResult; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClient.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClient.java similarity index 90% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClient.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClient.java index 9843d09c..0e53b7c2 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClient.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClient.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.executor; +package nl.geostandaarden.imx.orchestrate.source.graphql.executor; import java.time.Duration; import java.util.Optional; @@ -6,7 +6,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; import org.springframework.http.HttpHeaders; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.web.reactive.function.client.ExchangeStrategies; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/RemoteExecutor.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/RemoteExecutor.java similarity index 91% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/RemoteExecutor.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/RemoteExecutor.java index 3b7df08b..d15b520a 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/executor/RemoteExecutor.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/RemoteExecutor.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.executor; +package nl.geostandaarden.imx.orchestrate.source.graphql.executor; import graphql.ExecutionInput; import graphql.ExecutionResult; @@ -8,7 +8,7 @@ import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.BodyInserters; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java similarity index 79% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java index 325048a8..fdfcc521 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/AbstractGraphQlMapper.java @@ -1,14 +1,14 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import graphql.language.Field; import graphql.language.SelectionSet; import java.util.ArrayList; import java.util.List; -import org.dotwebstack.orchestrate.model.Relation; -import org.dotwebstack.orchestrate.source.DataRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.model.Relation; +import nl.geostandaarden.imx.orchestrate.source.DataRequest; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.SourceException; import org.springframework.util.ObjectUtils; abstract class AbstractGraphQlMapper { diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java similarity index 84% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java index b6470fc0..dbb3a209 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapper.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import graphql.language.Argument; @@ -10,11 +10,10 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.BatchRequest; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import static org.dotwebstack.orchestrate.source.graphql.mapper.ValueMapper.mapToValue; import static org.springframework.util.StringUtils.uncapitalize; @RequiredArgsConstructor @@ -73,7 +72,7 @@ private List getArguments(BatchRequest request) { } private Argument getArgument(String name, Object value) { - return new Argument(name, mapToValue(value)); + return new Argument(name, ValueMapper.mapToValue(value)); } } diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java similarity index 84% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java index 8c5053e5..c86e6685 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapper.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import graphql.language.Argument; @@ -12,14 +12,13 @@ import java.util.Collections; import java.util.List; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.model.filters.FilterExpression; -import org.dotwebstack.orchestrate.model.filters.FilterOperator; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.SourceException; - -import static org.dotwebstack.orchestrate.source.graphql.mapper.MapperConstants.NODES; -import static org.dotwebstack.orchestrate.source.graphql.mapper.ValueMapper.mapToValue; +import nl.geostandaarden.imx.orchestrate.source.CollectionRequest; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterExpression; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterOperator; + +import static nl.geostandaarden.imx.orchestrate.source.graphql.mapper.MapperConstants.NODES; import static org.springframework.util.StringUtils.uncapitalize; @RequiredArgsConstructor @@ -75,7 +74,7 @@ private ObjectField getFilterField(FilterExpression filterExpression) { var objectField = ObjectField.newObjectField() .name(mapToFilterOperator(filterOperator)) - .value(mapToValue(value)) + .value(ValueMapper.mapToValue(value)) .build(); return getFilterField(reverseFieldPaths, objectField); diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/MapperConstants.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/MapperConstants.java similarity index 73% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/MapperConstants.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/MapperConstants.java index d94c80ed..1b2e14e5 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/MapperConstants.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/MapperConstants.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java similarity index 81% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java index 74062b46..1c96b014 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapper.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import graphql.language.Argument; @@ -10,10 +10,9 @@ import java.util.List; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import static org.dotwebstack.orchestrate.source.graphql.mapper.ValueMapper.mapToValue; import static org.springframework.util.StringUtils.uncapitalize; @RequiredArgsConstructor @@ -53,7 +52,7 @@ private List getArguments(ObjectRequest request) { .toList(); } private Argument getArgument(String name, Object value) { - return new Argument(name, mapToValue(value)); + return new Argument(name, ValueMapper.mapToValue(value)); } } diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapper.java similarity index 90% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapper.java index d8c8d047..19a76fb0 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapper.java @@ -1,6 +1,5 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; -import static org.dotwebstack.orchestrate.source.graphql.mapper.MapperConstants.NODES; import static org.springframework.util.StringUtils.uncapitalize; import graphql.ExecutionResult; @@ -9,7 +8,7 @@ import java.util.Map; import java.util.Optional; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -40,7 +39,7 @@ private List> getCollectionResult(ExecutionResult executionR var data = executionResult.getData(); var result = ((Map>>>) data) .get(uncapitalize(objectName) + config.getCollectionSuffix()); - return result.get(NODES); + return result.get(MapperConstants.NODES); } private List> getBatchResult(ExecutionResult executionResult, String objectName) { diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapper.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapper.java similarity index 87% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapper.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapper.java index 1f77b65b..4fde5659 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapper.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapper.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.language.ArrayValue; import graphql.language.BooleanValue; @@ -8,7 +8,7 @@ import java.util.List; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.SourceException; @NoArgsConstructor(access = AccessLevel.PRIVATE) class ValueMapper { diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepository.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepository.java similarity index 62% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepository.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepository.java index 2a6b3e97..40d1d20f 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepository.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepository.java @@ -1,18 +1,18 @@ -package org.dotwebstack.orchestrate.source.graphql.repository; +package nl.geostandaarden.imx.orchestrate.source.graphql.repository; import java.util.Map; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.DataRepository; -import org.dotwebstack.orchestrate.source.DataRequest; -import org.dotwebstack.orchestrate.source.ObjectRequest; -import org.dotwebstack.orchestrate.source.graphql.executor.Executor; -import org.dotwebstack.orchestrate.source.graphql.mapper.BatchGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ResponseMapper; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.BatchGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ResponseMapper; +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.DataRequest; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.graphql.executor.Executor; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/CoreScalars.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/CoreScalars.java similarity index 89% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/CoreScalars.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/CoreScalars.java index 432d5cf3..c3d3af61 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/CoreScalars.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/CoreScalars.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import graphql.schema.GraphQLScalarType; import lombok.AccessLevel; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercing.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercing.java similarity index 97% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercing.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercing.java index 391b8264..abbdde44 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercing.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercing.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import graphql.GraphQLContext; import graphql.execution.CoercedVariables; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateSupplier.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateSupplier.java similarity index 88% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateSupplier.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateSupplier.java index 9913859e..2eca59cd 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateSupplier.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateSupplier.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import java.time.LocalDate; import java.util.function.Supplier; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercing.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercing.java similarity index 97% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercing.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercing.java index 6b862a8a..ebd3aa85 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercing.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercing.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import graphql.GraphQLContext; import graphql.execution.CoercedVariables; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeSupplier.java b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeSupplier.java similarity index 89% rename from source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeSupplier.java rename to source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeSupplier.java index 8d86ee9a..f607257d 100644 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeSupplier.java +++ b/source-graphql/src/main/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeSupplier.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import java.time.OffsetDateTime; import java.util.function.Supplier; diff --git a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSource.java b/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSource.java deleted file mode 100644 index 52a25166..00000000 --- a/source-graphql/src/main/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSource.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.dotwebstack.orchestrate.source.graphql; - -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.source.graphql.executor.RemoteExecutor; -import org.dotwebstack.orchestrate.source.graphql.mapper.BatchGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ResponseMapper; -import org.dotwebstack.orchestrate.source.graphql.repository.GraphQlRepository; -import org.dotwebstack.orchestrate.source.DataRepository; -import org.dotwebstack.orchestrate.source.Source; - -public class GraphQlSource implements Source { - - private final GraphQlOrchestrateConfig config; - - GraphQlSource(GraphQlOrchestrateConfig config) { - this.config = config; - } - - @Override - public DataRepository getDataRepository() { - return new GraphQlRepository(RemoteExecutor.create(config), new ObjectGraphQlMapper(config), - new CollectionGraphQlMapper(config), new BatchGraphQlMapper(config), new ResponseMapper(config)); - } -} diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceTypeTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceTypeTest.java similarity index 75% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceTypeTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceTypeTest.java index 4530e53b..c991bb9f 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/GraphQlSourceTypeTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/GraphQlSourceTypeTest.java @@ -1,6 +1,7 @@ -package org.dotwebstack.orchestrate.source.graphql; +package nl.geostandaarden.imx.orchestrate.source.graphql; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Map; @@ -23,8 +24,8 @@ void create_returnsNewSource_withRequiredConfig() { var result = new GraphQlSourceType().create(null, config); - assertThat(result).isNotNull(); - assertThat(result.getDataRepository()).isNotNull(); + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(result.getDataRepository()).isNotNull(); } @Test @@ -36,8 +37,8 @@ void create_returnsNewSource_withAllConfig() { var result = new GraphQlSourceType().create(null, config); - assertThat(result).isNotNull(); - assertThat(result.getDataRepository()).isNotNull(); + Assertions.assertThat(result).isNotNull(); + Assertions.assertThat(result.getDataRepository()).isNotNull(); } @Test diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java similarity index 90% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java index b78e2a16..1a05752a 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/config/GraphQlOrchestrateConfigTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.config; +package nl.geostandaarden.imx.orchestrate.source.graphql.config; import static org.assertj.core.api.Assertions.assertThat; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClientTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClientTest.java similarity index 95% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClientTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClientTest.java index a2b5a94a..eb652d6c 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/executor/GraphQlWebClientTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/executor/GraphQlWebClientTest.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.source.graphql.executor; +package nl.geostandaarden.imx.orchestrate.source.graphql.executor; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java similarity index 84% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java index f10b4567..95102180 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/BatchGraphQlMapperTest.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import java.util.List; import java.util.Map; import java.util.Set; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.BatchRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.BatchRequest; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java similarity index 85% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java index 7428b6de..9ef9ddd2 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/CollectionGraphQlMapperTest.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.model.Path; -import org.dotwebstack.orchestrate.model.filters.EqualsOperatorType; -import org.dotwebstack.orchestrate.model.filters.FilterExpression; -import org.dotwebstack.orchestrate.source.CollectionRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.CollectionRequest; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.Path; +import nl.geostandaarden.imx.orchestrate.model.filters.EqualsOperatorType; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterExpression; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/GraphQlAssert.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/GraphQlAssert.java similarity index 98% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/GraphQlAssert.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/GraphQlAssert.java index 3c8a1802..501b9b90 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/GraphQlAssert.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/GraphQlAssert.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.language.Argument; import graphql.language.Document; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java similarity index 81% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java index 47a39f4d..fb3d8030 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ObjectGraphQlMapperTest.java @@ -1,15 +1,15 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionInput; import java.util.List; import java.util.Map; import java.util.Set; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -import org.dotwebstack.orchestrate.source.ObjectRequest; -import org.dotwebstack.orchestrate.source.SelectedProperty; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.ObjectRequest; +import nl.geostandaarden.imx.orchestrate.source.SelectedProperty; +import nl.geostandaarden.imx.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapperTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapperTest.java similarity index 95% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapperTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapperTest.java index d74ce4e9..95a4a858 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ResponseMapperTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ResponseMapperTest.java @@ -1,7 +1,7 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.ExecutionResult; -import org.dotwebstack.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; +import nl.geostandaarden.imx.orchestrate.source.graphql.config.GraphQlOrchestrateConfig; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapperTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapperTest.java similarity index 93% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapperTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapperTest.java index 24edd446..5a68a219 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/mapper/ValueMapperTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/mapper/ValueMapperTest.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.source.graphql.mapper; +package nl.geostandaarden.imx.orchestrate.source.graphql.mapper; import graphql.language.ArrayValue; import graphql.language.BooleanValue; import graphql.language.IntValue; import graphql.language.StringValue; -import org.dotwebstack.orchestrate.source.SourceException; +import nl.geostandaarden.imx.orchestrate.source.SourceException; import org.junit.jupiter.api.Test; import java.math.BigInteger; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java similarity index 78% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java index 088ae920..1e654e60 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/repository/GraphQlRepositoryTest.java @@ -1,17 +1,17 @@ -package org.dotwebstack.orchestrate.source.graphql.repository; +package nl.geostandaarden.imx.orchestrate.source.graphql.repository; import java.util.Map; -import org.dotwebstack.orchestrate.model.Attribute; -import org.dotwebstack.orchestrate.model.ObjectType; -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 org.dotwebstack.orchestrate.source.graphql.executor.Executor; -import org.dotwebstack.orchestrate.source.graphql.mapper.BatchGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; -import org.dotwebstack.orchestrate.source.graphql.mapper.ResponseMapper; +import nl.geostandaarden.imx.orchestrate.model.Attribute; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; +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 nl.geostandaarden.imx.orchestrate.source.graphql.executor.Executor; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.BatchGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.CollectionGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ObjectGraphQlMapper; +import nl.geostandaarden.imx.orchestrate.source.graphql.mapper.ResponseMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercingTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercingTest.java similarity index 98% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercingTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercingTest.java index 68bf9fa2..637a585b 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateCoercingTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateCoercingTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import graphql.GraphQLContext; import graphql.execution.CoercedVariables; diff --git a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java similarity index 98% rename from source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java rename to source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java index 8ea861a8..4a3054a1 100644 --- a/source-graphql/src/test/java/org/dotwebstack/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java +++ b/source-graphql/src/test/java/nl/geostandaarden/imx/orchestrate/source/graphql/scalar/DateTimeCoercingTest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source.graphql.scalar; +package nl.geostandaarden.imx.orchestrate.source.graphql.scalar; import graphql.GraphQLContext; import graphql.execution.CoercedVariables; diff --git a/source/pom.xml b/source/pom.xml index 1d9154c3..0c08c258 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate 0.0.1-SNAPSHOT @@ -14,7 +14,7 @@ - org.dotwebstack.orchestrate + nl.geostandaarden.imx.orchestrate orchestrate-model ${project.version} diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/AbstractDataRequest.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/AbstractDataRequest.java similarity index 83% rename from source/src/main/java/org/dotwebstack/orchestrate/source/AbstractDataRequest.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/AbstractDataRequest.java index 72e84458..600fa3f4 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/AbstractDataRequest.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/AbstractDataRequest.java @@ -1,10 +1,10 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import java.util.List; import lombok.Getter; import lombok.Singular; import lombok.experimental.SuperBuilder; -import org.dotwebstack.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; @Getter @SuperBuilder(toBuilder = true) diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/BatchRequest.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/BatchRequest.java similarity index 89% rename from source/src/main/java/org/dotwebstack/orchestrate/source/BatchRequest.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/BatchRequest.java index 5cc28fe2..5802f443 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/BatchRequest.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/BatchRequest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import java.util.Collection; import java.util.Map; diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/CollectionRequest.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/CollectionRequest.java similarity index 74% rename from source/src/main/java/org/dotwebstack/orchestrate/source/CollectionRequest.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/CollectionRequest.java index e6d4946c..64dec59c 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/CollectionRequest.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/CollectionRequest.java @@ -1,8 +1,8 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import lombok.Getter; import lombok.experimental.SuperBuilder; -import org.dotwebstack.orchestrate.model.filters.FilterExpression; +import nl.geostandaarden.imx.orchestrate.model.filters.FilterExpression; @Getter @SuperBuilder(toBuilder = true) diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/DataRepository.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRepository.java similarity index 82% rename from source/src/main/java/org/dotwebstack/orchestrate/source/DataRepository.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRepository.java index 0831ec05..fd1d9048 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/DataRepository.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRepository.java @@ -1,7 +1,7 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import java.util.Map; -import org.dotwebstack.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/DataRequest.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRequest.java similarity index 56% rename from source/src/main/java/org/dotwebstack/orchestrate/source/DataRequest.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRequest.java index 8b06e8fe..855fcdfd 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/DataRequest.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/DataRequest.java @@ -1,7 +1,7 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import java.util.List; -import org.dotwebstack.orchestrate.model.ObjectType; +import nl.geostandaarden.imx.orchestrate.model.ObjectType; public interface DataRequest { diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/ObjectRequest.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/ObjectRequest.java similarity index 87% rename from source/src/main/java/org/dotwebstack/orchestrate/source/ObjectRequest.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/ObjectRequest.java index 4bb45527..94ca8d36 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/ObjectRequest.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/ObjectRequest.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import java.util.Map; import lombok.Getter; diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/SelectedProperty.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SelectedProperty.java similarity index 84% rename from source/src/main/java/org/dotwebstack/orchestrate/source/SelectedProperty.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SelectedProperty.java index 7c7b342e..3f84eb32 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/SelectedProperty.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SelectedProperty.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; import static java.util.Collections.emptySet; @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.dotwebstack.orchestrate.model.Property; +import nl.geostandaarden.imx.orchestrate.model.Property; @Getter @EqualsAndHashCode diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/Source.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/Source.java similarity index 57% rename from source/src/main/java/org/dotwebstack/orchestrate/source/Source.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/Source.java index 3004ecf2..ae4d8ada 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/Source.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/Source.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; public interface Source { diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/SourceException.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceException.java similarity index 81% rename from source/src/main/java/org/dotwebstack/orchestrate/source/SourceException.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceException.java index 1b8031b6..70d4f25f 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/SourceException.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceException.java @@ -1,4 +1,4 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; public class SourceException extends RuntimeException { diff --git a/source/src/main/java/org/dotwebstack/orchestrate/source/SourceType.java b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceType.java similarity index 57% rename from source/src/main/java/org/dotwebstack/orchestrate/source/SourceType.java rename to source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceType.java index 301fa099..338fc8bf 100644 --- a/source/src/main/java/org/dotwebstack/orchestrate/source/SourceType.java +++ b/source/src/main/java/nl/geostandaarden/imx/orchestrate/source/SourceType.java @@ -1,6 +1,6 @@ -package org.dotwebstack.orchestrate.source; +package nl.geostandaarden.imx.orchestrate.source; -import org.dotwebstack.orchestrate.model.Model; +import nl.geostandaarden.imx.orchestrate.model.Model; import java.util.Map;