diff --git a/README.md b/README.md index 8771d5b..9e71033 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Goals of that approach: - exposure of high quality API. Examples in code: -- CRUD-able document [ProductDescription](product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescription.java) -- persistence of document [ProductDescriptionEntity](product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEntity.java) -- CRUD exposed as DAO and REST endpoint [ProductDescriptionDao](product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionDao.java) +- CRUD-able document [ProductDescription](product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java) +- persistence of document [ProductDescriptionEntity](product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java) +- CRUD exposed as DAO and REST endpoint [ProductDescriptionDao](product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java) **Complex Commands (business processing)** expressed in Domain Model which is embedded in hexagonal architecture. @@ -36,23 +36,23 @@ caused by technological choices or transport models from external services / con migration and keeping long living projects up to date with fast evolving frameworks and libraries. Examples of Domain Model in code: -- aggregate [ProductDemand](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemand.java) -- entity [DailyDemand](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyDemand.java) -- value object [Adjustment](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Adjustment.java) -- policy [ReviewPolicy](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewPolicy.java) -- domain event [DemandedLevelsChanged](shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandedLevelsChanged.java) +- aggregate [ProductDemand](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java) +- entity [DailyDemand](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java) +- value object [Adjustment](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java) +- policy [ReviewPolicy](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java) +- domain event [DemandedLevelsChanged](shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java) Examples of Ports in code: -- application service (primary port) [DemandService](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandService.java) -- repository (secondary port) [ProductDemandRepository](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandRepository.java) -- domain events handling (secondary port) [DemandEvents](demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEvents.java) +- application service (primary port) [DemandService](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java) +- repository (secondary port) [ProductDemandRepository](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java) +- domain events handling (secondary port) [DemandEvents](demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java) Examples of Adapters in code: - REST endpoint for complex command (driving adapter) - - command resource [DemandAdjustmentDao](demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentDao.java) - - command handler [CommandsHandler](demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/CommandsHandler.java) -- repository implementation (driven adapter) [ProductDemandORMRepository](demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepository.java) -- events propagation (driven adapter) [DemandEventsPropagation](app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEventsPropagation.java) + - command resource [DemandAdjustmentDao](demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java) + - command handler [CommandsHandler](demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java) +- repository implementation (driven adapter) [ProductDemandORMRepository](demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java) +- events propagation (driven adapter) [DemandEventsPropagation](app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java) **Complex Query** implemented as direct and simple as possible by: - fetching persistent read model expected by consumer, the read model is a projection of past domain event, @@ -67,10 +67,10 @@ Goals of that approach: - improves reads performance and enable horizontal scalability. Examples in code: -- projection of domain events to persistent read model [DeliveryForecastProjection](demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastProjection.java) -- REST endpoint for persistent read model [DeliveryForecastDao](demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastDao.java) -- read model composed at query execution time [StockForecastQuery](app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecastQuery.java) -- REST resource processor for NOT persistent read model [StockForecastResourceProcessor](app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastResourceProcessor.java) +- projection of domain events to persistent read model [DeliveryForecastProjection](demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java) +- REST endpoint for persistent read model [DeliveryForecastDao](demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java) +- read model composed at query execution time [StockForecastQuery](app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java) +- REST resource processor for NOT persistent read model [StockForecastResourceProcessor](app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java) ## Hexagonal Architecture Only the most valuable part of that enterprise software is embedded in hexagonal architecture - diff --git a/adapter-commons/pom.xml b/adapter-commons/pom.xml index 22703c0..e8dcfb7 100644 --- a/adapter-commons/pom.xml +++ b/adapter-commons/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 - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT diff --git a/adapter-commons/src/main/java/pl/com/bottega/tools/CommandRepository.java b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java similarity index 94% rename from adapter-commons/src/main/java/pl/com/bottega/tools/CommandRepository.java rename to adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java index 507455b..e11e07a 100644 --- a/adapter-commons/src/main/java/pl/com/bottega/tools/CommandRepository.java +++ b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java @@ -1,4 +1,4 @@ -package pl.com.bottega.tools; +package pl.com.dddbyexamples.tools; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RestResource; diff --git a/adapter-commons/src/main/java/pl/com/bottega/tools/JsonConverter.java b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java similarity index 97% rename from adapter-commons/src/main/java/pl/com/bottega/tools/JsonConverter.java rename to adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java index cf5a718..6d7fe5a 100644 --- a/adapter-commons/src/main/java/pl/com/bottega/tools/JsonConverter.java +++ b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java @@ -1,4 +1,4 @@ -package pl.com.bottega.tools; +package pl.com.dddbyexamples.tools; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/adapter-commons/src/main/java/pl/com/bottega/tools/ProjectionRepository.java b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java similarity index 95% rename from adapter-commons/src/main/java/pl/com/bottega/tools/ProjectionRepository.java rename to adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java index 58528c4..c345880 100644 --- a/adapter-commons/src/main/java/pl/com/bottega/tools/ProjectionRepository.java +++ b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java @@ -1,4 +1,4 @@ -package pl.com.bottega.tools; +package pl.com.dddbyexamples.tools; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RestResource; diff --git a/adapter-commons/src/main/java/pl/com/bottega/tools/TechnicalId.java b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java similarity index 94% rename from adapter-commons/src/main/java/pl/com/bottega/tools/TechnicalId.java rename to adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java index 06458ea..1e41a89 100644 --- a/adapter-commons/src/main/java/pl/com/bottega/tools/TechnicalId.java +++ b/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java @@ -1,4 +1,4 @@ -package pl.com.bottega.tools; +package pl.com.dddbyexamples.tools; import java.util.function.Function; import java.util.function.Supplier; diff --git a/adapter-commons/src/test/java/pl/com/bottega/tools/IntegrationTest.java b/adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java similarity index 94% rename from adapter-commons/src/test/java/pl/com/bottega/tools/IntegrationTest.java rename to adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java index c9ed86d..bc8491a 100644 --- a/adapter-commons/src/test/java/pl/com/bottega/tools/IntegrationTest.java +++ b/adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java @@ -1,4 +1,4 @@ -package pl.com.bottega.tools; +package pl.com.dddbyexamples.tools; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.annotation.AliasFor; diff --git a/app-monolith/pom.xml b/app-monolith/pom.xml index 4d8a205..bf13214 100644 --- a/app-monolith/pom.xml +++ b/app-monolith/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 - pl.com.bottega + pl.com.dddbyexamples app-monolith 1.0-SNAPSHOT @@ -16,33 +16,33 @@ - pl.com.bottega + pl.com.dddbyexamples demand-forecasting-adapters 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples shortages-prediction-adapters 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples product-management-adapters 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples production-planning-adapters 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT test-jar diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/warehouse/WarehouseService.java b/app-monolith/src/main/java/pl/com/bottega/factory/warehouse/WarehouseService.java deleted file mode 100644 index e5d5089..0000000 --- a/app-monolith/src/main/java/pl/com/bottega/factory/warehouse/WarehouseService.java +++ /dev/null @@ -1,8 +0,0 @@ -package pl.com.bottega.factory.warehouse; - -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.calculation.Stock; - -public interface WarehouseService { - Stock forRefNo(RefNoId refNo); -} diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/AppConfiguration.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java similarity index 83% rename from app-monolith/src/main/java/pl/com/bottega/factory/AppConfiguration.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java index 8b3565e..f4971c9 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/AppConfiguration.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory; +package pl.com.dddbyexamples.factory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; import org.springframework.scheduling.annotation.EnableScheduling; -import pl.com.bottega.factory.shortages.prediction.calculation.Stock; -import pl.com.bottega.factory.warehouse.WarehouseService; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock; +import pl.com.dddbyexamples.factory.warehouse.WarehouseService; import java.time.Clock; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java similarity index 82% rename from app-monolith/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java index ead73c0..65a1d16 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.delivery.planning.definition; +package pl.com.dddbyexamples.factory.delivery.planning.definition; import lombok.AllArgsConstructor; import org.springframework.data.rest.core.annotation.HandleAfterCreate; @@ -6,7 +6,7 @@ import org.springframework.data.rest.core.annotation.HandleAfterSave; import org.springframework.data.rest.core.annotation.RepositoryEventHandler; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import pl.com.bottega.factory.delivery.planning.projection.DeliveryForecastProjection; +import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection; @Component @Transactional diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEventsPropagation.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java similarity index 69% rename from app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEventsPropagation.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java index bfa6228..514c7f3 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEventsPropagation.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java @@ -1,13 +1,13 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.delivery.planning.projection.DeliveryForecastProjection; -import pl.com.bottega.factory.demand.forecasting.command.RequiredReviewDao; -import pl.com.bottega.factory.demand.forecasting.command.RequiredReviewEntity; -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandProjection; -import pl.com.bottega.factory.shortages.prediction.monitoring.ShortagePredictionService; +import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection; +import pl.com.dddbyexamples.factory.demand.forecasting.command.RequiredReviewDao; +import pl.com.dddbyexamples.factory.demand.forecasting.command.RequiredReviewEntity; +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandProjection; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortagePredictionService; import java.time.Clock; import java.time.Instant; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEventsPropagation.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java similarity index 76% rename from app-monolith/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEventsPropagation.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java index 730c794..64fc8af 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEventsPropagation.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.product.management; +package pl.com.dddbyexamples.factory.product.management; import lombok.AllArgsConstructor; import org.springframework.data.rest.core.annotation.HandleAfterCreate; @@ -6,9 +6,9 @@ import org.springframework.data.rest.core.annotation.HandleAfterDelete; import org.springframework.data.rest.core.annotation.RepositoryEventHandler; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import pl.com.bottega.factory.demand.forecasting.DemandService; -import pl.com.bottega.factory.stock.forecast.ressource.StockForecastDao; -import pl.com.bottega.factory.stock.forecast.ressource.StockForecastEntity; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandService; +import pl.com.dddbyexamples.factory.stock.forecast.ressource.StockForecastDao; +import pl.com.dddbyexamples.factory.stock.forecast.ressource.StockForecastEntity; @Component @Transactional diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ForecastORMRepository.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java similarity index 77% rename from app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ForecastORMRepository.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java index c569469..eda0ae5 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ForecastORMRepository.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java @@ -1,13 +1,13 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.delivery.planning.projection.DeliveryForecastDao; -import pl.com.bottega.factory.delivery.planning.projection.DeliveryForecastEntity; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.production.planning.projection.ProductionOutputDao; -import pl.com.bottega.factory.shortages.prediction.calculation.ProductionForecast.Item; -import pl.com.bottega.factory.warehouse.WarehouseService; +import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastDao; +import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastEntity; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.production.planning.projection.ProductionOutputDao; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ProductionForecast.Item; +import pl.com.dddbyexamples.factory.warehouse.WarehouseService; import java.time.Clock; import java.time.LocalDateTime; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java similarity index 73% rename from app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java index ea8eaf6..7902cd5 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.shortages.prediction.notification.NotificationOfShortage; +import pl.com.dddbyexamples.factory.shortages.prediction.notification.NotificationOfShortage; @Lazy @Component diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecast.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java similarity index 87% rename from app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecast.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java index 3cf7ee2..fa70bf6 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecast.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.stock.forecast; +package pl.com.dddbyexamples.factory.stock.forecast; import lombok.Builder; import lombok.Singular; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecastQuery.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java similarity index 77% rename from app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecastQuery.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java index 41c0491..0059d16 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/StockForecastQuery.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java @@ -1,16 +1,16 @@ -package pl.com.bottega.factory.stock.forecast; +package pl.com.dddbyexamples.factory.stock.forecast; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandDao; -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.production.planning.projection.ProductionDailyOutputDao; -import pl.com.bottega.factory.production.planning.projection.ProductionDailyOutputEntity; -import pl.com.bottega.factory.shortages.prediction.calculation.Stock; -import pl.com.bottega.factory.stock.forecast.StockForecast.StockForecastBuilder; -import pl.com.bottega.factory.warehouse.WarehouseService; +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao; +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputDao; +import pl.com.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputEntity; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock; +import pl.com.dddbyexamples.factory.stock.forecast.StockForecast.StockForecastBuilder; +import pl.com.dddbyexamples.factory.warehouse.WarehouseService; import java.time.Clock; import java.time.LocalDate; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastDao.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java similarity index 84% rename from app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastDao.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java index 217c7ae..a260b50 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastDao.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.stock.forecast.ressource; +package pl.com.dddbyexamples.factory.stock.forecast.ressource; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.config.Projection; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; @Repository @RepositoryRestResource(path = "stock-forecasts", diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastEntity.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java similarity index 80% rename from app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastEntity.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java index 99222d6..959fb97 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastEntity.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.stock.forecast.ressource; +package pl.com.dddbyexamples.factory.stock.forecast.ressource; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import pl.com.bottega.factory.stock.forecast.StockForecast; +import pl.com.dddbyexamples.factory.stock.forecast.StockForecast; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastResourceProcessor.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java similarity index 76% rename from app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastResourceProcessor.java rename to app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java index 8cf64b3..36473e2 100644 --- a/app-monolith/src/main/java/pl/com/bottega/factory/stock/forecast/ressource/StockForecastResourceProcessor.java +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java @@ -1,11 +1,11 @@ -package pl.com.bottega.factory.stock.forecast.ressource; +package pl.com.dddbyexamples.factory.stock.forecast.ressource; import lombok.AllArgsConstructor; import org.springframework.hateoas.Resource; import org.springframework.hateoas.ResourceProcessor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.stock.forecast.StockForecastQuery; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.stock.forecast.StockForecastQuery; @Component @AllArgsConstructor diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java new file mode 100644 index 0000000..7f53cae --- /dev/null +++ b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java @@ -0,0 +1,8 @@ +package pl.com.dddbyexamples.factory.warehouse; + +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock; + +public interface WarehouseService { + Stock forRefNo(RefNoId refNo); +} diff --git a/app-monolith/src/test/groovy/pl/com/bottega/factory/ProductTrait.groovy b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy similarity index 65% rename from app-monolith/src/test/groovy/pl/com/bottega/factory/ProductTrait.groovy rename to app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy index 0d89580..9bd98b0 100644 --- a/app-monolith/src/test/groovy/pl/com/bottega/factory/ProductTrait.groovy +++ b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy @@ -1,13 +1,13 @@ -package pl.com.bottega.factory +package pl.com.dddbyexamples.factory -import pl.com.bottega.factory.demand.forecasting.AdjustDemand -import pl.com.bottega.factory.demand.forecasting.Adjustment -import pl.com.bottega.factory.demand.forecasting.Demand -import pl.com.bottega.factory.demand.forecasting.Document -import pl.com.bottega.factory.demand.forecasting.command.DemandAdjustmentEntity -import pl.com.bottega.factory.demand.forecasting.persistence.DocumentEntity -import pl.com.bottega.factory.product.management.ProductDescription -import pl.com.bottega.factory.product.management.ProductDescriptionEntity +import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.Document +import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity +import pl.com.dddbyexamples.factory.product.management.ProductDescription +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity import java.time.Instant import java.time.LocalDate diff --git a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/CallOffDocumentIntegrationSpec.groovy b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy similarity index 87% rename from app-monolith/src/test/groovy/pl/com/bottega/factory/integration/CallOffDocumentIntegrationSpec.groovy rename to app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy index ff0a8b9..57f82d5 100644 --- a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/CallOffDocumentIntegrationSpec.groovy +++ b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.integration +package pl.com.dddbyexamples.factory.integration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -9,17 +9,16 @@ import org.springframework.core.ParameterizedTypeReference import org.springframework.hateoas.Resources import org.springframework.http.HttpMethod import org.springframework.http.ResponseEntity -import pl.com.bottega.factory.AppConfiguration -import pl.com.bottega.factory.ProductTrait -import pl.com.bottega.factory.demand.forecasting.persistence.DocumentEntity -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity -import pl.com.bottega.factory.product.management.ProductDescriptionEntity -import pl.com.bottega.tools.IntegrationTest +import pl.com.dddbyexamples.factory.AppConfiguration +import pl.com.dddbyexamples.factory.ProductTrait +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity +import pl.com.dddbyexamples.tools.IntegrationTest import spock.lang.Specification import java.time.Clock -import java.time.LocalDate -import java.time.ZoneId +import java.time.LocalDateF import static java.time.Instant.from import static java.time.ZoneId.systemDefault diff --git a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/DemandAdjustmentIntegrationSpec.groovy b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy similarity index 85% rename from app-monolith/src/test/groovy/pl/com/bottega/factory/integration/DemandAdjustmentIntegrationSpec.groovy rename to app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy index ff8c4e1..9ff7a98 100644 --- a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/DemandAdjustmentIntegrationSpec.groovy +++ b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.integration +package pl.com.dddbyexamples.factory.integration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -10,15 +10,15 @@ import org.springframework.core.ParameterizedTypeReference import org.springframework.hateoas.Resources import org.springframework.http.HttpMethod import org.springframework.http.ResponseEntity -import pl.com.bottega.factory.AppConfiguration -import pl.com.bottega.factory.ProductTrait -import pl.com.bottega.factory.demand.forecasting.Adjustment -import pl.com.bottega.factory.demand.forecasting.Demand -import pl.com.bottega.factory.demand.forecasting.command.DemandAdjustmentEntity -import pl.com.bottega.factory.demand.forecasting.persistence.DocumentEntity -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity -import pl.com.bottega.factory.product.management.ProductDescriptionEntity -import pl.com.bottega.tools.IntegrationTest +import pl.com.dddbyexamples.factory.AppConfiguration +import pl.com.dddbyexamples.factory.ProductTrait +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity +import pl.com.dddbyexamples.tools.IntegrationTest import spock.lang.Specification import java.time.Clock diff --git a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/ShortageIntegrationSpec.groovy b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy similarity index 79% rename from app-monolith/src/test/groovy/pl/com/bottega/factory/integration/ShortageIntegrationSpec.groovy rename to app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy index f06d817..1e41efd 100644 --- a/app-monolith/src/test/groovy/pl/com/bottega/factory/integration/ShortageIntegrationSpec.groovy +++ b/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy @@ -1,4 +1,4 @@ -package src.test.groovy.pl.com.bottega.factory.integration +package pl.com.dddbyexamples.factory.integration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest @@ -11,18 +11,18 @@ import org.springframework.hateoas.Resource import org.springframework.hateoas.Resources import org.springframework.http.HttpMethod import org.springframework.http.ResponseEntity -import pl.com.bottega.factory.AppConfiguration -import pl.com.bottega.factory.ProductTrait -import pl.com.bottega.factory.demand.forecasting.Adjustment -import pl.com.bottega.factory.demand.forecasting.Demand -import pl.com.bottega.factory.demand.forecasting.command.DemandAdjustmentEntity -import pl.com.bottega.factory.demand.forecasting.persistence.DocumentEntity -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity -import pl.com.bottega.factory.product.management.ProductDescriptionEntity -import pl.com.bottega.factory.shortages.prediction.calculation.Stock -import pl.com.bottega.factory.shortages.prediction.monitoring.persistence.ShortagesEntity -import pl.com.bottega.factory.warehouse.WarehouseService -import pl.com.bottega.tools.IntegrationTest +import pl.com.dddbyexamples.factory.AppConfiguration +import pl.com.dddbyexamples.factory.ProductTrait +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity +import pl.com.dddbyexamples.factory.warehouse.WarehouseService +import pl.com.dddbyexamples.tools.IntegrationTest import spock.lang.Specification import java.time.Clock diff --git a/demand-forecasting-adapters/pom.xml b/demand-forecasting-adapters/pom.xml index 0868984..c2e0a36 100644 --- a/demand-forecasting-adapters/pom.xml +++ b/demand-forecasting-adapters/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 - pl.com.bottega + pl.com.dddbyexamples demand-forecasting-adapters 1.0-SNAPSHOT @@ -16,17 +16,17 @@ - pl.com.bottega + pl.com.dddbyexamples demand-forecasting-model 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT test-jar diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java similarity index 72% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java index c36f568..1212d47 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.delivery.planning; +package pl.com.dddbyexamples.factory.delivery.planning; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao; -import pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity; +import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao; +import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity; import java.util.Collections; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinition.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java similarity index 87% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinition.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java index 6689628..4e657d9 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinition.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java @@ -1,10 +1,10 @@ -package pl.com.bottega.factory.delivery.planning.definition; +package pl.com.dddbyexamples.factory.delivery.planning.definition; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Singular; import lombok.Value; -import pl.com.bottega.factory.demand.forecasting.Demand; +import pl.com.dddbyexamples.factory.demand.forecasting.Demand; import java.time.LocalTime; import java.util.Collections; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java similarity index 87% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java index 8a0ef79..197143e 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.delivery.planning.definition; +package pl.com.dddbyexamples.factory.delivery.planning.definition; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java similarity index 88% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java index 5bd5f3c..d945752 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.delivery.planning.definition; +package pl.com.dddbyexamples.factory.delivery.planning.definition; import lombok.Getter; import lombok.NoArgsConstructor; -import pl.com.bottega.tools.JsonConverter; +import pl.com.dddbyexamples.tools.JsonConverter; import javax.persistence.Convert; import javax.persistence.Entity; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java similarity index 87% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java index 8066f4f..fc2c272 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.delivery.planning.projection; +package pl.com.dddbyexamples.factory.delivery.planning.projection; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java similarity index 92% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java index ca4b138..e2ed5fe 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.delivery.planning.projection; +package pl.com.dddbyexamples.factory.delivery.planning.projection; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastProjection.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java similarity index 79% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastProjection.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java index bba52eb..57d8d5c 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastProjection.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java @@ -1,13 +1,13 @@ -package pl.com.bottega.factory.delivery.planning.projection; +package pl.com.dddbyexamples.factory.delivery.planning.projection; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.delivery.planning.DeliveryAutoPlanner; -import pl.com.bottega.factory.delivery.planning.DeliveryAutoPlannerORMRepository; -import pl.com.bottega.factory.demand.forecasting.Demand; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged; -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandDao; -import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity; +import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlanner; +import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlannerORMRepository; +import pl.com.dddbyexamples.factory.demand.forecasting.Demand; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged; +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao; +import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity; import java.time.Clock; import java.time.LocalDate; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandForecastingConfiguration.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java similarity index 89% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandForecastingConfiguration.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java index 6b663e9..c5bcaa4 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandForecastingConfiguration.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandValue.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java similarity index 65% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandValue.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java index 2e4522e..d3804a7 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandValue.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepository.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java similarity index 80% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepository.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java index c4350f1..133392b 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepository.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java @@ -1,15 +1,13 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.demand.forecasting.DailyDemand.DemandUpdated; -import pl.com.bottega.factory.demand.forecasting.persistence.DemandDao; -import pl.com.bottega.factory.demand.forecasting.persistence.DemandEntity; -import pl.com.bottega.factory.demand.forecasting.persistence.DemandEntity.DemandEntityId; -import pl.com.bottega.factory.demand.forecasting.persistence.ProductDemandDao; -import pl.com.bottega.factory.demand.forecasting.persistence.ProductDemandEntity; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.tools.TechnicalId; +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandDao; +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity; +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao; +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.tools.TechnicalId; import javax.persistence.EntityManager; import javax.persistence.LockModeType; @@ -63,7 +61,7 @@ class ProductDemandORMRepository implements ProductDemandRepository { if (model.updates.size() > 0) { em.lock(root, LockModeType.OPTIMISTIC_FORCE_INCREMENT); } - for (DemandUpdated updated : model.updates) { + for (DailyDemand.DemandUpdated updated : model.updates) { DemandEntity entity; if (TechnicalId.isPersisted(updated.getId())) { entity = demandDao.getOne(TechnicalId.get(updated.getId())); @@ -90,7 +88,7 @@ class ProductDemandORMRepository implements ProductDemandRepository { entity.getValue().getDocumented(), entity.getValue().getAdjustment())) .orElseGet(() -> new DailyDemand( - new DemandEntityId(refNo, date), + new DemandEntity.DemandEntityId(refNo, date), reviewPolicy, null, null diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/CommandsHandler.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java similarity index 90% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/CommandsHandler.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java index 3cad57b..7b2f1dd 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/CommandsHandler.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting.command; +package pl.com.dddbyexamples.factory.demand.forecasting.command; import lombok.AllArgsConstructor; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -10,8 +10,8 @@ import org.springframework.data.rest.core.annotation.RepositoryEventHandler; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import pl.com.bottega.factory.demand.forecasting.DemandService; -import pl.com.bottega.factory.demand.forecasting.persistence.DocumentEntity; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandService; +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity; import java.time.Clock; import java.time.LocalDate; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java similarity index 83% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java index 637bcf4..5f935c5 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.demand.forecasting.command; +package pl.com.dddbyexamples.factory.demand.forecasting.command; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.CommandRepository; +import pl.com.dddbyexamples.tools.CommandRepository; import java.time.LocalDate; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java similarity index 84% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java index 42cda80..da88db5 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandAdjustmentEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java @@ -1,10 +1,10 @@ -package pl.com.bottega.factory.demand.forecasting.command; +package pl.com.dddbyexamples.factory.demand.forecasting.command; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import pl.com.bottega.factory.demand.forecasting.AdjustDemand; -import pl.com.bottega.tools.JsonConverter; +import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand; +import pl.com.dddbyexamples.tools.JsonConverter; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java similarity index 86% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java index 9419c74..2f529d9 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.demand.forecasting.command; +package pl.com.dddbyexamples.factory.demand.forecasting.command; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.CommandRepository; +import pl.com.dddbyexamples.tools.CommandRepository; import java.time.LocalDate; import java.util.List; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java similarity index 78% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java index 9ff9d85..f14ae1a 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/command/RequiredReviewEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java @@ -1,12 +1,12 @@ -package pl.com.bottega.factory.demand.forecasting.command; +package pl.com.dddbyexamples.factory.demand.forecasting.command; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import pl.com.bottega.factory.demand.forecasting.ApplyReviewDecision; -import pl.com.bottega.factory.demand.forecasting.ReviewDecision; -import pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview; -import pl.com.bottega.tools.JsonConverter; +import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision; +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision; +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview; +import pl.com.dddbyexamples.tools.JsonConverter; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java similarity index 86% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java index 8e93cd8..322def1 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RestResource; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java similarity index 81% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java index 6cc6103..08bdda9 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DemandEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java @@ -1,12 +1,12 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import pl.com.bottega.factory.demand.forecasting.DailyId; -import pl.com.bottega.factory.demand.forecasting.DemandValue; -import pl.com.bottega.tools.JsonConverter; -import pl.com.bottega.tools.TechnicalId; +import pl.com.dddbyexamples.factory.demand.forecasting.DailyId; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandValue; +import pl.com.dddbyexamples.tools.JsonConverter; +import pl.com.dddbyexamples.tools.TechnicalId; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java similarity index 75% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java index 69a4810..5c4bf58 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.CommandRepository; +import pl.com.dddbyexamples.tools.CommandRepository; @Repository("documentDao") @RepositoryRestResource(path = "demand-documents", diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java similarity index 86% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java index 99e3db4..76965d1 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/DocumentEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java @@ -1,11 +1,11 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.springframework.data.annotation.LastModifiedDate; -import pl.com.bottega.factory.demand.forecasting.Document; -import pl.com.bottega.tools.JsonConverter; +import pl.com.dddbyexamples.factory.demand.forecasting.Document; +import pl.com.dddbyexamples.tools.JsonConverter; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java similarity index 84% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java index 4a13ec2..0b897ed 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RestResource; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java similarity index 81% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java index 14fe0c0..f821841 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/persistence/ProductDemandEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.demand.forecasting.persistence; +package pl.com.dddbyexamples.factory.demand.forecasting.persistence; import lombok.Getter; import lombok.NoArgsConstructor; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.tools.TechnicalId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.tools.TechnicalId; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandDao.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java similarity index 88% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandDao.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java index 85d4fed..e108f81 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandDao.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java @@ -1,11 +1,11 @@ -package pl.com.bottega.factory.demand.forecasting.projection; +package pl.com.dddbyexamples.factory.demand.forecasting.projection; import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; import java.time.LocalDate; import java.util.List; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandEntity.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java similarity index 84% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandEntity.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java index fc7d693..77b1b99 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandEntity.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.demand.forecasting.projection; +package pl.com.dddbyexamples.factory.demand.forecasting.projection; import lombok.Getter; import lombok.NoArgsConstructor; -import pl.com.bottega.factory.demand.forecasting.Demand; +import pl.com.dddbyexamples.factory.demand.forecasting.Demand; import javax.persistence.*; import java.io.Serializable; diff --git a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandProjection.java b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java similarity index 84% rename from demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandProjection.java rename to demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java index ea6599a..a94e768 100644 --- a/demand-forecasting-adapters/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandProjection.java +++ b/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.demand.forecasting.projection; +package pl.com.dddbyexamples.factory.demand.forecasting.projection; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged; @Component @AllArgsConstructor diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java similarity index 78% rename from demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java rename to demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java index 4a3a39a..4d1dabb 100644 --- a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java +++ b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java @@ -1,13 +1,13 @@ -package pl.com.bottega.factory; +package pl.com.dddbyexamples.factory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; import org.springframework.scheduling.annotation.EnableScheduling; -import pl.com.bottega.factory.demand.forecasting.DemandEvents; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged; -import pl.com.bottega.factory.demand.forecasting.ReviewRequired; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged; +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired; import java.time.Clock; diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy similarity index 67% rename from demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy rename to demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy index b8af3c6..c293bf0 100644 --- a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy +++ b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy @@ -1,15 +1,15 @@ -package pl.com.bottega.factory.delivery.planning +package pl.com.dddbyexamples.factory.delivery.planning import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinition -import pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao -import pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity +import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition +import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao +import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity import spock.lang.Specification import static java.time.LocalTime.of as time -import static pl.com.bottega.factory.delivery.planning.definition.DeliveryPlannerDefinition.of -import static pl.com.bottega.factory.demand.forecasting.Demand.Schema.* +import static DeliveryPlannerDefinition.of +import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.* @SpringBootTest class DeliveryPlannerDefinitionTest extends Specification { diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy similarity index 79% rename from demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy rename to demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy index 090cf26..f828f68 100644 --- a/demand-forecasting-adapters/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy +++ b/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy @@ -1,12 +1,18 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.annotation.Commit -import pl.com.bottega.factory.demand.forecasting.persistence.DemandDao -import pl.com.bottega.factory.demand.forecasting.persistence.DemandEntity -import pl.com.bottega.factory.demand.forecasting.persistence.ProductDemandDao -import pl.com.bottega.factory.demand.forecasting.persistence.ProductDemandEntity +import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandValue +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandDao +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao +import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity import spock.lang.Specification import javax.persistence.EntityManager diff --git a/demand-forecasting-model/pom.xml b/demand-forecasting-model/pom.xml index 0605459..b1e0c44 100644 --- a/demand-forecasting-model/pom.xml +++ b/demand-forecasting-model/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pl.com.bottega + pl.com.dddbyexamples demand-forecasting-model jar 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples shared-kernel-model 1.0-SNAPSHOT diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestion.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java similarity index 86% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestion.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java index 7ffc88d..df161ed 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestion.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.delivery.planning; +package pl.com.dddbyexamples.factory.delivery.planning; -import pl.com.bottega.factory.demand.forecasting.Demand; +import pl.com.dddbyexamples.factory.demand.forecasting.Demand; import java.time.LocalDate; import java.time.LocalTime; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/Delivery.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java similarity index 72% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/Delivery.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java index ebbf071..6af8234 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/Delivery.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.delivery.planning; +package pl.com.dddbyexamples.factory.delivery.planning; import lombok.Value; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlanner.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java similarity index 80% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlanner.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java index 96a1c0e..daea59f 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlanner.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.delivery.planning; +package pl.com.dddbyexamples.factory.delivery.planning; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.demand.forecasting.Demand; +import pl.com.dddbyexamples.factory.demand.forecasting.Demand; import java.time.LocalDate; import java.util.Map; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/AdjustDemand.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java similarity index 87% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/AdjustDemand.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java index 87e3794..fd2b8cf 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/AdjustDemand.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; -import pl.com.bottega.factory.demand.forecasting.DailyDemand.Result; +import pl.com.dddbyexamples.factory.demand.forecasting.DailyDemand.Result; import java.time.LocalDate; import java.util.Comparator; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Adjustment.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java similarity index 89% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Adjustment.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java index 4d3dc1f..5cff0bc 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Adjustment.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ApplyReviewDecision.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java similarity index 91% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ApplyReviewDecision.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java index 1137104..dbefcab 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ApplyReviewDecision.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyDemand.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java similarity index 92% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyDemand.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java index 8f340dd..922c4d3 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyDemand.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java @@ -1,9 +1,8 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Builder; import lombok.Value; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged.Change; -import pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change; import java.util.*; import java.util.stream.Collectors; @@ -43,7 +42,7 @@ class DailyDemand { Result.ResultBuilder result = Result.builder(id); State state = state(); if (policy.reviewNeeded(this.documented, this.adjustment, documented)) { - result.toReview(new ToReview(id, + result.toReview(new ReviewRequired.ToReview(id, this.documented, this.adjustment.getDemand(), documented) @@ -117,7 +116,7 @@ class DailyDemand { return new ResultBuilder().id(id); } - static List reviews(List results) { + static List reviews(List results) { return Collections.unmodifiableList(results.stream() .filter(result -> result.toReview != null) .map(result -> result.toReview) diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEvents.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java similarity index 67% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEvents.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java index 8c4ac79..6d07be5 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEvents.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; public interface DemandEvents { void emit(DemandedLevelsChanged event); diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandService.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java similarity index 93% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandService.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java index 0a118f2..b1f6ce8 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandService.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demands.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java similarity index 87% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demands.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java index 2c795f9..b9a9b97 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demands.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import java.time.LocalDate; import java.util.HashMap; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Document.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java similarity index 92% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Document.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java index 239a7ee..52e6ae0 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Document.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemand.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java similarity index 63% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemand.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java index 4487946..fe5e3dd 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemand.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java @@ -1,10 +1,8 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.demand.forecasting.DailyDemand.Result; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged.Change; -import pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview; -import pl.com.bottega.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change; +import pl.com.dddbyexamples.factory.product.management.RefNoId; import java.time.Clock; import java.time.LocalDate; @@ -28,11 +26,11 @@ class ProductDemand { void adjust(AdjustDemand adjustDemand) { LocalDate today = LocalDate.now(clock); - List results = adjustDemand + List results = adjustDemand .forEachStartingFrom(today, this::adjustDaily); - updates.addAll(Result.updates(results)); + updates.addAll(DailyDemand.Result.updates(results)); - Map changes = Result.levelChanges(results); + Map changes = DailyDemand.Result.levelChanges(results); if (!changes.isEmpty()) { events.emit(new DemandedLevelsChanged(id, changes)); @@ -42,17 +40,17 @@ class ProductDemand { void process(Document document) { LocalDate today = LocalDate.now(clock); - List results = document + List results = document .forEachStartingFrom(today, this::updateDaily); - updates.addAll(Result.updates(results)); + updates.addAll(DailyDemand.Result.updates(results)); - Map changes = Result.levelChanges(results); + Map changes = DailyDemand.Result.levelChanges(results); if (!changes.isEmpty()) { events.emit(new DemandedLevelsChanged(id, changes)); } - List reviews = Result.reviews(results); + List reviews = DailyDemand.Result.reviews(results); if (!reviews.isEmpty()) { events.emit(new ReviewRequired(id, reviews)); @@ -65,12 +63,12 @@ class ProductDemand { } } - private Result adjustDaily(LocalDate date, Adjustment adjustment) { + private DailyDemand.Result adjustDaily(LocalDate date, Adjustment adjustment) { DailyDemand demand = demands.get(date); return demand.adjust(adjustment); } - private Result updateDaily(LocalDate date, Demand demand) { + private DailyDemand.Result updateDaily(LocalDate date, Demand demand) { DailyDemand daily = demands.get(date); return daily.update(demand); } diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandRepository.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java similarity index 72% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandRepository.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java index 9255e69..5270670 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemandRepository.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; interface ProductDemandRepository { ProductDemand get(String refNo); diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewDecision.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java similarity index 80% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewDecision.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java index 803a0a8..3617531 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewDecision.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview; +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview; import java.util.function.Function; diff --git a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewPolicy.java b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java similarity index 88% rename from demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewPolicy.java rename to demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java index 608374b..b2bc640 100644 --- a/demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewPolicy.java +++ b/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; public interface ReviewPolicy { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestionSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy similarity index 91% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestionSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy index 97c24af..756cac8 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveriesSuggestionSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy @@ -1,6 +1,7 @@ -package pl.com.bottega.factory.delivery.planning +package pl.com.dddbyexamples.factory.delivery.planning -import pl.com.bottega.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.delivery.planning.Delivery +import pl.com.dddbyexamples.factory.demand.forecasting.Demand import spock.lang.PendingFeature import spock.lang.Specification @@ -9,7 +10,7 @@ import java.time.LocalDateTime import java.time.LocalTime import java.util.stream.Collectors -import static pl.com.bottega.factory.demand.forecasting.Demand.Schema.AtDayStart +import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart class DeliveriesSuggestionSpec extends Specification { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy similarity index 76% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy index 936fb19..1453bfb 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy @@ -1,6 +1,8 @@ -package pl.com.bottega.factory.delivery.planning +package pl.com.dddbyexamples.factory.delivery.planning -import pl.com.bottega.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.delivery.planning.Delivery +import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlanner +import pl.com.dddbyexamples.factory.demand.forecasting.Demand import spock.lang.Specification import java.time.LocalDate @@ -8,8 +10,8 @@ import java.time.LocalDateTime import java.time.LocalTime import java.util.stream.Collectors -import static pl.com.bottega.factory.delivery.planning.DeliveriesSuggestion.timesAndFractions -import static pl.com.bottega.factory.demand.forecasting.Demand.Schema.AtDayStart +import static pl.com.dddbyexamples.factory.delivery.planning.DeliveriesSuggestion.timesAndFractions +import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart class DeliveryAutoPlannerSpec extends Specification { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DailyDemandBuilder.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy similarity index 80% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DailyDemandBuilder.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy index 3344a1b..eaf0116 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DailyDemandBuilder.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy @@ -1,12 +1,17 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting + +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.DailyId +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy import java.time.Clock import java.time.Instant import java.time.LocalDate import java.time.ZoneId -import static DemandedLevelsChanged.Change -import static pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview +import static pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change +import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview class DailyDemandBuilder { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandAdjustmentSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy similarity index 91% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandAdjustmentSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy index 835603a..8667145 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandAdjustmentSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy @@ -1,5 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged import spock.lang.Specification import java.time.LocalDate diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandServiceSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy similarity index 86% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandServiceSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy index 41a5396..3c266ea 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandServiceSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy @@ -1,10 +1,12 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandService import spock.lang.Specification import java.time.LocalDate -import static pl.com.bottega.factory.demand.forecasting.ReviewDecision.PICK_NEW +import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision.PICK_NEW class DemandServiceSpec extends Specification implements ProductDemandTrait { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandsFake.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy similarity index 95% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandsFake.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy index 66245f5..c2a6b9d 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandsFake.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting import java.time.Clock import java.time.LocalDate diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DocumentProcessingSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy similarity index 91% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DocumentProcessingSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy index f736970..8fcd681 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DocumentProcessingSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy @@ -1,5 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged import spock.lang.Specification import java.time.LocalDate diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy similarity index 93% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy index 8691de7..d816d46 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy @@ -1,5 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.Demand import spock.lang.Specification class KeepingDailyDemandsSpec extends Specification { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandBuilder.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy similarity index 74% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandBuilder.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy index 3d23d2f..25e41e3 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandBuilder.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy @@ -1,11 +1,21 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting -import pl.com.bottega.factory.product.management.RefNoId +import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand +import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment +import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision +import pl.com.dddbyexamples.factory.demand.forecasting.DailyId +import pl.com.dddbyexamples.factory.demand.forecasting.Demand +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged +import pl.com.dddbyexamples.factory.demand.forecasting.Document +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired +import pl.com.dddbyexamples.factory.product.management.RefNoId import java.time.* -import static DemandedLevelsChanged.Change -import static pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview +import static pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change +import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview class ProductDemandBuilder { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandTrait.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy similarity index 66% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandTrait.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy index e502647..5b5b27b 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandTrait.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy @@ -1,8 +1,15 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting + +import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand +import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged +import pl.com.dddbyexamples.factory.demand.forecasting.Document +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired import java.time.LocalDate -import static pl.com.bottega.factory.demand.forecasting.ReviewRequired.ToReview +import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview trait ProductDemandTrait { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewPolicySpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy similarity index 79% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewPolicySpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy index 2caa794..6a1e130 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewPolicySpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy @@ -1,10 +1,11 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy import spock.lang.Specification -import static pl.com.bottega.factory.demand.forecasting.Adjustment.strong -import static pl.com.bottega.factory.demand.forecasting.Adjustment.weak -import static pl.com.bottega.factory.demand.forecasting.Demand.of +import static pl.com.dddbyexamples.factory.demand.forecasting.Adjustment.strong +import static pl.com.dddbyexamples.factory.demand.forecasting.Adjustment.weak +import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.of class ReviewPolicySpec extends Specification { diff --git a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewProcessingSpec.groovy b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy similarity index 90% rename from demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewProcessingSpec.groovy rename to demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy index a98f096..fe2baa5 100644 --- a/demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewProcessingSpec.groovy +++ b/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy @@ -1,10 +1,12 @@ -package pl.com.bottega.factory.demand.forecasting +package pl.com.dddbyexamples.factory.demand.forecasting +import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged import spock.lang.Specification import java.time.LocalDate -import static pl.com.bottega.factory.demand.forecasting.ReviewDecision.* +import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision.* class ReviewProcessingSpec extends Specification implements ProductDemandTrait { diff --git a/pom.xml b/pom.xml index 0598d12..c9038bf 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 - pl.com.bottega + pl.com.dddbyexamples factory pom 1.0-SNAPSHOT diff --git a/product-management-adapters/pom.xml b/product-management-adapters/pom.xml index b13d877..936b4c4 100644 --- a/product-management-adapters/pom.xml +++ b/product-management-adapters/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 - pl.com.bottega + pl.com.dddbyexamples product-management-adapters 1.0-SNAPSHOT @@ -16,12 +16,12 @@ - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT test-jar diff --git a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescription.java b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java similarity index 70% rename from product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescription.java rename to product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java index f619afa..e96d263 100644 --- a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescription.java +++ b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.product.management; +package pl.com.dddbyexamples.factory.product.management; import lombok.Value; diff --git a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionDao.java b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java similarity index 89% rename from product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionDao.java rename to product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java index 9b10a70..dbc1b4f 100644 --- a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionDao.java +++ b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.product.management; +package pl.com.dddbyexamples.factory.product.management; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEntity.java b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java similarity index 88% rename from product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEntity.java rename to product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java index 704c162..7f6f977 100644 --- a/product-management-adapters/src/main/java/pl/com/bottega/factory/product/management/ProductDescriptionEntity.java +++ b/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.product.management; +package pl.com.dddbyexamples.factory.product.management; import lombok.Getter; import lombok.NoArgsConstructor; -import pl.com.bottega.tools.JsonConverter; +import pl.com.dddbyexamples.tools.JsonConverter; import javax.persistence.Convert; import javax.persistence.Entity; diff --git a/product-management-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java b/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java similarity index 94% rename from product-management-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java rename to product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java index e449042..c5b50fb 100644 --- a/product-management-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java +++ b/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory; +package pl.com.dddbyexamples.factory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; diff --git a/product-management-adapters/src/test/groovy/pl/com/bottega/factory/product/management/ProductDescriptionPersistenceTest.groovy b/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy similarity index 75% rename from product-management-adapters/src/test/groovy/pl/com/bottega/factory/product/management/ProductDescriptionPersistenceTest.groovy rename to product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy index f0be2aa..069424f 100644 --- a/product-management-adapters/src/test/groovy/pl/com/bottega/factory/product/management/ProductDescriptionPersistenceTest.groovy +++ b/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy @@ -1,7 +1,10 @@ -package pl.com.bottega.factory.product.management +package pl.com.dddbyexamples.factory.product.management import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest +import pl.com.dddbyexamples.factory.product.management.ProductDescription +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionDao +import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity import spock.lang.Specification import static java.util.Collections.singletonList diff --git a/production-planning-adapters/pom.xml b/production-planning-adapters/pom.xml index 173b39c..2c00953 100644 --- a/production-planning-adapters/pom.xml +++ b/production-planning-adapters/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 - pl.com.bottega + pl.com.dddbyexamples production-planning-adapters 1.0-SNAPSHOT @@ -16,12 +16,12 @@ - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT test-jar diff --git a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputDao.java b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java similarity index 84% rename from production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputDao.java rename to production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java index 67bf8c1..5980f5b 100644 --- a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputDao.java +++ b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.production.planning.projection; +package pl.com.dddbyexamples.factory.production.planning.projection; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; import java.time.LocalDate; import java.util.List; diff --git a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputEntity.java b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java similarity index 91% rename from production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputEntity.java rename to production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java index 6c4d912..cd557a1 100644 --- a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionDailyOutputEntity.java +++ b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.production.planning.projection; +package pl.com.dddbyexamples.factory.production.planning.projection; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputDao.java b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java similarity index 84% rename from production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputDao.java rename to production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java index d54dedd..011de24 100644 --- a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputDao.java +++ b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.production.planning.projection; +package pl.com.dddbyexamples.factory.production.planning.projection; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; import java.time.LocalDateTime; import java.util.List; diff --git a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputEntity.java b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java similarity index 94% rename from production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputEntity.java rename to production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java index f2da07d..1acae5c 100644 --- a/production-planning-adapters/src/main/java/pl/com/bottega/factory/production/planning/projection/ProductionOutputEntity.java +++ b/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.production.planning.projection; +package pl.com.dddbyexamples.factory.production.planning.projection; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/shared-kernel-model/pom.xml b/shared-kernel-model/pom.xml index 5edf161..0ac7e1b 100644 --- a/shared-kernel-model/pom.xml +++ b/shared-kernel-model/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 - pl.com.bottega + pl.com.dddbyexamples shared-kernel-model jar 1.0-SNAPSHOT diff --git a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyId.java b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java similarity index 83% rename from shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyId.java rename to shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java index c3bba38..aa15695 100644 --- a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyId.java +++ b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demand.java b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java similarity index 90% rename from shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demand.java rename to shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java index 039516b..9eb374f 100644 --- a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demand.java +++ b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; diff --git a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandedLevelsChanged.java b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java similarity index 66% rename from shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandedLevelsChanged.java rename to shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java index 9bb5686..819c6a2 100644 --- a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandedLevelsChanged.java +++ b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; -import pl.com.bottega.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; import java.util.Map; diff --git a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewRequired.java b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java similarity index 80% rename from shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewRequired.java rename to shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java index cad7a7b..f12366f 100644 --- a/shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewRequired.java +++ b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.demand.forecasting; +package pl.com.dddbyexamples.factory.demand.forecasting; import lombok.Value; -import pl.com.bottega.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; import java.time.LocalDate; import java.util.List; diff --git a/shared-kernel-model/src/main/java/pl/com/bottega/factory/product/management/RefNoId.java b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java similarity index 80% rename from shared-kernel-model/src/main/java/pl/com/bottega/factory/product/management/RefNoId.java rename to shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java index 3d3c118..da9a63f 100644 --- a/shared-kernel-model/src/main/java/pl/com/bottega/factory/product/management/RefNoId.java +++ b/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.product.management; +package pl.com.dddbyexamples.factory.product.management; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/shortages-prediction-adapters/pom.xml b/shortages-prediction-adapters/pom.xml index f3183c6..f28b162 100644 --- a/shortages-prediction-adapters/pom.xml +++ b/shortages-prediction-adapters/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 - pl.com.bottega + pl.com.dddbyexamples shortages-prediction-adapters 1.0-SNAPSHOT @@ -16,17 +16,17 @@ - pl.com.bottega + pl.com.dddbyexamples shortages-prediction-model 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples adapter-commons 1.0-SNAPSHOT test-jar diff --git a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/MonitoringConfiguration.java b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java similarity index 80% rename from shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/MonitoringConfiguration.java rename to shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java index 4d9c5d2..c0daa89 100644 --- a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/MonitoringConfiguration.java +++ b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import pl.com.bottega.factory.shortages.prediction.ConfigurationParams; +import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams; @Configuration class MonitoringConfiguration { diff --git a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java similarity index 77% rename from shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java rename to shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java index 47b7748..f01b809 100644 --- a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java +++ b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java @@ -1,13 +1,13 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.ConfigurationParams; -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecasts; -import pl.com.bottega.factory.shortages.prediction.monitoring.persistence.ShortagesDao; -import pl.com.bottega.factory.shortages.prediction.monitoring.persistence.ShortagesEntity; -import pl.com.bottega.tools.TechnicalId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity; +import pl.com.dddbyexamples.tools.TechnicalId; import java.util.Optional; diff --git a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java similarity index 82% rename from shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java rename to shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java index 0b8ce3d..61a8245 100644 --- a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java +++ b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java @@ -1,10 +1,10 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring.persistence; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence; import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; -import pl.com.bottega.tools.ProjectionRepository; +import pl.com.dddbyexamples.tools.ProjectionRepository; import java.util.Optional; diff --git a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java similarity index 80% rename from shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java rename to shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java index 2883eb5..4bdee3c 100644 --- a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java +++ b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java @@ -1,12 +1,12 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring.persistence; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.Shortage; -import pl.com.bottega.tools.JsonConverter; -import pl.com.bottega.tools.TechnicalId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.tools.JsonConverter; +import pl.com.dddbyexamples.tools.TechnicalId; import javax.persistence.*; import java.io.Serializable; diff --git a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationConfiguration.java b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java similarity index 90% rename from shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationConfiguration.java rename to shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java index c788742..b7797b7 100644 --- a/shortages-prediction-adapters/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationConfiguration.java +++ b/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java @@ -1,9 +1,9 @@ -package pl.com.bottega.factory.shortages.prediction.notification; +package pl.com.dddbyexamples.factory.shortages.prediction.notification; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; import java.time.Clock; diff --git a/shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java b/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java similarity index 70% rename from shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java rename to shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java index cb8dd84..003e970 100644 --- a/shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/Configuration.java +++ b/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java @@ -1,16 +1,16 @@ -package pl.com.bottega.factory; +package pl.com.dddbyexamples.factory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; import org.springframework.scheduling.annotation.EnableScheduling; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecast; -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecasts; -import pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage; -import pl.com.bottega.factory.shortages.prediction.monitoring.ShortageEvents; -import pl.com.bottega.factory.shortages.prediction.monitoring.ShortageSolved; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved; import java.time.Clock; diff --git a/shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy b/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy similarity index 80% rename from shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy rename to shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy index 9734dc5..e773fe6 100644 --- a/shortages-prediction-adapters/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy +++ b/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy @@ -1,19 +1,22 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.annotation.Commit -import pl.com.bottega.factory.product.management.RefNoId -import pl.com.bottega.factory.shortages.prediction.Shortage -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecasts -import pl.com.bottega.factory.shortages.prediction.monitoring.persistence.ShortagesDao -import pl.com.bottega.factory.shortages.prediction.monitoring.persistence.ShortagesEntity +import pl.com.dddbyexamples.factory.product.management.RefNoId +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity import spock.lang.Specification import javax.transaction.Transactional import java.time.LocalDateTime -import static pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage.After.DemandChanged +import static pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage.After.DemandChanged @SpringBootTest @Transactional diff --git a/shortages-prediction-model/pom.xml b/shortages-prediction-model/pom.xml index bf02579..d2f2cf9 100644 --- a/shortages-prediction-model/pom.xml +++ b/shortages-prediction-model/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pl.com.bottega + pl.com.dddbyexamples shortages-prediction-model jar 1.0-SNAPSHOT - pl.com.bottega + pl.com.dddbyexamples shared-kernel-model 1.0-SNAPSHOT diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecasts.java b/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecasts.java deleted file mode 100644 index 8d26362..0000000 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecasts.java +++ /dev/null @@ -1,7 +0,0 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; - -import pl.com.bottega.factory.product.management.RefNoId; - -public interface ShortageForecasts { - ShortageForecast get(RefNoId refNo, int daysAhead); -} diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageSolved.java b/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageSolved.java deleted file mode 100644 index 416411e..0000000 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageSolved.java +++ /dev/null @@ -1,9 +0,0 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; - -import lombok.Value; -import pl.com.bottega.factory.product.management.RefNoId; - -@Value -public class ShortageSolved { - RefNoId refNo; -} diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/ConfigurationParams.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java similarity index 67% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/ConfigurationParams.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java index ac65403..5a2ed6b 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/ConfigurationParams.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction; +package pl.com.dddbyexamples.factory.shortages.prediction; /** * Created by michal on 02.02.2017. diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/Shortage.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java similarity index 97% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/Shortage.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java index 84db352..8d2849e 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/Shortage.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction; +package pl.com.dddbyexamples.factory.shortages.prediction; import lombok.AllArgsConstructor; import lombok.Value; diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/DeliveriesForecast.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java similarity index 80% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/DeliveriesForecast.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java index 6533630..b619d95 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/DeliveriesForecast.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.AllArgsConstructor; diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionForecast.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java similarity index 95% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionForecast.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java index 4a2d2bc..43a005a 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionForecast.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.AllArgsConstructor; import lombok.Value; diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionOutputs.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java similarity index 87% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionOutputs.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java index e6aef9e..48727ae 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ProductionOutputs.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.AllArgsConstructor; diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecast.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java similarity index 88% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecast.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java index 516fcaa..5e5f363 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/ShortageForecast.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; import java.time.LocalDateTime; import java.util.Optional; diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java new file mode 100644 index 0000000..87bd08a --- /dev/null +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java @@ -0,0 +1,7 @@ +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; + +import pl.com.dddbyexamples.factory.product.management.RefNoId; + +public interface ShortageForecasts { + ShortageForecast get(RefNoId refNo, int daysAhead); +} diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/Stock.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java similarity index 54% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/Stock.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java index c41dc58..c02648d 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/calculation/Stock.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation; +package pl.com.dddbyexamples.factory.shortages.prediction.calculation; import lombok.Value; diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/NewShortage.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java similarity index 54% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/NewShortage.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java index 4df2948..4abffa2 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/NewShortage.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java @@ -1,8 +1,8 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import lombok.Value; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; /** * Created by michal on 03.02.2017. diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java similarity index 54% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java index 37b76aa..3ea5459 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; interface ShortageDiffPolicy { diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEvents.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java similarity index 60% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEvents.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java index e57dd55..e8c5f4b 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageEvents.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; public interface ShortageEvents { void emit(NewShortage event); diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java similarity index 62% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java index 10582d0..d694730 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java @@ -1,12 +1,11 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.product.management.RefNoId; -import pl.com.bottega.factory.shortages.prediction.ConfigurationParams; -import pl.com.bottega.factory.shortages.prediction.Shortage; -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecast; -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecasts; -import pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage.After; +import pl.com.dddbyexamples.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast; +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts; import java.util.Optional; @@ -25,22 +24,22 @@ class ShortagePredictionProcess { private final ShortageEvents events; void onDemandChanged() { - predict(After.DemandChanged); + predict(NewShortage.After.DemandChanged); } void onPlanChanged() { - predict(After.PlanChanged); + predict(NewShortage.After.PlanChanged); } void onStockChanged() { - predict(After.StockChanged); + predict(NewShortage.After.StockChanged); } void onLockedParts() { - predict(After.LockedParts); + predict(NewShortage.After.LockedParts); } - private void predict(After event) { + private void predict(NewShortage.After event) { ShortageForecast forecast = forecasts.get(refNo, configuration.shortagePredictionDaysAhead()); diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java similarity index 52% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java index 665223e..9908d29 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; -import pl.com.bottega.factory.product.management.RefNoId; +import pl.com.dddbyexamples.factory.product.management.RefNoId; interface ShortagePredictionProcessRepository { ShortagePredictionProcess get(RefNoId refNo); diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionService.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java similarity index 80% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionService.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java index 0d5826b..de57558 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionService.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring; +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; import lombok.AllArgsConstructor; -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged; +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged; @AllArgsConstructor public class ShortagePredictionService { diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java new file mode 100644 index 0000000..7e748ee --- /dev/null +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java @@ -0,0 +1,9 @@ +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring; + +import lombok.Value; +import pl.com.dddbyexamples.factory.product.management.RefNoId; + +@Value +public class ShortageSolved { + RefNoId refNo; +} diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortage.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java similarity index 65% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortage.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java index 0e366db..65f78e2 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortage.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java @@ -1,12 +1,11 @@ -package pl.com.bottega.factory.shortages.prediction.notification; +package pl.com.dddbyexamples.factory.shortages.prediction.notification; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Singular; import lombok.Value; -import pl.com.bottega.factory.shortages.prediction.Shortage; -import pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage; -import pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage.After; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage; import java.time.Clock; import java.time.LocalDateTime; @@ -23,10 +22,10 @@ public class NotificationOfShortage { static NotificationRules rulesOfPlannerNotification(Notifications notifications) { return NotificationRules.builder() - .rule(After.DemandChanged, notifications::alertPlanner) - .rule(After.PlanChanged, notifications::markOnPlan) - .rule(After.StockChanged, notifications::alertPlanner) - .rule(After.LockedParts, notifications::softNotifyPlanner) + .rule(NewShortage.After.DemandChanged, notifications::alertPlanner) + .rule(NewShortage.After.PlanChanged, notifications::markOnPlan) + .rule(NewShortage.After.StockChanged, notifications::alertPlanner) + .rule(NewShortage.After.LockedParts, notifications::softNotifyPlanner) .otherwise(notifications::alertPlanner) .build(); } @@ -45,10 +44,10 @@ public class NotificationOfShortage { @Builder static class NotificationRules { @Singular - Map rules; + Map rules; Notificator otherwise; - Notificator wayOfNotificationAfter(After trigger) { + Notificator wayOfNotificationAfter(NewShortage.After trigger) { return rules.getOrDefault(trigger, otherwise); } } diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/Notifications.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java similarity index 59% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/Notifications.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java index d267a9c..f816f89 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/Notifications.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.shortages.prediction.notification; +package pl.com.dddbyexamples.factory.shortages.prediction.notification; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; /** * Created by michal on 02.02.2017. diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/QualityTasks.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java similarity index 64% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/QualityTasks.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java index 28c9885..c675669 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/QualityTasks.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.notification; +package pl.com.dddbyexamples.factory.shortages.prediction.notification; /** * Created by michal on 02.02.2017. diff --git a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java similarity index 83% rename from shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java rename to shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java index 851e11f..5275daf 100644 --- a/shortages-prediction-model/src/main/java/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java +++ b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.shortages.prediction.notification; +package pl.com.dddbyexamples.factory.shortages.prediction.notification; -import pl.com.bottega.factory.shortages.prediction.Shortage; +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage; import java.time.LocalDateTime; diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy similarity index 98% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy index 37d273c..b6b71a5 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation +package pl.com.dddbyexamples.factory.shortages.prediction.calculation import spock.lang.Specification diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy similarity index 97% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy index 204fe2e..34ce831 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation +package pl.com.dddbyexamples.factory.shortages.prediction.calculation import spock.lang.Specification diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy similarity index 52% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy index d503cb7..26520a1 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation +package pl.com.dddbyexamples.factory.shortages.prediction.calculation class ShortagesCalculationAssembler implements ShortagesCalculationTrait { } diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy similarity index 80% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy index 6f617e7..166b58b 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy @@ -1,7 +1,10 @@ -package pl.com.bottega.factory.shortages.prediction.calculation +package pl.com.dddbyexamples.factory.shortages.prediction.calculation -import pl.com.bottega.factory.product.management.RefNoId -import pl.com.bottega.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.product.management.RefNoId +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock import java.time.Duration import java.time.LocalDateTime diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/TimeGrammar.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy similarity index 88% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/TimeGrammar.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy index 4f330e4..6b4bf22 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/calculation/TimeGrammar.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy @@ -1,4 +1,4 @@ -package pl.com.bottega.factory.shortages.prediction.calculation +package pl.com.dddbyexamples.factory.shortages.prediction.calculation import java.time.Duration import java.time.LocalDateTime diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy similarity index 54% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy index 771929c..6834026 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy @@ -1,6 +1,6 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring -import pl.com.bottega.factory.shortages.prediction.ConfigurationParams +import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams class InMemoryConfigurationParams implements ConfigurationParams { int daysAhead; diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy similarity index 94% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy index b789e36..39cbd1d 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy @@ -1,7 +1,7 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring -import pl.com.bottega.factory.shortages.prediction.Shortage -import pl.com.bottega.factory.shortages.prediction.calculation.TimeGrammar +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.TimeGrammar import spock.lang.Specification import java.time.LocalDateTime diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy similarity index 87% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy index ea939f3..a2fd37e 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy @@ -1,8 +1,11 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved import spock.lang.Specification -import static pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage.After +import static pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage.After class ShortagePredictionProcessSpec extends Specification implements ShortagePredictionProcessTrait { diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy similarity index 74% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy index 561042d..e9a2504 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy @@ -1,10 +1,13 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring -import pl.com.bottega.factory.product.management.RefNoId -import pl.com.bottega.factory.shortages.prediction.ConfigurationParams -import pl.com.bottega.factory.shortages.prediction.Shortage -import pl.com.bottega.factory.shortages.prediction.calculation.ShortageForecasts -import pl.com.bottega.factory.shortages.prediction.calculation.ShortagesCalculationAssembler +import pl.com.dddbyexamples.factory.product.management.RefNoId +import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts +import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortagesCalculationAssembler +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved import java.time.LocalDateTime diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy similarity index 68% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy index f9b80ef..dadaf3d 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy @@ -1,6 +1,8 @@ -package pl.com.bottega.factory.shortages.prediction.monitoring +package pl.com.dddbyexamples.factory.shortages.prediction.monitoring -import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged +import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortagePredictionService +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved import spock.lang.Specification class ShortagePredictionServiceSpec extends Specification implements ShortagePredictionProcessTrait { diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy similarity index 84% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy index 316aff1..7a021e9 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy @@ -1,13 +1,16 @@ -package pl.com.bottega.factory.shortages.prediction.notification +package pl.com.dddbyexamples.factory.shortages.prediction.notification -import pl.com.bottega.factory.product.management.RefNoId -import pl.com.bottega.factory.shortages.prediction.Shortage -import pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage +import pl.com.dddbyexamples.factory.product.management.RefNoId +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage +import pl.com.dddbyexamples.factory.shortages.prediction.notification.NotificationOfShortage +import pl.com.dddbyexamples.factory.shortages.prediction.notification.QualityTasks +import pl.com.dddbyexamples.factory.shortages.prediction.notification.RecoveryTaskPriorityChangePolicy import spock.lang.Specification import java.time.* -import static pl.com.bottega.factory.shortages.prediction.monitoring.NewShortage.After +import static NewShortage.After class NotificationOfShortageSpec extends Specification { diff --git a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy similarity index 91% rename from shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy rename to shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy index 855cc3b..9bcbbb6 100644 --- a/shortages-prediction-model/src/test/groovy/pl/com/bottega/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy +++ b/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy @@ -1,6 +1,7 @@ -package pl.com.bottega.factory.shortages.prediction.notification +package pl.com.dddbyexamples.factory.shortages.prediction.notification -import pl.com.bottega.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.Shortage +import pl.com.dddbyexamples.factory.shortages.prediction.notification.RecoveryTaskPriorityChangePolicy import spock.lang.Specification import java.time.Duration