This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa-SNAPSHOT by this push:
new a9b6264 minor edits
a9b6264 is described below
commit a9b62644a86821f89b9a3fc5a349a53c5f984674
Author: danhaywood <[email protected]>
AuthorDate: Mon Jan 29 08:36:15 2024 +0000
minor edits
---
.editorconfig | 10 +++++++++-
.../java/domainapp/webapp/custom/restapi/CustomController.java | 8 +++++---
.../src/main/java/domainapp/webapp/quartz/job/SampleJob.java | 6 ++++--
webapp/src/main/resources/static/index.html | 2 +-
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 6085a6d..5c99ed8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,6 +16,11 @@ ij_smart_tabs = false
ij_visual_guides = none
ij_wrap_on_typing = false
+[*.adoc]
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+
[*.java]
ij_java_align_consecutive_assignments = false
ij_java_align_consecutive_variable_declarations = false
@@ -107,7 +112,7 @@ ij_java_for_statement_wrap = off
ij_java_generate_final_locals = false
ij_java_generate_final_parameters = false
ij_java_if_brace_force = never
-ij_java_imports_layout =
java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,domainapp.**,|,*,|,$*
+ij_java_imports_layout =
java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,graphql.**,|,$graphql.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,org.apache.isis.**,|,$org.apache.isis.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$*
ij_java_indent_case_from_switch = true
ij_java_insert_inner_class_imports = false
ij_java_insert_override_annotation = true
@@ -363,3 +368,6 @@ ij_yaml_sequence_on_new_line = false
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
ij_yaml_spaces_within_brackets = true
+
+[{*.gql,*.graphql}]
+indent_size = 2
diff --git
a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index 1e02e73..1e8cd6d 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -39,9 +39,11 @@ class CustomController {
final Callable<T> callable) {
return interactionService.call(
-
InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
- () ->
transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
- .ifFailureFail().getValue();
+
InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
+ () ->
transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable)
+ )
+ .ifFailureFail()
+ .getValue();
}
}
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index ac87ca8..7d28f4b 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -49,8 +49,10 @@ public class SampleJob implements Job {
final Callable<T> callable) {
return interactionService.call(
-
InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
- () ->
transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
+ InteractionContext.ofUserWithSystemDefaults(
+ UserMemento.ofName(username)),
+ () ->
transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable)
+ )
.ifFailureFail()
.getValue();
}
diff --git a/webapp/src/main/resources/static/index.html
b/webapp/src/main/resources/static/index.html
index c9c413d..2de7a5e 100644
--- a/webapp/src/main/resources/static/index.html
+++ b/webapp/src/main/resources/static/index.html
@@ -50,7 +50,7 @@
<p>
The full backend API (at <a
href="restful/">restful/</a>) renders both simple and also richer
hypermedia representations of domain objects, the
latter conforming to the
- <a href="http://restfulobjects.org";
target="_blank">Restful Objects</a> spec.
+ <a href="https://www.restfulobjects.org";
target="_blank">Restful Objects</a> spec.
</p>
</li>
</ul>
