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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 4d9c8a812f CAUSEWAY-2297: organize imports
4d9c8a812f is described below
commit 4d9c8a812f28b8966d4ae057ebf38f76fa12de07
Author: Andi Huber <[email protected]>
AuthorDate: Fri Sep 29 04:56:23 2023 +0200
CAUSEWAY-2297: organize imports
---
.../CommandPublishingFacetForActionAnnotation.java | 5 ++---
.../ExecutionPublishingFacetForActionAnnotation.java | 5 ++---
.../ExecutionPublishingFacetForActionFallback.java | 2 --
.../Object_downloadColumnOrderTxtFilesAsZip.java | 19 +++++++------------
.../grid/bootstrap/GridSystemServiceBootstrap.java | 3 ---
...nnotationFacetFactoryTest_executionPublishing.java | 6 +-----
.../jdo/metamodel/menu/JdoMetamodelMenu.java | 5 -----
7 files changed, 12 insertions(+), 33 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
index 735872a344..d6f1aa2467 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
@@ -24,7 +24,6 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
import
org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -35,7 +34,7 @@ import lombok.val;
public abstract class CommandPublishingFacetForActionAnnotation extends
CommandPublishingFacetAbstract {
static class Enabled extends CommandPublishingFacetForActionAnnotation {
- Enabled(CommandDtoProcessor processor, FacetHolder holder,
ServiceInjector servicesInjector) {
+ Enabled(final CommandDtoProcessor processor, final FacetHolder holder,
final ServiceInjector servicesInjector) {
super(processor, holder, servicesInjector);
}
@@ -46,7 +45,7 @@ public abstract class
CommandPublishingFacetForActionAnnotation extends CommandP
}
static class Disabled extends CommandPublishingFacetForActionAnnotation {
- Disabled(CommandDtoProcessor processor, FacetHolder holder,
ServiceInjector servicesInjector) {
+ Disabled(final CommandDtoProcessor processor, final FacetHolder
holder, final ServiceInjector servicesInjector) {
super(processor, holder, servicesInjector);
}
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionAnnotation.java
index 88bbecab9b..000b4d2737 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionAnnotation.java
@@ -22,7 +22,6 @@ import java.util.Optional;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -33,7 +32,7 @@ import lombok.val;
public abstract class ExecutionPublishingFacetForActionAnnotation extends
ExecutionPublishingFacetAbstract {
static class Enabled extends ExecutionPublishingFacetForActionAnnotation {
- Enabled(FacetHolder holder) {
+ Enabled(final FacetHolder holder) {
super(holder);
}
@@ -44,7 +43,7 @@ public abstract class
ExecutionPublishingFacetForActionAnnotation extends Execut
}
static class Disabled extends ExecutionPublishingFacetForActionAnnotation {
- Disabled(FacetHolder holder) {
+ Disabled(final FacetHolder holder) {
super(holder);
}
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionFallback.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionFallback.java
index e873645d8c..654d9a567c 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionFallback.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetForActionFallback.java
@@ -18,9 +18,7 @@
*/
package org.apache.causeway.core.metamodel.facets.members.publish.execution;
-import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import
org.apache.causeway.core.metamodel.facets.members.publish.command.CommandPublishingFacetAbstract;
public class ExecutionPublishingFacetForActionFallback extends
ExecutionPublishingFacetAbstract {
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_downloadColumnOrderTxtFilesAsZip.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_downloadColumnOrderTxtFilesAsZip.java
index 94d81520ae..ccae251eea 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_downloadColumnOrderTxtFilesAsZip.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/inspect/Object_downloadColumnOrderTxtFilesAsZip.java
@@ -20,14 +20,6 @@ package org.apache.causeway.core.metamodel.inspect;
import javax.inject.Inject;
-import org.apache.causeway.applib.value.Blob;
-
-import org.apache.causeway.commons.io.ZipUtils;
-
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-
-import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
-
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
@@ -35,11 +27,14 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.RestrictTo;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.layout.LayoutConstants;
-import org.apache.causeway.applib.value.Clob;
+import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType;
+import org.apache.causeway.commons.io.ZipUtils;
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
+import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import lombok.RequiredArgsConstructor;
@@ -89,7 +84,7 @@ public class Object_downloadColumnOrderTxtFilesAsZip {
// HELPERS
- private void addStandaloneEntry(ZipUtils.EntryBuilder zipBuilder) {
+ private void addStandaloneEntry(final ZipUtils.EntryBuilder zipBuilder) {
val parentSpec =
specificationLoader.loadSpecification(domainObject.getClass());
val buf = new StringBuilder();
@@ -103,13 +98,13 @@ public class Object_downloadColumnOrderTxtFilesAsZip {
zipBuilder.addAsUtf8(fileName, fileContents);
}
- private void addCollectionEntries(ZipUtils.EntryBuilder zipBuilder) {
+ private void addCollectionEntries(final ZipUtils.EntryBuilder zipBuilder) {
val parentSpec =
specificationLoader.loadSpecification(domainObject.getClass());
parentSpec.streamCollections(MixedIn.INCLUDED)
.forEach(collection -> addCollection(collection, parentSpec,
zipBuilder));
}
- private void addCollection(OneToManyAssociation collection,
ObjectSpecification parentSpec, ZipUtils.EntryBuilder zipBuilder) {
+ private void addCollection(final OneToManyAssociation collection, final
ObjectSpecification parentSpec, final ZipUtils.EntryBuilder zipBuilder) {
val buf = new StringBuilder();
val collectionIdentifier = collection.getFeatureIdentifier();
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index 74366d7403..7291589301 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -18,10 +18,8 @@
*/
package org.apache.causeway.core.metamodel.services.grid.bootstrap;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -77,7 +75,6 @@ import
org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
-import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
diff --git
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
index deb75c378f..21d8efdb33 100644
---
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
+++
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.core.metamodel.facets.actions.action;
-import
org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacetForActionFallback;
-
-import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -36,9 +33,8 @@ import
org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import
org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import
org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacetForActionAnnotation;
-import
org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacetForActionFromConfiguration;
import
org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
+import
org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacetForActionAnnotation;
import lombok.val;
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
index 38554cc8f0..af4ac394ad 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
@@ -36,9 +36,6 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.causeway.commons.io.ZipUtils;
-import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
import
org.apache.causeway.persistence.jdo.metamodel.CausewayModulePersistenceJdoMetamodel;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
@@ -46,8 +43,6 @@ import
org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import java.util.Objects;
-
@Named(CausewayModulePersistenceJdoMetamodel.NAMESPACE + ".JdoMetamodelMenu")
@DomainService()
@DomainServiceLayout(
