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 2019/09/25 11:01:37 UTC
[isis] branch v2 updated: ISIS-2158: cleanup serializaion ids no
longer needed
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 50922ff ISIS-2158: cleanup serializaion ids no longer needed
50922ff is described below
commit 50922ffac8fda80d291c058d74613e88c48aac9e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 25 13:01:28 2019 +0200
ISIS-2158: cleanup serializaion ids no longer needed
- also mark NatureOfService deprecated options to be removed with
release 2.0.0
---
.../org/apache/isis/applib/IsisApplibModule.java | 28 ++++-----------
.../isis/applib/annotation/NatureOfService.java | 22 +++++-------
.../isis/applib/mixins/dto/Dto_downloadXml.java | 4 +--
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 4 +--
.../mixins/layout/Object_downloadLayoutXml.java | 4 +--
.../applib/mixins/layout/Object_openRestApi.java | 4 +--
.../mixins/layout/Object_rebuildMetamodel.java | 4 +--
.../metamodel/Object_downloadMetaModelXml.java | 4 +--
.../mixins/metamodel/Object_objectIdentifier.java | 4 +--
.../applib/mixins/metamodel/Object_objectType.java | 4 +--
.../services/bookmark/BookmarkHolder_lookup.java | 2 +-
.../services/bookmark/BookmarkHolder_object.java | 2 +-
.../services/confview/ConfigurationMenu.java | 8 ++---
.../QueryResultsCacheInternal.java | 42 +++++++++++-----------
14 files changed, 51 insertions(+), 85 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index ac8ec24..a4a7f85 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -26,40 +26,26 @@ public class IsisApplibModule {
// -- UI EVENT CLASSES
public abstract static class TitleUiEvent<S>
- extends org.apache.isis.applib.events.ui.TitleUiEvent<S> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.ui.TitleUiEvent<S> {}
public abstract static class IconUiEvent<S>
- extends org.apache.isis.applib.events.ui.IconUiEvent<S> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.ui.IconUiEvent<S> {}
public abstract static class CssClassUiEvent<S>
- extends org.apache.isis.applib.events.ui.CssClassUiEvent<S> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.ui.CssClassUiEvent<S> {}
public abstract static class LayoutUiEvent<S>
- extends org.apache.isis.applib.events.ui.LayoutUiEvent<S> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.ui.LayoutUiEvent<S> {}
// -- DOMAIN EVENT CLASSES
public abstract static class ActionDomainEvent<S>
- extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
public abstract static class CollectionDomainEvent<S,T>
- extends org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {}
public abstract static class PropertyDomainEvent<S,T>
- extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
index 5ec926e..e946503 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
@@ -55,25 +55,25 @@ public enum NatureOfService {
// -- DEPRECATIONS
/**
- * @deprecated was renamed, use {@link #REST} instead
- * @apiNote since 2.0 used as synonym for {@link #REST}
+ * @deprecated was renamed, use {@link #REST} instead; will be removed with 2.0.0 release!
+ * @apiNote temporarily used as synonym for {@link #REST}
*/
@Deprecated
VIEW_REST_ONLY,
/**
- * @deprecated was removed, use {@link #VIEW} instead
- * @apiNote since 2.0 used as synonym for {@link #VIEW}
+ * @deprecated was removed, use {@link #VIEW} instead; will be removed with 2.0.0 release!
+ * @apiNote temporarily used as synonym for {@link #VIEW}
*/
@Deprecated
VIEW_MENU_ONLY,
/**
- * @deprecated was removed, contributing actions are simply ignored
+ * @deprecated was removed, contributing actions are simply ignored; will be removed with 2.0.0 release!
* <p>
* Instead, for each {@code Action} write a mixin class.
* see {@link Mixin}
- * @apiNote since 2.0 used as synonym for {@link #DOMAIN}
+ * @apiNote temporarily used as synonym for {@link #DOMAIN}
*/
@Deprecated
VIEW_CONTRIBUTIONS_ONLY,
@@ -98,9 +98,10 @@ public enum NatureOfService {
}
/**
+ * Whether a service contributes no actions at all.
* @see {@link NatureOfService#DOMAIN}
*/
- public boolean isDomain() {
+ public boolean isProgrammatic() {
return this == DOMAIN || this == VIEW_CONTRIBUTIONS_ONLY;
}
@@ -113,12 +114,7 @@ public enum NatureOfService {
return isRestOnly() || isView();
}
- /**
- * Whether a service contributes no actions at all.
- */
- public boolean isProgrammatic() {
- return isDomain();
- }
+
}
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 009d13f..5f737db 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
@@ -42,9 +42,7 @@ public class Dto_downloadXml {
private final Dto holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXml> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXml> {}
@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 aa70c38..1da5db6 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
@@ -46,9 +46,7 @@ public class Dto_downloadXsd {
private final Dto holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXsd> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Dto_downloadXsd> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
index 877316d..49873d9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
@@ -42,9 +42,7 @@ public class Object_downloadLayoutXml {
private final Object holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_downloadLayoutXml> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_downloadLayoutXml> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
index 524b4d6..62e4740 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_openRestApi.java
@@ -43,9 +43,7 @@ public class Object_openRestApi {
private final Object holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_openRestApi> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_openRestApi> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
index 2011854..2a9af94 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_rebuildMetamodel.java
@@ -40,9 +40,7 @@ public class Object_rebuildMetamodel {
private final Object holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_rebuildMetamodel> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_rebuildMetamodel> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
index 1f1bc9b..1694747 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetaModelXml.java
@@ -45,8 +45,8 @@ public class Object_downloadMetaModelXml {
private final Object holder;
- public static class ActionDomainEvent extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_downloadMetaModelXml> {
- private static final long serialVersionUID = 1L;}
+ public static class ActionDomainEvent
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_downloadMetaModelXml> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
index c5573ca..b456092 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
@@ -41,9 +41,7 @@ public class Object_objectIdentifier {
private final Object holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_objectIdentifier> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_objectIdentifier> {}
@Action(
domainEvent = ActionDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
index 44fe4fe..73e8edb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
@@ -41,9 +41,7 @@ public class Object_objectType {
private final Object holder;
public static class ActionDomainEvent
- extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_objectType> {
- private static final long serialVersionUID = 1L;
- }
+ extends org.apache.isis.applib.IsisApplibModule.ActionDomainEvent<Object_objectType> {}
@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 ad2a26c..c4f0ec4 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
@@ -37,7 +37,7 @@ public class BookmarkHolder_lookup {
this.bookmarkHolder = bookmarkHolder;
}
- public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_lookup> { private static final long serialVersionUID = 1L; }
+ public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_lookup> {}
@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 a2d9f8a..189e209 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
@@ -37,7 +37,7 @@ public class BookmarkHolder_object {
this.bookmarkHolder = bookmarkHolder;
}
- public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_object> { private static final long serialVersionUID = 1L; }
+ public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<BookmarkHolder_object> { }
@Action(
semantics = SemanticsOf.SAFE,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
index be01e3a..6fefb67 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
@@ -42,14 +42,10 @@ import org.apache.isis.applib.annotation.SemanticsOf;
public class ConfigurationMenu {
public static abstract class ActionDomainEvent
- extends IsisApplibModule.ActionDomainEvent<ConfigurationMenu> {
- private static final long serialVersionUID = 1L;
- }
+ extends IsisApplibModule.ActionDomainEvent<ConfigurationMenu> {}
public static class AllConfigurationPropertiesDomainEvent
- extends ActionDomainEvent {
- private static final long serialVersionUID = 1L;
- }
+ extends ActionDomainEvent {}
@Action(
domainEvent = AllConfigurationPropertiesDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
index 91e9c4f..99d8870 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheInternal.java
@@ -67,16 +67,17 @@ public class QueryResultsCacheInternal implements QueryResultsCache, WithTransac
return executeWithCaching(callable, cacheKey);
}
- private <T> T execute(final Callable<T> callable, final Key cacheKey) {
- if(isIgnoreCache()) {
- try {
- return callable.call();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- return executeWithCaching(callable, cacheKey);
- }
+//XXX not used
+// private <T> T execute(final Callable<T> callable, final Key cacheKey) {
+// if(isIgnoreCache()) {
+// try {
+// return callable.call();
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
+// return executeWithCaching(callable, cacheKey);
+// }
private <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey) {
try {
@@ -103,16 +104,17 @@ public class QueryResultsCacheInternal implements QueryResultsCache, WithTransac
}
}
- private <T> Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
- return get(new Key(callingClass, methodName, keys));
- }
-
- @SuppressWarnings("unchecked")
- private <T> Value<T> get(final Key cacheKey) {
- Value<T> value = (Value<T>) cache.get(cacheKey);
- logHitOrMiss(cacheKey, value);
- return value;
- }
+//XXX not used
+// private <T> Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
+// return get(new Key(callingClass, methodName, keys));
+// }
+//
+// @SuppressWarnings("unchecked")
+// private <T> Value<T> get(final Key cacheKey) {
+// Value<T> value = (Value<T>) cache.get(cacheKey);
+// logHitOrMiss(cacheKey, value);
+// return value;
+// }
private <T> void put(final Key cacheKey, final T result) {
log.debug("PUT: {}", cacheKey);