This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b19e6e5dd9799d8247223b50ddc574628e244b3
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Wed Feb 14 13:09:46 2018 +0000
ISIS-1810: fixes compile issues arising from merge
---
.../_rgsvc_metadata-api_MetamodelService.adoc | 10 +++----
.../apache/isis/applib/annotation/InvokeOn.java | 10 -------
.../command/CommandFacetForActionAnnotation.java | 2 +-
.../command/CommandFacetForPropertyAnnotation.java | 2 +-
...onParameterDefaultsAndChoicesPostProcessor.java | 5 ++--
.../MetaModelValidatorToCheckModuleExtent.java | 6 ++---
.../runtime/headless/IsisSystemBootstrapper.java | 4 +--
.../background/CommandExecutorServiceDefault.java | 31 +++++++++++-----------
.../collection/AssociatedWithActionsHelper.java | 4 +--
9 files changed, 30 insertions(+), 44 deletions(-)
diff --git
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
index 361e468..243fe2d 100644
---
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
+++
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
@@ -1,12 +1,12 @@
[[_rgsvc_metadata-api_MetamodelService]]
-= `MetaModelService5`
+= `MetaModelService`
:Notice: 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 ag [...]
:_basedir: ../../
:_imagesdir: images/
-The `MetaModelService5` service (and its various supertypes) provides access
to a number of aspects of Apache Isis' internal metamodel.
+The `MetaModelService` service provides access to a number of aspects of
Apache Isis' internal metamodel.
[[_rgsvc_metadata-api_MetamodelService_api]]
@@ -17,13 +17,12 @@ The API defined by the service is:
[source,java]
----
-public interface MetaModelService4 {
+public interface MetaModelService {
Class<?> fromObjectType(String objectType); // <1>
String toObjectType(Class<?> domainType); // <2>
void rebuild(Class<?> domainType); // <3>
List<DomainMember> export(); // <4>
- // introduced in MetaModelService2
enum Sort { // <5>
VIEW_MODEL, JDO_ENTITY, DOMAIN_SERVICE,
MIXIN, VALUE, COLLECTION, UNKNOWN;
@@ -35,15 +34,12 @@ public interface MetaModelService4 {
Sort sortOf(Class<?> domainType); // <6>
Sort sortOf(Bookmark bookmark);
- // introduced in MetaModelService3
Sort sortOf(Class<?> domainType, Mode mode);
Sort sortOf(Bookmark bookmark, Mode mode);
- // introduced in MetaModelService4
AppManifest getAppManifest(); // <7>
AppManifest2 getAppManifest2();
- // introduced in MetaModelService5
CommandDtoProcessor commandDtoProcessorFor( // <8>
String memberIdentifier);
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
index 72dfed6..8f6f4de 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
@@ -63,14 +63,4 @@ public enum InvokeOn {
@Deprecated
NOT_SPECIFIED;
- @Deprecated
- public static Bulk.AppliesTo from(final InvokeOn invokeOn) {
- if(invokeOn == null) return null;
- if(invokeOn == OBJECT_AND_COLLECTION) return
Bulk.AppliesTo.BULK_AND_REGULAR;
- if(invokeOn == COLLECTION_ONLY) return Bulk.AppliesTo.BULK_ONLY;
- if(invokeOn == OBJECT_ONLY) return Bulk.AppliesTo.REGULAR_ONLY;
- // shouldn't happen
- throw new IllegalArgumentException("Unrecognized appliesTo: " +
invokeOn);
- }
-
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index 85577a8..c873ac4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -90,7 +90,7 @@ public class CommandFacetForActionAnnotation extends
CommandFacetAbstract {
}
// else fall through
default:
- return CommandFacetFromConfiguration.create(holder);
+ return CommandFacetFromConfiguration.create(holder,
servicesInjector);
}
});
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index dee1ed2..11f5820 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -78,7 +78,7 @@ public class CommandFacetForPropertyAnnotation extends
CommandFacetAbstract {
case NONE:
return null;
default:
- return CommandFacetFromConfiguration.create(holder);
+ return CommandFacetFromConfiguration.create(holder,
servicesInjector);
}
});
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
index 75e177c..bd8a2a3 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
@@ -21,11 +21,11 @@ package org.apache.isis.core.metamodel.postprocessors.param;
import java.util.List;
+import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Filters;
import
org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@@ -62,7 +62,8 @@ public class
ActionCollectionParameterDefaultsAndChoicesPostProcessor implements
// all the actions of this type
final List<ActionType> actionTypes = inferActionTypes();
- List<ObjectAction> objectActions =
objectSpecification.getObjectActions(actionTypes, Contributed.INCLUDED,
Filters.<ObjectAction>any());
+ List<ObjectAction> objectActions =
objectSpecification.getObjectActions(actionTypes, Contributed.INCLUDED,
+ Predicates.alwaysTrue());
// and all the collections of this type
final List<OneToManyAssociation> oneToManyAssociations =
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
index f41e16a..8e193aa 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
@@ -32,7 +32,7 @@ import com.google.common.collect.Maps;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.AppManifest2;
import org.apache.isis.applib.Module;
-import org.apache.isis.applib.services.metamodel.MetaModelService4;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class MetaModelValidatorToCheckModuleExtent extends
MetaModelValidatorComposite {
@@ -54,7 +54,7 @@ public class MetaModelValidatorToCheckModuleExtent extends
MetaModelValidatorCom
}
AppManifest2 appManifest = specificationLoader.getServicesInjector()
- .lookupService(MetaModelService4.class).getAppManifest2();
+ .lookupService(MetaModelService.class).getAppManifest2();
if(appManifest == null) {
return;
}
@@ -101,7 +101,7 @@ public class MetaModelValidatorToCheckModuleExtent extends
MetaModelValidatorCom
public void summarize(final ValidationFailures validationFailures)
{
AppManifest2 appManifest =
specificationLoader.getServicesInjector()
-
.lookupService(MetaModelService4.class).getAppManifest2();
+
.lookupService(MetaModelService.class).getAppManifest2();
if(appManifest == null) {
return;
}
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
index 3156b92..a6847c8 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
@@ -90,8 +90,8 @@ public class IsisSystemBootstrapper {
* Expects a transaction to have been started
*/
public void setupModuleRefData() {
- MetaModelService metaModelService4 =
lookupService(MetaModelService.class);
- FixtureScript refDataSetupFixture =
metaModelService4.getAppManifest2().getRefDataSetupFixture();
+ MetaModelService metaModelService =
lookupService(MetaModelService.class);
+ FixtureScript refDataSetupFixture =
metaModelService.getAppManifest2().getRefDataSetupFixture();
runFixtureScript(refDataSetupFixture);
}
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
index c27f847..eea4bf6 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
@@ -19,10 +19,9 @@ package org.apache.isis.core.runtime.services.background;
import java.sql.Timestamp;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
-import com.google.common.base.Function;
import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
@@ -32,7 +31,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
@@ -41,7 +40,8 @@ import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.applib.services.xactn.Transaction2;
+import org.apache.isis.applib.services.xactn.Transaction;
+import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -118,7 +118,7 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
}
private void ensureTransactionInProgress() {
- final Transaction2 currentTransaction =
transactionService.currentTransaction();
+ final Transaction currentTransaction =
transactionService.currentTransaction();
if(currentTransaction == null) {
throw new IllegalStateException("No current transaction");
}
@@ -133,7 +133,7 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
// setup for us by IsisTransactionManager; will have the transactionId
of the backgroundCommand
final Interaction interaction = interactionContext.getInteraction();
- org.apache.isis.applib.annotation.Command.ExecuteIn executeIn =
commandWithDto.getExecuteIn();
+ org.apache.isis.applib.annotation.CommandExecuteIn executeIn =
commandWithDto.getExecuteIn();
LOG.info("Executing: {} {} {} {}", executeIn,
commandWithDto.getMemberIdentifier(), commandWithDto.getTimestamp(),
commandWithDto.getTransactionId());
@@ -227,7 +227,7 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
// committing the xactn might also trigger an exception
try {
-
transactionService.nextTransaction(TransactionService3.Policy.ALWAYS);
+
transactionService.nextTransaction(TransactionService.Policy.ALWAYS);
} catch(RuntimeException ex) {
LOG.warn("Exception when committing : {} {}", executeIn,
commandWithDto.getMemberIdentifier(), ex);
@@ -325,13 +325,12 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
private ObjectAdapter[] argAdaptersFor(final ActionDto actionDto) {
final List<ParamDto> params = paramDtosFrom(actionDto);
final List<ObjectAdapter> args = Lists.newArrayList(
- Iterables.transform(params, new Function<ParamDto,
ObjectAdapter>() {
- @Override
- public ObjectAdapter apply(final ParamDto paramDto) {
- final Object arg = CommonDtoUtils.getValue(paramDto);
- return adapterFor(arg);
- }
- })
+ params.stream()
+ .map(paramDto -> {
+ final Object arg =
CommonDtoUtils.getValue(paramDto);
+ return adapterFor(arg);
+ })
+ .collect(Collectors.toList())
);
return args.toArray(new ObjectAdapter[]{});
}
@@ -409,7 +408,7 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
// //////////////////////////////////////
@javax.inject.Inject
- BookmarkService2 bookmarkService;
+ BookmarkService bookmarkService;
@javax.inject.Inject
InteractionContext interactionContext;
@@ -421,7 +420,7 @@ public class CommandExecutorServiceDefault implements
CommandExecutorService {
ClockService clockService;
@javax.inject.Inject
- TransactionService3 transactionService;
+ TransactionService transactionService;
@javax.inject.Inject
CommandContext commandContext;
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index 65bf609..7a32b26 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
+import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -56,7 +56,7 @@ public class AssociatedWithActionsHelper implements
Serializable {
final ObjectSpecification objectSpec =
getObjectSpecification(isisSessionFactory);
final List<ActionType> actionTypes =
inferActionTypes(isisSessionFactory);
- List<ObjectAction> objectActions =
objectSpec.getObjectActions(actionTypes, Contributed.INCLUDED,
Filters.<ObjectAction>any());
+ List<ObjectAction> objectActions =
objectSpec.getObjectActions(actionTypes, Contributed.INCLUDED,
Predicates.alwaysTrue());
return FluentIterable.from(objectActions)
.filter(ObjectAction.Predicates.associatedWithAndWithCollectionParameterFor(
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
