Skip to content

Commit

Permalink
#299 - Upgrade to latest Moduliths 1.0 snapshots.
Browse files Browse the repository at this point in the history
  • Loading branch information
odrotbohm committed Dec 17, 2019
1 parent 55e32f0 commit 8d8919d
Show file tree
Hide file tree
Showing 26 changed files with 36 additions and 49 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<dev>/dev</dev>
<java.version>11</java.version>
<moduliths.version>1.0.0.RC2</moduliths.version>
<moduliths.version>1.0.0.BUILD-SNAPSHOT</moduliths.version>
</properties>

<profiles>
Expand Down Expand Up @@ -140,20 +140,20 @@
</dependency>

<dependency>
<groupId>de.olivergierke.moduliths</groupId>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-core</artifactId>
<version>${moduliths.version}</version>
</dependency>

<dependency>
<groupId>de.olivergierke.moduliths</groupId>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-test</artifactId>
<version>${moduliths.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>de.olivergierke.moduliths</groupId>
<groupId>org.moduliths</groupId>
<artifactId>moduliths-docs</artifactId>
<version>${moduliths.version}</version>
<scope>test</scope>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/salespointframework/EnableSalespoint.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
*/
package org.salespointframework;

import de.olivergierke.moduliths.Modulithic;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import org.moduliths.Modulithic;
import org.salespointframework.EnableSalespoint.SalespointSecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see http://en.wikipedia.org/wiki/Accounting
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Accountancy")
@org.moduliths.Module(displayName = "Salespoint :: Accountancy")
package org.salespointframework.accountancy;
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* A {@link org.salespointframework.catalog.Catalog} maintaining {@link org.salespointframework.catalog.Product}s.
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Catalog")
@org.moduliths.Module(displayName = "Salespoint :: Catalog")
package org.salespointframework.catalog;
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* Core Salespoint types.
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Core")
@org.moduliths.Module(displayName = "Salespoint :: Core")
package org.salespointframework.core;
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
* @see org.salespointframework.inventory.UniqueInventory
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Inventory")
@org.moduliths.Module(displayName = "Salespoint :: Inventory")
package org.salespointframework.inventory;
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see org.salespointframework.order.OrderManager
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Order")
@org.moduliths.Module(displayName = "Salespoint :: Order")
package org.salespointframework.order;
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* The payment subsystem with domain types to capture payment information (credit cards etc.).
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Payment")
@org.moduliths.Module(displayName = "Salespoint :: Payment")
package org.salespointframework.payment;
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see org.salespointframework.quantity.Quantity
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Quantity")
@org.moduliths.Module(displayName = "Salespoint :: Quantity")
package org.salespointframework.quantity;
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* Infrastrcuture support classes. Usually not intended to be used by application code.
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Support")
@org.moduliths.Module(displayName = "Salespoint :: Support")
package org.salespointframework.support;
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see org.salespointframework.time.BusinessTime
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Time")
@org.moduliths.Module(displayName = "Salespoint :: Time")
package org.salespointframework.time;
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see org.salespointframework.useraccount.UserAccountManager
*/
@org.springframework.lang.NonNullApi
@de.olivergierke.moduliths.Module(displayName = "Salespoint :: User Account")
@org.moduliths.Module(displayName = "Salespoint :: User Account")
package org.salespointframework.useraccount;
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@
import static org.hamcrest.Matchers.not;
import static org.hamcrest.junit.MatcherAssert.assertThat;

import de.olivergierke.modulith.docs.Documenter;
import de.olivergierke.modulith.docs.Documenter.Options;
import de.olivergierke.moduliths.model.Modules;

import java.io.IOException;
import java.util.List;

import org.junit.jupiter.api.Test;
import org.modulith.docs.Documenter;
import org.modulith.docs.Documenter.Options;
import org.moduliths.model.Modules;
import org.salespointframework.catalog.Catalog;
import org.salespointframework.catalog.Product;
import org.salespointframework.core.DataInitializer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,20 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;
import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;

import java.time.LocalDateTime;

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.moduliths.test.ModuleTest.BootstrapMode;
import org.salespointframework.core.Currencies;
import org.salespointframework.time.Interval;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;

/**
* Integration tests for {@link AccountancyEntryRepository}.
*
*
* @author Oliver Gierke
*/
@Transactional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
*/
package org.salespointframework.accountancy;

import de.olivergierke.moduliths.test.ModuleTest;
import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;

import java.time.LocalDateTime;

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.moduliths.test.ModuleTest.BootstrapMode;
import org.salespointframework.core.Currencies;
import org.salespointframework.order.Order;
import org.salespointframework.order.OrderIdentifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
import static org.hamcrest.Matchers.*;
import static org.hamcrest.junit.MatcherAssert.assertThat;

import de.olivergierke.moduliths.test.ModuleTest;

import java.util.Optional;

import org.hamcrest.Matchers;
import org.javamoney.moneta.Money;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.salespointframework.core.Currencies;
import org.salespointframework.quantity.Metric;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import static org.hamcrest.Matchers.*;
import static org.hamcrest.junit.MatcherAssert.assertThat;

import de.olivergierke.moduliths.test.ModuleTest;

import java.util.Map;
import java.util.function.Function;

Expand All @@ -34,6 +32,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.moduliths.test.ModuleTest;
import org.salespointframework.catalog.Catalog;
import org.salespointframework.catalog.Cookie;
import org.salespointframework.catalog.Product;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
import static org.hamcrest.Matchers.*;
import static org.hamcrest.junit.MatcherAssert.*;

import de.olivergierke.moduliths.test.ModuleTest;
import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.moduliths.test.ModuleTest.BootstrapMode;
import org.salespointframework.catalog.Product;
import org.salespointframework.core.Currencies;
import org.salespointframework.quantity.Quantity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;
import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
import lombok.RequiredArgsConstructor;

import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.moduliths.test.ModuleTest.BootstrapMode;
import org.salespointframework.useraccount.Password.UnencryptedPassword;
import org.salespointframework.useraccount.UserAccount;
import org.salespointframework.useraccount.UserAccountManager;
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/salespointframework/order/OrderTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
import static org.salespointframework.core.Currencies.*;
import static org.salespointframework.order.OrderStatus.*;

import de.olivergierke.moduliths.test.ModuleTest;
import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.moduliths.test.ModuleTest.BootstrapMode;
import org.salespointframework.catalog.Catalog;
import org.salespointframework.catalog.Product;
import org.salespointframework.order.ChargeLine.AttachedChargeLine;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.junit.MatcherAssert.*;

import de.olivergierke.moduliths.test.ModuleTest;

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.salespointframework.catalog.Catalog;
import org.salespointframework.catalog.Product;
import org.salespointframework.core.Currencies;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import org.javamoney.moneta.Money;
import org.junit.jupiter.api.Test;
import org.salespointframework.support.MonetaryAmountAttributeConverter;

/**
* Unit tests for {@link MonetaryAmountAttributeConverter}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;
import lombok.Data;

import java.time.LocalDateTime;
Expand All @@ -30,6 +29,7 @@
import javax.persistence.Id;

import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.salespointframework.useraccount.Password.UnencryptedPassword;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.TestPropertySource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;

import java.util.Optional;

import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.salespointframework.useraccount.Password.EncryptedPassword;
import org.salespointframework.useraccount.Password.UnencryptedPassword;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@

import static org.assertj.core.api.Assertions.*;

import de.olivergierke.moduliths.test.ModuleTest;

import java.util.UUID;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.moduliths.test.ModuleTest;
import org.salespointframework.useraccount.Password.EncryptedPassword;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataIntegrityViolationException;
Expand Down

0 comments on commit 8d8919d

Please sign in to comment.