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 2018/04/13 10:27:44 UTC
[isis] 02/04: ISIS-1841 provide serialVersionUIDs
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 af45ccd2707dfaf73e453fb92723e9c50204ee6c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 13 08:04:28 2018 +0200
ISIS-1841 provide serialVersionUIDs
---
.../org/apache/isis/applib/AbstractViewModel.java | 1 -
.../isis/applib/domain/DomainObjectList.java | 22 +++++++++++-----------
.../isis/applib/mixins/dto/Dto_downloadXml.java | 5 ++++-
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 5 ++++-
.../services/bookmark/BookmarkHolder_lookup.java | 2 +-
.../services/bookmark/BookmarkHolder_object.java | 2 +-
.../services/command/spi/CommandService.java | 2 --
.../services/config/ConfigurationServiceMenu.java | 15 +++++++++------
.../apache/isis/applib/services/error/Ticket.java | 4 +++-
.../isis/applib/services/hint/HintStore.java | 4 +++-
.../applib/services/hsqldb/HsqlDbManagerMenu.java | 2 +-
.../services/metamodel/MetaModelServicesMenu.java | 6 ++----
.../services/publish/PublisherServiceLogging.java | 19 ++++++++-----------
.../services/swagger/SwaggerServiceMenu.java | 11 ++++-------
.../isis/applib/services/userreg/UserDetails.java | 4 +++-
.../java/org/apache/isis/applib/value/Clob.java | 4 +++-
16 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java b/core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
index 2a1b891..4658b42 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java
@@ -31,7 +31,6 @@ package org.apache.isis.applib;
* As an alternative, consider simply annotating the view model class with {@link org.apache.isis.applib.annotation.ViewModel}.
* </p>
*
- * @see org.apache.isis.applib.DomainObjectContainer
*/
public abstract class AbstractViewModel implements ViewModel {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index 8f2f5bb..5d76466 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -60,15 +60,15 @@ import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
public class DomainObjectList {
// -- ui event classes
- public static class TitleUiEvent extends IsisApplibModule.TitleUiEvent<DomainObjectList>{}
- public static class IconUiEvent extends IsisApplibModule.IconUiEvent<DomainObjectList>{}
- public static class CssClassUiEvent extends IsisApplibModule.CssClassUiEvent<DomainObjectList>{}
+ public static class TitleUiEvent extends IsisApplibModule.TitleUiEvent<DomainObjectList>{ private static final long serialVersionUID = 1L; }
+ public static class IconUiEvent extends IsisApplibModule.IconUiEvent<DomainObjectList>{ private static final long serialVersionUID = 1L; }
+ public static class CssClassUiEvent extends IsisApplibModule.CssClassUiEvent<DomainObjectList>{ private static final long serialVersionUID = 1L; }
// -- domain event classes
- public static abstract class PropertyDomainEvent<T> extends IsisApplibModule.PropertyDomainEvent<DomainObjectList, T> { }
- public static abstract class CollectionDomainEvent<T> extends IsisApplibModule.CollectionDomainEvent<DomainObjectList, T> { }
- public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<DomainObjectList> { }
+ public static abstract class PropertyDomainEvent<T> extends IsisApplibModule.PropertyDomainEvent<DomainObjectList, T> { private static final long serialVersionUID = 1L; }
+ public static abstract class CollectionDomainEvent<T> extends IsisApplibModule.CollectionDomainEvent<DomainObjectList, T> { private static final long serialVersionUID = 1L; }
+ public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<DomainObjectList> { private static final long serialVersionUID = 1L; }
// -- constructors
@@ -96,7 +96,7 @@ public class DomainObjectList {
// -- property: elementObjectType
- public static class ElementObjectTypeDomainEvent extends PropertyDomainEvent<String> { }
+ public static class ElementObjectTypeDomainEvent extends PropertyDomainEvent<String> { private static final long serialVersionUID = 1L; }
private String elementObjectType;
@Property(
@@ -109,7 +109,7 @@ public class DomainObjectList {
// -- property: actionOwningType
- public static class ActionOwningTypeDomainEvent extends PropertyDomainEvent<String> { }
+ public static class ActionOwningTypeDomainEvent extends PropertyDomainEvent<String> { private static final long serialVersionUID = 1L; }
private String actionOwningType;
@@ -124,7 +124,7 @@ public class DomainObjectList {
// -- property: actionId
- public static class ActionIdDomainEvent extends PropertyDomainEvent<String> { }
+ public static class ActionIdDomainEvent extends PropertyDomainEvent<String> { private static final long serialVersionUID = 1L; }
private String actionId;
@@ -139,7 +139,7 @@ public class DomainObjectList {
// -- property: actionArguments
- public static class ActionArgumentsDomainEvent extends PropertyDomainEvent<String> { }
+ public static class ActionArgumentsDomainEvent extends PropertyDomainEvent<String> { private static final long serialVersionUID = 1L; }
private String actionArguments;
@@ -154,7 +154,7 @@ public class DomainObjectList {
// -- collection: objects
- public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { }
+ public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { private static final long serialVersionUID = 1L; }
@XmlJavaTypeAdapter(PersistentEntitiesAdapter.class)
private List<Object> objects = _Lists.newArrayList();
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
index f071dc7..5373ab4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
@@ -36,7 +36,10 @@ public class Dto_downloadXml {
this.dto = dto;
}
- public static class ActionDomainEvent extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXml> {}
+ public static class ActionDomainEvent
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXml> {
+ private static final long serialVersionUID = 1L;
+ }
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
index ed73593..4f66515 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
@@ -56,7 +56,10 @@ public class Dto_downloadXsd {
}
}
- public static class ActionDomainEvent extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXsd> {}
+ public static class ActionDomainEvent
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXsd> {
+ private static final long serialVersionUID = 1L;
+ }
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
index 7626f9d..43727fe 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
@@ -34,7 +34,7 @@ public class BookmarkHolder_lookup {
this.bookmarkHolder = bookmarkHolder;
}
- public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_lookup> {}
+ public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_lookup> { private static final long serialVersionUID = 1L; }
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
index f4051be..6941ff4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
@@ -34,7 +34,7 @@ public class BookmarkHolder_object {
this.bookmarkHolder = bookmarkHolder;
}
- public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_object> {}
+ public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_object> { private static final long serialVersionUID = 1L; }
@Action(
semantics = SemanticsOf.SAFE,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
index ca7d82b..5e71bb4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/spi/CommandService.java
@@ -16,8 +16,6 @@
*/
package org.apache.isis.applib.services.command.spi;
-import java.util.UUID;
-
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.command.Command;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
index d61e787..5db6a0e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
@@ -40,12 +40,15 @@ import org.apache.isis.applib.annotation.SemanticsOf;
)
public class ConfigurationServiceMenu {
- public static abstract class ActionDomainEvent
- extends IsisApplibModule.ActionDomainEvent<ConfigurationServiceMenu> { }
-
- // //////////////////////////////////////
-
- public static class AllConfigurationPropertiesDomainEvent extends ActionDomainEvent { }
+ public static abstract class ActionDomainEvent
+ extends IsisApplibModule.ActionDomainEvent<ConfigurationServiceMenu> {
+ private static final long serialVersionUID = 1L;
+ }
+
+ public static class AllConfigurationPropertiesDomainEvent
+ extends ActionDomainEvent {
+ private static final long serialVersionUID = 1L;
+ }
@Action(
domainEvent = AllConfigurationPropertiesDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java b/core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
index 0d28f4b..dbbddd3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/error/Ticket.java
@@ -33,7 +33,9 @@ import java.io.Serializable;
*/
public class Ticket implements Serializable {
- private final String reference;
+ private static final long serialVersionUID = 4900947111894407314L;
+
+ private final String reference;
private final String userMessage;
private final String details;
private final StackTracePolicy stackTracePolicy;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java b/core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
index 5c274a4..9347a55 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/hint/HintStore.java
@@ -27,7 +27,9 @@ public interface HintStore {
public static class BookmarkWithHintId extends Bookmark {
- private final String hintId;
+ private static final long serialVersionUID = -459431279406553124L;
+
+ private final String hintId;
public BookmarkWithHintId(final Bookmark bookmark, final String hintId) {
super(bookmark.toString());
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
index a7f5fc3..296227b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
@@ -54,7 +54,7 @@ public class HsqlDbManagerMenu {
}
- public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<HsqlDbManagerMenu>{}
+ public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<HsqlDbManagerMenu>{ private static final long serialVersionUID = 1L; }
@Action(
semantics = SemanticsOf.SAFE,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index cfa8604..0809b81 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -49,8 +49,7 @@ import org.apache.isis.applib.value.Clob;
)
public class MetaModelServicesMenu {
- public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<MetaModelServicesMenu> {
- }
+ public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<MetaModelServicesMenu> { private static final long serialVersionUID = 1L; }
private final MimeType mimeTypeTextCsv;
@@ -64,8 +63,7 @@ public class MetaModelServicesMenu {
// //////////////////////////////////////
- public static class DownloadMetaModelEvent extends ActionDomainEvent {
- }
+ public static class DownloadMetaModelEvent extends ActionDomainEvent { private static final long serialVersionUID = 1L; }
@Action(
domainEvent = DownloadMetaModelEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 83b3466..82e2020 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -20,18 +20,15 @@ package org.apache.isis.applib.services.publish;
import javax.annotation.PostConstruct;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.schema.chg.v1.ChangesDto;
import org.apache.isis.schema.ixn.v1.InteractionDto;
import org.apache.isis.schema.utils.ChangesDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@DomainService(
nature = NatureOfService.DOMAIN,
@@ -72,12 +69,12 @@ public class PublisherServiceLogging implements PublisherService {
LOG.debug(ChangesDtoUtils.toXml(changesDto));
}
-
- @javax.inject.Inject
- private CommandContext commandContext;
-
- @javax.inject.Inject
- private UserService userService;
+//TODO [ahuber] not used, remove?
+// @javax.inject.Inject
+// private CommandContext commandContext;
+//
+// @javax.inject.Inject
+// private UserService userService;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
index 8744aca..f81eb63 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
@@ -42,11 +42,8 @@ import org.apache.isis.applib.value.LocalResourcePath;
)
public class SwaggerServiceMenu {
- public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<SwaggerServiceMenu> {
- }
-
-
- public static class OpenSwaggerUiDomainEvent extends ActionDomainEvent {}
+ public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<SwaggerServiceMenu> { private static final long serialVersionUID = 1L; }
+ public static class OpenSwaggerUiDomainEvent extends ActionDomainEvent { private static final long serialVersionUID = 1L; }
@Action(
semantics = SemanticsOf.SAFE,
@@ -61,7 +58,7 @@ public class SwaggerServiceMenu {
return new LocalResourcePath("/swagger-ui/index.html");
}
- public static class OpenRestApiDomainEvent extends ActionDomainEvent {}
+ public static class OpenRestApiDomainEvent extends ActionDomainEvent { private static final long serialVersionUID = 1L; }
@Action(
semantics = SemanticsOf.SAFE,
@@ -76,7 +73,7 @@ public class SwaggerServiceMenu {
return new LocalResourcePath("/"+_Resource.getRestfulPathIfAny()+"/");
}
- public static class DownloadSwaggerSpecDomainEvent extends ActionDomainEvent {}
+ public static class DownloadSwaggerSpecDomainEvent extends ActionDomainEvent { private static final long serialVersionUID = 1L; }
@Action(
semantics = SemanticsOf.SAFE,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
index c7b520f..dd6e7d2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/UserDetails.java
@@ -25,7 +25,9 @@ import java.io.Serializable;
*/
public class UserDetails implements Serializable {
- private String username;
+ private static final long serialVersionUID = -7308102332765149525L;
+
+ private String username;
private String password;
private String confirmPassword;
private String emailAddress;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
index b846671..222371a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
@@ -28,7 +28,9 @@ import javax.activation.MimeTypeParseException;
public final class Clob implements NamedWithMimeType, Serializable {
- private final String name;
+ private static final long serialVersionUID = 8694189924062378527L;
+
+ private final String name;
private final MimeType mimeType;
private final CharSequence chars;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.