You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/22 06:08:26 UTC
[isis] 01/02: ISIS-3004: replace @DomainService.logicalTypeName (ext/excel)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1040505954d5ce5857986692ee792a71b03fa826
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 22 07:52:05 2022 +0200
ISIS-3004: replace @DomainService.logicalTypeName (ext/excel)
---
.../dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 5 +++--
.../dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java | 5 +++--
.../excelupload/ExcelUploadServiceForDemoToDoItem.java | 9 +++++----
.../demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java | 12 +++++++-----
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index 95780191c8..b78bceaea3 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -19,6 +19,7 @@
package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.annotation.Action;
@@ -37,9 +38,9 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = "libExcelFixture.BulkUpdateMenuForDemoToDoItem"
+ nature = NatureOfService.VIEW
)
+@Named("libExcelFixture.BulkUpdateMenuForDemoToDoItem")
@DomainServiceLayout(
named = "Excel"
)
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index 6a60c25d80..b9749c5a46 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainService;
@@ -35,9 +36,9 @@ import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = "libExcelFixture.ExcelPivotByCategoryAndSubcategoryMenu"
+ nature = NatureOfService.VIEW
)
+@Named("libExcelFixture.ExcelPivotByCategoryAndSubcategoryMenu")
@DomainServiceLayout(
named = "Excel"
)
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 274d863cee..3ad7439dd3 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -21,6 +21,7 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehand
import java.util.List;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
@@ -30,16 +31,16 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.testing.ExcelFixture;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
+import org.apache.isis.extensions.excel.testing.ExcelFixture;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = "libExcelFixture.ExcelUploadServiceForDemoToDoItem"
+ nature = NatureOfService.VIEW
)
+@Named("libExcelFixture.ExcelUploadServiceForDemoToDoItem")
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.SECONDARY,
named = "Prototyping"
@@ -50,7 +51,7 @@ public class ExcelUploadServiceForDemoToDoItem {
private final FixtureScripts fixtureScripts;
@Inject
- public ExcelUploadServiceForDemoToDoItem(FixtureScripts fixtureScripts) {
+ public ExcelUploadServiceForDemoToDoItem(final FixtureScripts fixtureScripts) {
this.fixtureScripts = fixtureScripts;
}
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
index 75398630c9..33f045d46a 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
@@ -24,8 +24,10 @@ import java.time.ZoneId;
import java.util.Collections;
import java.util.List;
-import org.springframework.lang.Nullable;
import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.springframework.lang.Nullable;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -46,9 +48,9 @@ import org.apache.isis.applib.services.user.UserService;
import lombok.RequiredArgsConstructor;
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = "libExcelFixture.ExcelDemoToDoItemMenu"
+ nature = NatureOfService.VIEW
)
+@Named("libExcelFixture.ExcelDemoToDoItemMenu")
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class ExcelDemoToDoItemMenu {
@@ -176,7 +178,7 @@ public class ExcelDemoToDoItemMenu {
// new Location(51.5172+random(-0.05, +0.05), 0.1182 + random(-0.05, +0.05)));
LocalDate today = currentDate();
- toDoItem.setDueBy(today.plusDays((long)random(10)-2L));
+ toDoItem.setDueBy(today.plusDays(random(10)-2L));
repositoryService.persist(toDoItem);
@@ -193,7 +195,7 @@ public class ExcelDemoToDoItemMenu {
// return Math.random() * (to-from) + from;
// }
- private static int random(int n) {
+ private static int random(final int n) {
return (int) (Math.random() * n);
}