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/09/28 13:58:43 UTC
[isis] 01/07: ISIS-1976: 'pulling up': ContributeeMember2 and
MixedInMemeber2
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
commit f8358ab793a0813c9c62fd521541e48e6a0b6c3e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 28 09:43:47 2018 +0200
ISIS-1976: 'pulling up': ContributeeMember2 and MixedInMemeber2
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
...ctionInvocationFacetForDomainEventAbstract.java | 8 ++---
.../services/metamodel/DomainMemberDefault.java | 10 +++---
.../publishing/PublishingServiceInternal.java | 4 +--
.../specloader/specimpl/ContributeeMember.java | 22 ++++++++-----
.../specloader/specimpl/ContributeeMember2.java | 28 -----------------
.../specloader/specimpl/MixedInMember.java | 9 ++----
.../specloader/specimpl/MixedInMember2.java | 28 -----------------
.../specimpl/ObjectActionContributee.java | 2 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 2 +-
.../specimpl/OneToManyAssociationContributee.java | 2 +-
.../specimpl/OneToManyAssociationMixedIn.java | 12 ++++----
.../specimpl/OneToOneAssociationContributee.java | 4 +--
.../specimpl/OneToOneAssociationMixedIn.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 36 ----------------------
.../publish/PublishingServiceInternalDefault.java | 6 ++--
todo-deprecation-list.txt | 34 ++++++--------------
16 files changed, 50 insertions(+), 159 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 97c268e..c89e82a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -84,7 +84,7 @@ import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInter
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
+import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
public abstract class ActionInvocationFacetForDomainEventAbstract
@@ -348,11 +348,11 @@ implements ImperativeFacet {
final Stream<ObjectAction> objectActions = mixedInSpec.streamObjectActions(Contributed.INCLUDED);
final Optional<String> mixinName = objectActions
- .filter(action->action instanceof MixedInMember2)
- .map(action->(MixedInMember2) action)
+ .filter(action->action instanceof MixedInMember)
+ .map(action->(MixedInMember) action)
.filter(action->action.getMixinType() == onType)
.findAny()
- .map(MixedInMember2::getName);
+ .map(MixedInMember::getName);
if(mixinName.isPresent()) {
return mixinName.get();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
index 918b5b4..8264f64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/DomainMemberDefault.java
@@ -54,9 +54,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
-import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember2;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
-import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
public class DomainMemberDefault implements DomainMember {
@@ -117,8 +115,8 @@ public class DomainMemberDefault implements DomainMember {
}
@Override public String getContributedBy() {
- if(member instanceof ContributeeMember2) {
- final ObjectSpecification serviceContributedBy = ((ContributeeMember2) member).getServiceContributedBy();
+ if(member instanceof ContributeeMember) {
+ final ObjectSpecification serviceContributedBy = ((ContributeeMember) member).getServiceContributedBy();
return serviceContributedBy.getCorrespondingClass().getSimpleName();
}
return "";
@@ -129,8 +127,8 @@ public class DomainMemberDefault implements DomainMember {
}
@Override public String getMixin() {
- if(member instanceof MixedInMember2) {
- final MixedInMember2 mixedInMember = (MixedInMember2) this.member;
+ if(member instanceof MixedInMember) {
+ final MixedInMember mixedInMember = (MixedInMember) this.member;
final ObjectSpecification mixinType = mixedInMember.getMixinType();
return mixinType.getCorrespondingClass().getSimpleName();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/PublishingServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/PublishingServiceInternal.java
index bf9d14a..cd93f2f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/PublishingServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/publishing/PublishingServiceInternal.java
@@ -28,10 +28,10 @@ public interface PublishingServiceInternal {
@Programmatic
void publishAction(
- final Interaction.Execution execution);
+ final Interaction.Execution<?,?> execution);
@Programmatic
- void publishProperty(final Interaction.Execution execution);
+ void publishProperty(final Interaction.Execution<?,?> execution);
interface Block<T> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
index e083898..ccb7ee2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
@@ -18,6 +18,7 @@ package org.apache.isis.core.metamodel.specloader.specimpl;
import java.util.function.Predicate;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -29,7 +30,18 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
public interface ContributeeMember extends ObjectMember {
- class Predicates {
+ boolean isContributedBy(ObjectAction serviceAction);
+
+ /**
+ * Which parameter of the original contributed action was contributed to (zero-based).
+ */
+ int getContributeeParamPosition();
+
+ ObjectSpecification getServiceContributedBy();
+
+ // -- UTILITY
+
+ public static class Predicates {
private Predicates(){}
@@ -49,11 +61,5 @@ public interface ContributeeMember extends ObjectMember {
}
}
-
- boolean isContributedBy(ObjectAction serviceAction);
-
- /**
- * Which parameter of the original contributed action was contributed to (zero-based).
- */
- int getContributeeParamPosition();
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember2.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember2.java
deleted file mode 100644
index d15c978..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.metamodel.specloader.specimpl;
-
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-/**
- * Interface indicating an a contributed association or action.
- */
-public interface ContributeeMember2 extends ContributeeMember {
-
- ObjectSpecification getServiceContributedBy();
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
index 46795b1..892888f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
@@ -17,6 +17,7 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.annotation.Mixin;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
/**
@@ -28,12 +29,8 @@ public interface MixedInMember extends ObjectMember {
* The id if it was originally {@link Mixin#DEFAULT_METHOD_NAME the default member name}.
*/
String getOriginalId();
-
- // not actually required, as of yet
- // boolean isMixinOf(ObjectAction mixinAction);
-
- // not actually required, as of yet
- // ObjectSpecification getMixin();
+
+ ObjectSpecification getMixinType();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember2.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember2.java
deleted file mode 100644
index 01df8eb..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.metamodel.specloader.specimpl;
-
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-/**
- * Interface indicating an a mixed-in association or action.
- */
-public interface MixedInMember2 extends MixedInMember {
-
- ObjectSpecification getMixinType();
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 692c81d..624bc4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-public class ObjectActionContributee extends ObjectActionDefault implements ContributeeMember2 {
+public class ObjectActionContributee extends ObjectActionDefault implements ContributeeMember {
private final Object servicePojo;
private final ObjectActionDefault serviceAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index b424fec..9c90040 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInMember2 {
+public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInMember {
/**
* The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 2ec841b..2c288f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-public class OneToManyAssociationContributee extends OneToManyAssociationDefault implements ContributeeMember2 {
+public class OneToManyAssociationContributee extends OneToManyAssociationDefault implements ContributeeMember {
private final Object servicePojo;
private final ObjectAction serviceAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 12f7848..37a0adf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInter
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault implements MixedInMember2 {
+public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault implements MixedInMember {
/**
* The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
@@ -54,10 +54,10 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
*/
private final ObjectActionDefault mixinAction;
- /**
- * The domain object type being mixed in to (being supplemented).
- */
- private final ObjectSpecification mixedInType;
+// /**
+// * The domain object type being mixed in to (being supplemented).
+// */
+// private final ObjectSpecification mixedInType;
/**
@@ -92,7 +92,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
this.mixinType = mixinType;
this.mixinAction = mixinAction;
- this.mixedInType = mixedInType;
+// this.mixedInType = mixedInType;
//
// ensure the mixedIn collection cannot be modified, and derive its TypeOfFaccet
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index c61f218..2d7d598 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-public class OneToOneAssociationContributee extends OneToOneAssociationDefault implements ContributeeMember2 {
+public class OneToOneAssociationContributee extends OneToOneAssociationDefault implements ContributeeMember {
private final Object servicePojo;
private final ObjectAction serviceAction;
@@ -149,7 +149,7 @@ public class OneToOneAssociationContributee extends OneToOneAssociationDefault i
return getPersistenceSessionService().adapterFor(servicePojo);
}
- // -- Contributee2 impl - getServiceContributedBy()
+ // -- Contributee impl - getServiceContributedBy()
@Override
public ObjectSpecification getServiceContributedBy() {
return getServiceAdapter().getSpecification();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index 62eec42..bc069f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault implements MixedInMember2 {
+public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault implements MixedInMember {
/**
* The type of the mixin (providing the action), eg annotated with {@link org.apache.isis.applib.annotation.Mixin}.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index f9aa5f7..b9beb9b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -57,19 +57,6 @@ import org.apache.isis.schema.utils.CommonDtoUtils;
)
public class CommandDtoServiceInternalDefault implements CommandDtoServiceInternal {
- // private final MementoServiceDefault mementoService;
- //
- // public CommandDtoServiceInternalDefault() {
- // this(new MementoServiceDefault());
- // }
- //
- // CommandDtoServiceInternalDefault(MementoServiceDefault mementoService) {
- // this.mementoService = mementoService.withNoEncoding();
- // }
-
- // //////////////////////////////////////
-
-
@Programmatic
@PostConstruct
public void init(Map<String,String> props) {
@@ -77,29 +64,6 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
// //////////////////////////////////////
-
- // private ObjectSpecificationDefault getJavaSpecificationOfOwningClass(final Method method) {
- // return getJavaSpecification(method.getDeclaringClass());
- // }
-
- // private ObjectSpecificationDefault getJavaSpecification(final Class<?> cls) {
- // final ObjectSpecification objectSpec = getSpecification(cls);
- // if (!(objectSpec instanceof ObjectSpecificationDefault)) {
- // throw new UnsupportedOperationException(
- // "Only Java is supported "
- // + "(specification is '" + objectSpec.getClass().getCanonicalName() + "')");
- // }
- // return (ObjectSpecificationDefault) objectSpec;
- // }
-
- // private ObjectSpecification getSpecification(final Class<?> type) {
- // return specificationLoader.loadSpecification(type);
- // }
-
-
- // //////////////////////////////////////
-
-
@Override
public CommandDto asCommandDto(
final List<ObjectAdapter> targetAdapters,
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index c169db0..9be1747 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -113,8 +113,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
@Override
@Programmatic
- public void publishAction(
- final Interaction.Execution execution) {
+ public void publishAction(final Interaction.Execution<?,?> execution) {
if(suppress) {
return;
@@ -125,8 +124,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
@Override
- public void publishProperty(
- final Interaction.Execution execution) {
+ public void publishProperty(final Interaction.Execution<?,?> execution) {
if(suppress) {
return;
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 7c1e176..0de1715 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -1,9 +1,8 @@
for 2.0.0-M2
-
remove:
-- @MemberGroupLayout
+- [REMOVED] @MemberGroupLayout
- contributed domain services (use mixins instead)
- org.apache.isis.applib.clock
- Clock singleton
@@ -11,8 +10,8 @@ remove:
- AbstractFixtureSusa
- org.apache.isis.core.runtime.services.eventbus.adapter.EventBusImplementationForGuava
-- org.apache.isis.applib.services.memento (19 usages found)
- - MementoService.java - remove entire service (previously to support view models, but now @ViewModel and JAXB)
+- [DONE] org.apache.isis.applib.services.memento (19 usages found)
+ - [REMOVED] MementoService.java - remove entire service (previously to support view models, but now @ViewModel and JAXB)
to change:
- automatically wrap domain services (perhaps behind a config property)
@@ -24,8 +23,8 @@ support for legacy implementation of UrlEncodingService
inline paraname8 from incode platform
-remove isis-core-wicket-applib
-- contains only WicketDeveloperUtilitiesService, which is hidden anyway and seems to not be required.
+[DONE] remove isis-core-wicket-applib
+- [DONE] contains only WicketDeveloperUtilitiesService, which is hidden anyway and seems to not be required.
update .xsd for layout, make render optional and deprecated.
@@ -37,29 +36,14 @@ update .xsd for layout, make render optional and deprecated.
move ContentMappingServiceForCommandDto and ContentMappingServiceForCommandsDto from applib.conmap to applib.services.conmap.commands
-IsisContext:
-- remove this, causes a stack trace...
-
- // -- HELPER
-
- /**
- * TODO [andi-huber] not sure if required, initial idea was to force log4j
- * re-configuration on an undeploy/deploy cycle
- */
- static void resetLogging() {
- try {
- org.apache.log4j.BasicConfigurator.resetConfiguration();
- org.apache.log4j.Logger.getRootLogger().removeAllAppenders();
- } catch (Exception e) {
- // at least we tried
- }
- }
+[DONE] IsisContext:
+- [REMOVED] resetLogging()
TitleFacetViaAnnotation may not work if on a field, due to DN lazy loading.
-remove AbstractService from applib.
-remove AbstractViewModel from applib.
+[REMOVED] remove AbstractService from applib.
+[REMOVED] remove AbstractViewModel from applib.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~