using mixins rather than contributions

Author: danhaywood

app/src/main/java/todoapp/app/viewmodels/dashboard/ToDoAppDashboard.java

@@ -31,7 +31,7 @@
 import org.apache.isis.applib.value.Blob;
 
 import todoapp.app.services.export.ExportToWordService;
-import todoapp.dom.relativepriority.RelativePriorityContributions;
+import todoapp.dom.relativepriority.RelativePriorityService;
 import todoapp.dom.todoitem.ToDoItem;
 import todoapp.dom.todoitem.ToDoItems;
 
@@ -50,7 +50,7 @@ public String title() {
             editing = Editing.DISABLED
     )
     @CollectionLayout(
-            sortedBy = RelativePriorityContributions.Comparator.class
+            sortedBy = RelativePriorityService.Comparator.class
     )
     public List<ToDoItem> getNotYetComplete() {
         return toDoItems.notYetCompleteNoUi();
@@ -73,7 +73,7 @@ public List<ToDoItem> getComplete() {
     public Blob exportToWordDoc() {
 
         final List items = getNotYetComplete();
-        Collections.sort(items, relativePriorityContributions.comparator());
+        Collections.sort(items, relativePriorityService.comparator());
         return toDoItemsExportService.exportToWordDoc(items);
     }
     //endregion
@@ -86,7 +86,7 @@ public Blob exportToWordDoc() {
     private ExportToWordService toDoItemsExportService;
 
     @javax.inject.Inject
-    private RelativePriorityContributions relativePriorityContributions;
+    private RelativePriorityService relativePriorityService;
 
     //endregion
 

app/src/main/java/todoapp/app/viewmodels/todoitem/ContentMappingServiceForToDoItem.java

@@ -30,7 +30,7 @@
 import org.apache.isis.applib.conmap.ContentMappingService;
 
 import todoapp.app.viewmodels.todoitem.v1.ToDoItemV1_1;
-import todoapp.dom.similarto.SimilarToContributions;
+import todoapp.dom.similarto.SimilarToService;
 import todoapp.dom.todoitem.ToDoItem;
 
 @DomainService(
@@ -79,7 +79,7 @@ public ToDoItemV1_1 newToDoItemV1_1(final ToDoItem toDoItem) {
         dto.setSubcategory(nameOf(toDoItem.getSubcategory()));
         dto.setCost(toDoItem.getCost());
         dto.setToDoItem(toDoItem);
-        dto.setSimilarItems(similarToContributions.similarTo(toDoItem));
+        dto.setSimilarItems(similarToService.similarTo(toDoItem));
 
         return dto;
     }
@@ -89,6 +89,6 @@ private static String nameOf(final Enum<?> e) {
     }
 
     @Inject
-    SimilarToContributions similarToContributions;
+    SimilarToService similarToService;
 
 }

dom/src/main/java/todoapp/dom/categories/Categorized.java

@@ -21,7 +21,7 @@
 import todoapp.dom.todoitem.ToDoItem;
 
 /**
- * Enables {@link UpdateCategoryContributions#updateCategory(Categorized, Category, Subcategory)} to be contributed to
+ * Enables {@link Categorized_updateCategory#$$(Category, Subcategory)} to be contributed to
  * both the {@link ToDoItem} (entity).
  */
 public interface Categorized {

dom/src/main/java/todoapp/dom/categories/UpdateCategoryContributions.java dom/src/main/java/todoapp/dom/categories/Categorized_updateCategory.java

@@ -20,61 +20,47 @@
 
 import java.util.List;
 
-import org.apache.isis.applib.AbstractFactoryAndRepository;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Mixin;
 import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
 
-import todoapp.dom.todoitem.ToDoItems;
+@Mixin
+public class Categorized_updateCategory {
 
-@DomainService(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
-public class UpdateCategoryContributions extends AbstractFactoryAndRepository {
+    private final Categorized categorized;
+
+    public Categorized_updateCategory(final Categorized categorized) {
+        this.categorized = categorized;
+    }
 
-    //region > updateCategory (contributed action)
 
     @ActionLayout(
             describedAs = "Update category and subcategory"
     )
     @Action(semantics = SemanticsOf.IDEMPOTENT)
-    public Categorized updateCategory(
-            final Categorized item,
+    public Categorized $$(
             final Category category,
             final @Parameter(optionality = Optionality.OPTIONAL) Subcategory subcategory) {
-        item.setCategory(category);
-        item.setSubcategory(subcategory);
-        return item;
+        categorized.setCategory(category);
+        categorized.setSubcategory(subcategory);
+        return categorized;
     }
-    public Category default1UpdateCategory(
-            final Categorized item) {
-        return item != null? item.getCategory(): null;
+    public Category default0$$() {
+        return categorized != null? categorized.getCategory(): null;
     }
-    public Subcategory default2UpdateCategory(
-            final Categorized item) {
-        return item != null? item.getSubcategory(): null;
+    public Subcategory default1$$() {
+        return categorized != null? categorized.getSubcategory(): null;
     }
 
-    public List<Subcategory> choices2UpdateCategory(
-            final Categorized item, final Category category) {
+    public List<Subcategory> choices1$$(final Category category) {
         return Subcategory.listFor(category);
     }
 
-    public String validateUpdateCategory(
-            final Categorized item, final Category category, final Subcategory subcategory) {
+    public String validate$$(
+            final Category category, final Subcategory subcategory) {
         return Subcategory.validate(category, subcategory);
     }
-    //endregion
-
-    //region > injected services
-    @javax.inject.Inject
-    private ToDoItems toDoItems;
-
-    @javax.inject.Inject
-    private QueryResultsCache queryResultsCache;
-    //endregion
-
 }