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
The following commit(s) were added to refs/heads/master by this push:
new 2b21b46999 ISIS-3105: minor: some code formatting
2b21b46999 is described below
commit 2b21b46999f85a83703c9d42dbba55161888ba86
Author: Andi Huber <[email protected]>
AuthorDate: Tue Aug 2 10:30:41 2022 +0200
ISIS-3105: minor: some code formatting
---
.../jpa/applib/types/BlobJpaEmbeddable.java | 10 ++++----
.../jpa/applib/types/ClobJpaEmbeddable.java | 10 ++++----
.../integration/entity/JpaEntityFacetFactory.java | 28 +---------------------
.../applib/IsisBookmarkConverter.java | 9 ++++---
.../applib/IsisLocalResourcePathConverter.java | 8 +++----
.../typeconverters/applib/IsisMarkupConverter.java | 7 ++----
.../applib/IsisPasswordConverter.java | 5 ++--
.../java/time/JavaTimeIsoOffsetTimeConverter.java | 5 ++--
.../time/JavaTimeIsoZonedDateTimeConverter.java | 5 ++--
.../java/util/JavaUtilUuidConverter.java | 5 ++--
.../schema/v2/IsisChangesDtoConverter.java | 5 ++--
.../schema/v2/IsisCommandDtoConverter.java | 5 ++--
.../schema/v2/IsisInteractionDtoConverter.java | 5 ++--
.../schema/v2/IsisOidDtoConverter.java | 5 ++--
14 files changed, 36 insertions(+), 76 deletions(-)
diff --git
a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/BlobJpaEmbeddable.java
b/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/BlobJpaEmbeddable.java
index 0897ecec39..995ae2bf80 100644
---
a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/BlobJpaEmbeddable.java
+++
b/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/BlobJpaEmbeddable.java
@@ -42,7 +42,7 @@ import lombok.val;
*
* <p>
* EclipseLink <i>does</i> provide its own extension,
- * <a
href="https://www.eclipse.org/eclipselink/documentation/2.5/jpa/extensions/a_transformation.htm>Transformation
API</a>,
+ * <a
href="https://www.eclipse.org/eclipselink/documentation/2.5/jpa/extensions/a_transformation.htm";>Transformation
API</a>,
* but there's a lot of boilerplate involved even so.
* </p>
*
@@ -82,10 +82,10 @@ public final class BlobJpaEmbeddable {
/**
* Factory method to marshall a {@link Blob} into a {@link
BlobJpaEmbeddable}
- *
+ *
* @see #toBlob(BlobJpaEmbeddable)
*/
- public static BlobJpaEmbeddable fromBlob(Blob blob) {
+ public static BlobJpaEmbeddable fromBlob(final Blob blob) {
if(blob == null) {
return null;
}
@@ -98,7 +98,7 @@ public final class BlobJpaEmbeddable {
/**
* Reciprocal method to marshall a {@link BlobJpaEmbeddable} into a {@link
Blob}
- *
+ *
* @see #fromBlob(Blob)
*/
public static Blob toBlob(final BlobJpaEmbeddable blobJpaEmbeddable) {
@@ -122,7 +122,7 @@ public final class BlobJpaEmbeddable {
return new Blob(name, mimeType, bytes);
}
-
+
@Override
public String toString() {
return asBlob().toString();
diff --git
a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/ClobJpaEmbeddable.java
b/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/ClobJpaEmbeddable.java
index 7cb65ae16f..62d1264f0e 100644
---
a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/ClobJpaEmbeddable.java
+++
b/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/types/ClobJpaEmbeddable.java
@@ -42,7 +42,7 @@ import lombok.val;
*
* <p>
* EclipseLink <i>does</i> provide its own extension,
- * <a
href="https://www.eclipse.org/eclipselink/documentation/2.5/jpa/extensions/a_transformation.htm>Transformation
API</a>,
+ * <a
href="https://www.eclipse.org/eclipselink/documentation/2.5/jpa/extensions/a_transformation.htm";>Transformation
API</a>,
* but there's a lot of boilerplate involved even so.
* </p>
*
@@ -72,7 +72,7 @@ import lombok.val;
* Lastly; note that {@link javax.persistence.AttributeOverrides} and
{@link javax.persistence.AttributeOverride}
* provide a standardised way of fine-tuning the column definitions.
* </p>
- *
+ *
* @since 2.x {@index}
*/
@Embeddable
@@ -81,10 +81,10 @@ public final class ClobJpaEmbeddable {
/**
* Factory method to marshall a {@link Clob} into a {@link
ClobJpaEmbeddable}
- *
+ *
* @see #toClob(ClobJpaEmbeddable)
*/
- public static ClobJpaEmbeddable fromClob(Clob clob) {
+ public static ClobJpaEmbeddable fromClob(final Clob clob) {
if(clob == null) {
return null;
}
@@ -121,7 +121,7 @@ public final class ClobJpaEmbeddable {
return new Clob(name, mimeType, chars);
}
-
+
@Override
public String toString() {
return asClob().toString();
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
index a5d79e9714..ca1ed4ed6d 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/entity/JpaEntityFacetFactory.java
@@ -18,38 +18,17 @@
*/
package org.apache.isis.persistence.jpa.integration.entity;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Priority;
import javax.inject.Inject;
import javax.persistence.Entity;
-import org.springframework.stereotype.Component;
-
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.graph.tree.TreeState;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.bookmark.IdStringifier;
-import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.commons.collections.ImmutableEnumSet;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.memento._Mementos;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import lombok.NonNull;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
-@Log4j2
+//@Log4j2
public class JpaEntityFacetFactory
extends FacetFactoryAbstract {
@@ -73,9 +52,4 @@ extends FacetFactoryAbstract {
new JpaEntityFacet(facetHolder, cls, getServiceRegistry()));
}
- // --
-
- // -- HELPER - OBJECT ID SERIALIZATION
-
-
}
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisBookmarkConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisBookmarkConverter.java
index ce54e188c7..2779aea42e 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisBookmarkConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisBookmarkConverter.java
@@ -29,21 +29,20 @@ import org.apache.isis.commons.internal.base._Strings;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisBookmarkConverter implements AttributeConverter<Bookmark,
String> {
-
- private static final long serialVersionUID = 1L;
+public class IsisBookmarkConverter
+implements AttributeConverter<Bookmark, String> {
static final int MAX_LENGTH = HasTarget.Target.MAX_LENGTH;
@Override
- public String convertToDatabaseColumn(Bookmark bookmark) {
+ public String convertToDatabaseColumn(final Bookmark bookmark) {
return bookmark != null
? _Strings.nullIfExceeds(bookmark.toString(), MAX_LENGTH)
: null;
}
@Override
- public Bookmark convertToEntityAttribute(String datastoreValue) {
+ public Bookmark convertToEntityAttribute(final String datastoreValue) {
return datastoreValue != null
? Bookmark.parseElseFail(datastoreValue)
: null;
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisLocalResourcePathConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisLocalResourcePathConverter.java
index 6df09615b0..e92d4ac743 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisLocalResourcePathConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisLocalResourcePathConverter.java
@@ -28,19 +28,17 @@ import org.apache.isis.applib.value.LocalResourcePath;
*/
@Converter(autoApply = true)
public class IsisLocalResourcePathConverter
- implements AttributeConverter<LocalResourcePath, String> {
-
- private static final long serialVersionUID = 1L;
+implements AttributeConverter<LocalResourcePath, String> {
@Override
- public String convertToDatabaseColumn(LocalResourcePath memberValue) {
+ public String convertToDatabaseColumn(final LocalResourcePath memberValue)
{
return memberValue != null
? memberValue.getValue()
: null;
}
@Override
- public LocalResourcePath convertToEntityAttribute(String datastoreValue) {
+ public LocalResourcePath convertToEntityAttribute(final String
datastoreValue) {
return datastoreValue != null
? new LocalResourcePath(datastoreValue)
: null;
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisMarkupConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisMarkupConverter.java
index 61b998b68e..715e1303d1 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisMarkupConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisMarkupConverter.java
@@ -21,17 +21,14 @@ package
org.apache.isis.persistence.jpa.integration.typeconverters.applib;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-
-import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.applib.value.Markup;
/**
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisMarkupConverter implements AttributeConverter<Markup, String>
{
-
- private static final long serialVersionUID = 1L;
+public class IsisMarkupConverter
+implements AttributeConverter<Markup, String> {
@Override
public String convertToDatabaseColumn(final Markup memberValue) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisPasswordConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisPasswordConverter.java
index 984242ed82..4dca2f5c59 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisPasswordConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/applib/IsisPasswordConverter.java
@@ -27,9 +27,8 @@ import org.apache.isis.applib.value.Password;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisPasswordConverter implements AttributeConverter<Password,
String> {
-
- private static final long serialVersionUID = 1L;
+public class IsisPasswordConverter
+implements AttributeConverter<Password, String> {
@Override
public String convertToDatabaseColumn(final Password memberValue) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoOffsetTimeConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoOffsetTimeConverter.java
index 29322cdf6c..4f76e06bee 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoOffsetTimeConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoOffsetTimeConverter.java
@@ -28,9 +28,8 @@ import javax.persistence.Converter;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class JavaTimeIsoOffsetTimeConverter implements
AttributeConverter<OffsetTime, String>{
-
- private static final long serialVersionUID = 1L;
+public class JavaTimeIsoOffsetTimeConverter
+implements AttributeConverter<OffsetTime, String>{
@Override
public String convertToDatabaseColumn(final OffsetTime offsetTime) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoZonedDateTimeConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoZonedDateTimeConverter.java
index 3bf5c6e634..f7fdd57e48 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoZonedDateTimeConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/JavaTimeIsoZonedDateTimeConverter.java
@@ -28,9 +28,8 @@ import javax.persistence.Converter;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class JavaTimeIsoZonedDateTimeConverter implements
AttributeConverter<ZonedDateTime, String> {
-
- private static final long serialVersionUID = 1L;
+public class JavaTimeIsoZonedDateTimeConverter
+implements AttributeConverter<ZonedDateTime, String> {
@Override
public String convertToDatabaseColumn(final ZonedDateTime offsetTime) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/util/JavaUtilUuidConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/util/JavaUtilUuidConverter.java
index 5c5e8016de..c39b2f04c6 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/util/JavaUtilUuidConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/util/JavaUtilUuidConverter.java
@@ -27,9 +27,8 @@ import javax.persistence.Converter;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class JavaUtilUuidConverter implements AttributeConverter<UUID, String>
{
-
- private static final long serialVersionUID = 1L;
+public class JavaUtilUuidConverter
+implements AttributeConverter<UUID, String> {
@Override
public String convertToDatabaseColumn(final UUID uuid) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisChangesDtoConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisChangesDtoConverter.java
index 58804169e8..fbab04ad73 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisChangesDtoConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisChangesDtoConverter.java
@@ -28,9 +28,8 @@ import org.apache.isis.schema.chg.v2.ChangesDto;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisChangesDtoConverter implements AttributeConverter<ChangesDto,
String> {
-
- private static final long serialVersionUID = 1L;
+public class IsisChangesDtoConverter
+implements AttributeConverter<ChangesDto, String> {
@Override
public String convertToDatabaseColumn(final ChangesDto memberValue) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisCommandDtoConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisCommandDtoConverter.java
index 34b44caf77..8fac9edef6 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisCommandDtoConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisCommandDtoConverter.java
@@ -28,9 +28,8 @@ import org.apache.isis.schema.cmd.v2.CommandDto;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisCommandDtoConverter implements AttributeConverter<CommandDto,
String> {
-
- private static final long serialVersionUID = 1L;
+public class IsisCommandDtoConverter
+implements AttributeConverter<CommandDto, String> {
@Override
public String convertToDatabaseColumn(final CommandDto memberValue) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisInteractionDtoConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisInteractionDtoConverter.java
index bbb2c77e29..79cd342bcc 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisInteractionDtoConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisInteractionDtoConverter.java
@@ -28,9 +28,8 @@ import org.apache.isis.schema.ixn.v2.InteractionDto;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisInteractionDtoConverter implements
AttributeConverter<InteractionDto, String> {
-
- private static final long serialVersionUID = 1L;
+public class IsisInteractionDtoConverter
+implements AttributeConverter<InteractionDto, String> {
@Override
public String convertToDatabaseColumn(final InteractionDto memberValue) {
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisOidDtoConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisOidDtoConverter.java
index 802998812f..87eaa56d6f 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisOidDtoConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/schema/v2/IsisOidDtoConverter.java
@@ -28,9 +28,8 @@ import org.apache.isis.schema.common.v2.OidDto;
* @since 2.0 {@index}
*/
@Converter(autoApply = true)
-public class IsisOidDtoConverter implements AttributeConverter<OidDto, String>
{
-
- private static final long serialVersionUID = 1L;
+public class IsisOidDtoConverter
+implements AttributeConverter<OidDto, String> {
@Override
public String convertToDatabaseColumn(final OidDto memberValue) {
