Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
.settings
.classpath
target

.vscode
.factorypath
2 changes: 1 addition & 1 deletion commons-business-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-business-impl</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
*/
public interface ConversionCrudServiceMixin<B, P, K>
extends ConversionCreationServiceMixin<B, P, K>,
ConversionUpdateServiceMixin<B, P, K>,
ConversionUpdateServiceMixin<B, P>,
ConversionDeletionServiceMixin<B, P>,
ConversionQueryServiceMixin<B, P, K>,
CrudService<B, K> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @param <P> The type of the persistence layer entity
* @param <K> The type of the entity identifier
*/
public interface ConversionUpdateServiceMixin<B, P, K> extends UpdateService<B, K>, BusinessConversionSupport<B, P> {
public interface ConversionUpdateServiceMixin<B, P> extends UpdateService<B>, BusinessConversionSupport<B, P> {

UpdateDao<P> getUpdateDao();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* @param <K>
*/
public interface CrudServiceMixin<T, K> extends CreationServiceMixin<T, K>,
UpdateServiceMixin<T, K>, DeletionServiceMixin<T>, QueryServiceMixin<T, K>, CrudService<T, K> {
UpdateServiceMixin<T>, DeletionServiceMixin<T>, QueryServiceMixin<T, K>, CrudService<T, K> {

default CreationDao<T, K> getCreationDao() {
return getCrudDao();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* @param <T> The type of the entity
* @param <K> The type of the entity identifier
*/
public interface UpdateServiceMixin<T, K>
extends ConversionUpdateServiceMixin<T, T, K>, BusinessConversionSupport.Identity<T> {
public interface UpdateServiceMixin<T>
extends ConversionUpdateServiceMixin<T, T>, BusinessConversionSupport.Identity<T> {

}
2 changes: 1 addition & 1 deletion commons-business-spring-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-business-spring-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons-business/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-business</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* @param <K>
*/
public interface CrudService<T, K>
extends CreationService<T, K>, UpdateService<T, K>, DeletionService<T>, QueryService<T, K> {
extends CreationService<T, K>, UpdateService<T>, DeletionService<T>, QueryService<T, K> {

void deleteById(K id);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @param <T>
* @param <K>
*/
public interface UpdateService<T, K> {
public interface UpdateService<T> {

void update(T entity);

Expand Down
2 changes: 1 addition & 1 deletion commons-data-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-data-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-data</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>commons-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<groupId>com.appjars.saturn.backend</groupId>
<artifactId>commons-backend</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>Commons Backend</name>

<prerequisites>
Expand Down