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/08/31 15:31:35 UTC
[isis] branch master updated (51ab3e1 -> 8619eb6)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 51ab3e1 ISIS-1895: optimizations and cleanup
new ad89516 ISIS-1895: optimizing peeking
new 8663510 ISIS-1895: Remove ISIS_SESSION_FACTORY from ServletContext
new 3c80e9a ISIS-1976: remove some deprecated features
new be08fd8 ISIS-1976: don't interfere with garbage collection
new 5078ac5 ISIS-1976: further remove deprecated features
new fdbc57b ISIS-1976: remove deprecated ObjectSpecification.getTitle(ObjectAdapter)
new e7cfe6d ISIS-1976: remove deprecated ObjectAssociationContainer.getAssociations(Predicate)
new 9409b1c ISIS-1976: remove deprecated ObjectSpecification.getCssClass()
new 8619eb6 ISIS-1976: minor cleanup
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/core/metamodel/adapter/ObjectAdapter.java | 15 ++--------
...ctionInvocationFacetForDomainEventAbstract.java | 17 +++++++----
.../javautilcollection/JavaCollectionFacet.java | 3 +-
.../services/title/TitleServiceDefault.java | 2 +-
.../core/metamodel/spec/ObjectAdapterUtils.java | 2 --
.../core/metamodel/spec/ObjectSpecification.java | 28 ------------------
.../spec/feature/ObjectAssociationContainer.java | 7 -----
.../metamodel/specloader/SpecificationLoader.java | 33 +--------------------
.../specloader/specimpl/ObjectActionDefault.java | 4 +--
.../specimpl/ObjectSpecificationAbstract.java | 29 ++----------------
.../ObjectSpecificationOnStandaloneList.java | 10 ++-----
.../testspec/ObjectSpecificationStub.java | 16 ----------
.../runtime/persistence/adapter/PojoAdapter.java | 10 +++----
.../isis/core/webapp/IsisWebAppBootstrapper.java | 34 ++++------------------
.../isis/core/webapp/IsisWebAppConfigProvider.java | 10 ++++++-
.../apache/isis/core/webapp/WebAppConstants.java | 9 +-----
.../auth/AuthenticationSessionStrategyDefault.java | 9 +++---
.../restfulobjects/server/ResourceContext.java | 10 +++----
.../wicket/viewer/IsisWicketApplication.java | 5 ----
19 files changed, 54 insertions(+), 199 deletions(-)
[isis] 06/09: ISIS-1976: remove deprecated
ObjectSpecification.getTitle(ObjectAdapter)
Posted by ah...@apache.org.
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 fdbc57b780804bbce647866633aebb2f000477b7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 17:05:45 2018 +0200
ISIS-1976: remove deprecated ObjectSpecification.getTitle(ObjectAdapter)
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../services/title/TitleServiceDefault.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 22 +++++++++++-----------
.../specimpl/ObjectSpecificationAbstract.java | 13 ++-----------
.../ObjectSpecificationOnStandaloneList.java | 10 +++-------
.../testspec/ObjectSpecificationStub.java | 5 -----
5 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index 61ffabc..d3abc3e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -39,7 +39,7 @@ public class TitleServiceDefault implements TitleService {
final ObjectAdapter objectAdapter = adapterManager.adapterFor(unwrapped(domainObject));
final boolean destroyed = objectAdapter.isDestroyed();
if(!destroyed) {
- return objectAdapter.getSpecification().getTitle(objectAdapter);
+ return objectAdapter.getSpecification().getTitle(null, objectAdapter);
} else {
return "[DELETED]";
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index ee04ba2..3931078 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -171,17 +171,17 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
*/
String getHelp();
- /**
- * Returns the title string for the specified object.
- *
- * <p>
- * Corresponds to the {@link TitleFacet#title(ObjectAdapter)} ) value} of
- * {@link TitleFacet}; is not necessarily immutable.
- *
- * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter)}
- */
- @Deprecated
- String getTitle(ObjectAdapter adapter);
+// /**
+// * Returns the title string for the specified object.
+// *
+// * <p>
+// * Corresponds to the {@link TitleFacet#title(ObjectAdapter)} ) value} of
+// * {@link TitleFacet}; is not necessarily immutable.
+// *
+// * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter)}
+// */
+// @Deprecated
+// String getTitle(ObjectAdapter adapter);
/**
* Returns the title to display of target adapter, rendered within the context
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index b798abd..bbce94c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -338,8 +339,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
}
-
-
// -- Introspection (part 2)
public void updateFromFacetValues() {
@@ -350,23 +349,15 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
cssClassFacet = getFacet(CssClassFacet.class);
}
-
-
-
// -- Title, Icon
@Override
- public String getTitle(final ObjectAdapter targetAdapter) {
- return getTitle(null, targetAdapter);
- }
-
- @Override
public String getTitle(
ObjectAdapter contextAdapterIfAny,
ObjectAdapter targetAdapter) {
if (titleFacet != null) {
final String titleString = titleFacet.title(contextAdapterIfAny, targetAdapter);
- if (titleString != null && !titleString.equals("")) {
+ if (!_Strings.isEmpty(titleString)) {
return titleString;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index 7ff4e13..2dc063d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -114,13 +114,11 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
return null;
}
-
-
// -- Title and Icon
-
+
@Override
- public String getTitle(final ObjectAdapter object) {
- return ((FreeStandingList) object.getObject()).titleString();
+ public String getTitle(ObjectAdapter contextAdapterIfAny, ObjectAdapter targetAdapter) {
+ return ((FreeStandingList) targetAdapter.getObject()).titleString();
}
@Override
@@ -128,8 +126,6 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
return ICON_NAME;
}
-
-
// -- Object Actions
/**
* Review: is it necessary to override for this subclass?
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 6eb9c84..c5ef9e3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -255,11 +255,6 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public String getTitle(final ObjectAdapter targetAdapter) {
- return getTitle(null, targetAdapter);
- }
-
- @Override
public String getTitle(
final ObjectAdapter contextAdapterIfAny,
final ObjectAdapter targetAdapter) {
[isis] 05/09: ISIS-1976: further remove deprecated features
Posted by ah...@apache.org.
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 5078ac5b48dea8d19d4252befd0a375506381704
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 16:54:55 2018 +0200
ISIS-1976: further remove deprecated features
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../org/apache/isis/core/metamodel/adapter/ObjectAdapter.java | 2 +-
.../org/apache/isis/core/metamodel/spec/ObjectSpecification.java | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 3aa0365..ef7cd6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -31,8 +31,8 @@ import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.MethodUtil;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index f5fa004..ee04ba2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -68,15 +68,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
public final static List<ObjectSpecification> EMPTY_LIST = Collections.emptyList();
- @Deprecated
- public final static Function<ObjectSpecification, String> FUNCTION_FULLY_QUALIFIED_CLASS_NAME = Functions.FULL_IDENTIFIER;
-
- @Deprecated
- public final static Comparator<ObjectSpecification> COMPARATOR_FULLY_QUALIFIED_CLASS_NAME = Comparators.FULLY_QUALIFIED_CLASS_NAME;
-
- @Deprecated
- public final static Comparator<ObjectSpecification> COMPARATOR_SHORT_IDENTIFIER_IGNORE_CASE = Comparators.SHORT_IDENTIFIER_IGNORE_CASE;
-
ObjectMember getMember(String memberId);
class Comparators{
[isis] 04/09: ISIS-1976: don't interfere with garbage collection
Posted by ah...@apache.org.
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 be08fd82a5928c8590127e89dccdb7d9d992bed3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 16:43:07 2018 +0200
ISIS-1976: don't interfere with garbage collection
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../metamodel/specloader/SpecificationLoader.java | 33 +---------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index b4e4784..90e1c2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -22,8 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ws.rs.HEAD;
-
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -84,7 +82,7 @@ import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
* </p>
*
*/
-public class SpecificationLoader implements ApplicationScopedComponent {
+public final class SpecificationLoader implements ApplicationScopedComponent {
private final static Logger LOG = LoggerFactory.getLogger(SpecificationLoader.class);
@@ -117,16 +115,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
this.postProcessor = new PostProcessor(programmingModel, servicesInjector);
}
- @Override
- protected void finalize() throws Throwable {
- super.finalize();
- LOG.info("finalizing reflector factory", this);
- }
-
-
-
-
-
// -- init
private boolean initialized = false;
@@ -195,9 +183,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return initialized;
}
-
-
-
// -- shutdown
@Programmatic
@@ -209,8 +194,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
cache.clear();
}
-
-
// -- invalidateCache
@Programmatic
@@ -245,8 +228,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
cache.recache(newSpec);
}
-
-
// -- validation
private ValidationFailures validationFailures;
@@ -268,9 +249,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return validationFailures;
}
-
-
-
// -- loadSpecification, loadSpecifications
/**
@@ -493,8 +471,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return cache.allSpecifications();
}
-
-
// -- getServiceClasses, isServiceClass
@Programmatic
@@ -515,8 +491,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return this.servicesInjector.isRegisteredService(cls);
}
-
-
// -- loaded
/**
* Whether this class has been loaded.
@@ -534,8 +508,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return cache.get(fullyQualifiedClassName) != null;
}
-
-
// -- lookupBySpecId
@Programmatic
public ObjectSpecification lookupBySpecId(ObjectSpecId objectSpecId) {
@@ -547,9 +519,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
return objectSpecification;
}
-
-
-
@Programmatic
public IsisConfiguration getConfiguration() {
return configuration;
[isis] 02/09: ISIS-1895: Remove ISIS_SESSION_FACTORY from
ServletContext
Posted by ah...@apache.org.
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 866351031ecd746b5c372200d5085c20bf7b67cb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 15:56:48 2018 +0200
ISIS-1895: Remove ISIS_SESSION_FACTORY from ServletContext
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../isis/core/webapp/IsisWebAppBootstrapper.java | 28 ++--------------------
.../isis/core/webapp/IsisWebAppConfigProvider.java | 10 +++++++-
.../apache/isis/core/webapp/WebAppConstants.java | 9 +------
.../auth/AuthenticationSessionStrategyDefault.java | 9 +++----
.../restfulobjects/server/ResourceContext.java | 10 ++++----
.../wicket/viewer/IsisWicketApplication.java | 5 ----
6 files changed, 21 insertions(+), 50 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index f0f2c67..e93ef38 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -31,6 +31,7 @@ import com.google.inject.Injector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
@@ -39,7 +40,6 @@ import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.SystemConstants;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
/**
@@ -56,18 +56,6 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
- @com.google.inject.Inject
- private IsisSessionFactory isisSessionFactory;
-
-
- /**
- * Convenience for servlets that need to obtain the {@link IsisSessionFactoryBuilder}.
- */
- public static IsisSessionFactoryBuilder getSystemBoundTo(final ServletContext servletContext) {
- final Object system = servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
- return (IsisSessionFactoryBuilder) system;
- }
-
// /////////////////////////////////////////////////////
// Initialization
// /////////////////////////////////////////////////////
@@ -87,17 +75,12 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final DeploymentType deploymentType = determineDeploymentType(servletContext, isisConfigurationBuilder);
addConfigurationResourcesForDeploymentType(isisConfigurationBuilder, deploymentType);
- final String webappDir = servletContext.getRealPath("/");
- isisConfigurationBuilder.add(WebAppConstants.WEB_APP_DIR, webappDir);
-
final IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
final IsisInjectModule isisModule = new IsisInjectModule(deploymentCategory, isisConfiguration);
final Injector injector = Guice.createInjector(isisModule);
injector.injectMembers(this);
- servletContext.setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, isisSessionFactory);
-
} catch (final RuntimeException e) {
LOG.error("startup failed", e);
throw e;
@@ -160,16 +143,9 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
@Override
public void contextDestroyed(final ServletContextEvent ev) {
LOG.info("server shutting down");
- final ServletContext servletContext = ev.getServletContext();
-
try {
- final IsisSessionFactory isisSessionFactory = (IsisSessionFactory) servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
- if (isisSessionFactory != null) {
- LOG.info("calling system shutdown");
- isisSessionFactory.destroyServicesAndShutdown();
- }
+ _Context.clear();
} finally {
- servletContext.removeAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
LOG.info("server shut down");
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppConfigProvider.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppConfigProvider.java
index 5b22087..0e7b8bc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppConfigProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppConfigProvider.java
@@ -77,6 +77,7 @@ public class IsisWebAppConfigProvider {
protected IsisConfigurationBuilder newIsisConfigurationBuilder(final ServletContext servletContext) {
IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilder();
isisConfigurationBuilder.primeWith(new OptionHandlerInitParameters(servletContext));
+ addServletContextConstants(servletContext, isisConfigurationBuilder);
addResourceStreamSources(servletContext, isisConfigurationBuilder);
return isisConfigurationBuilder;
}
@@ -120,11 +121,18 @@ public class IsisWebAppConfigProvider {
// -- HELPER
+ private static void addServletContextConstants(
+ final ServletContext servletContext,
+ final IsisConfigurationBuilder isisConfigurationBuilder) {
+
+ final String webappDir = servletContext.getRealPath("/");
+ isisConfigurationBuilder.add(WebAppConstants.WEB_APP_DIR, webappDir);
+ }
+
private static void addResourceStreamSources(
final ServletContext servletContext,
final IsisConfigurationBuilder isisConfigurationBuilder) {
-
// will load either from WEB-INF, from the class-path or from config directory.
final String configLocation = servletContext.getInitParameter(WebAppConstants.CONFIG_DIR_PARAM);
if ( configLocation != null ) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
index 3e24bc0..c22d4f4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.webapp;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
public final class WebAppConstants {
@@ -44,12 +43,6 @@ public final class WebAppConstants {
public static final String CONFIGURATION_BUILDER_KEY = "isis.configurationBuilder";
/**
- * Key under which the {@link IsisSessionFactoryBuilder} is bound as a servlet context
- * attribute ( <tt>ServletContext#getAttribute(String)</tt>).
- */
- public final static String ISIS_SESSION_FACTORY = WebAppConstants.class.getPackage().getName() + ".isisSessionFactory";
-
- /**
* Key under which the {@link AuthenticationSession} is bound as a session
* attribute ( <tt>HttpSession#getAttribute(String)</tt>).
*/
@@ -69,7 +62,7 @@ public final class WebAppConstants {
/**
* Servlet context parameter name used to specify the location for property file
- * overloads. Property files in this location take precendence over property files
+ * overloads. Property files in this location take precedence over property files
* in other locations. Since the ResourceStreamSourceComposite is being used
* property files from various locations are merged together. So only overloaded
* properties (entries in the file) need to present.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 9f57a16..1569530 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.webapp.auth;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -29,6 +28,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.WebAppConstants;
@@ -70,9 +70,10 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
}
// otherwise, look for LogonFixture and try to authenticate
- final ServletContext servletContext = getServletContext(httpServletRequest);
- final IsisSessionFactory sessionFactory = (IsisSessionFactory) servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
- if (sessionFactory == null) {
+ final IsisSessionFactory sessionFactory;
+ try {
+ sessionFactory = IsisContext.getSessionFactory();
+ } catch (Exception e) {
// not expected to happen (is set up either by IsisWebAppBootstrapper or in IsisWicketApplication).
return null;
}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index a55b45d..b7ae186 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
@@ -46,9 +45,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
@@ -64,7 +63,7 @@ public class ResourceContext implements RendererContext6 {
private final HttpHeaders httpHeaders;
private final UriInfo uriInfo;
private final Request request;
- private final Providers providers;
+ //not used ... private final Providers providers;
private final HttpServletRequest httpServletRequest;
private final HttpServletResponse httpServletResponse;
private final SecurityContext securityContext;
@@ -102,7 +101,7 @@ public class ResourceContext implements RendererContext6 {
final InteractionInitiatedBy interactionInitiatedBy) {
this.httpHeaders = httpHeaders;
- this.providers = providers;
+ //not used ... this.providers = providers;
this.uriInfo = uriInfo;
this.request = request;
this.where = where;
@@ -113,8 +112,7 @@ public class ResourceContext implements RendererContext6 {
this.securityContext = securityContext;
- final ServletContext servletContext = httpServletRequest.getServletContext();
- final IsisSessionFactory isisSessionFactory = (IsisSessionFactory)servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
+ final IsisSessionFactory isisSessionFactory = IsisContext.getSessionFactory();
this.servicesInjector = isisSessionFactory.getServicesInjector();
this.configuration = isisSessionFactory.getConfiguration();
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 8a0c9a0..66de39a 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -89,7 +89,6 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.threadpool.ThreadPoolSupport;
import org.apache.isis.core.webapp.IsisWebAppConfigProvider;
-import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.schema.utils.ChangesDtoUtils;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
@@ -330,9 +329,6 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
injector.injectMembers(this); // populates this.isisSessionFactory
- getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, this.isisSessionFactory);
-
-
if (requestCycleListenerForIsis instanceof WebRequestCycleForIsis) {
WebRequestCycleForIsis webRequestCycleForIsis = (WebRequestCycleForIsis) requestCycleListenerForIsis;
webRequestCycleForIsis.setPageClassRegistry(pageClassRegistry);
@@ -748,7 +744,6 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
if (isisSessionFactory != null) {
isisSessionFactory.destroyServicesAndShutdown();
}
- getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, null);
super.onDestroy();
IsisContext.clear();
} catch(final RuntimeException ex) {
[isis] 01/09: ISIS-1895: optimizing peeking
Posted by ah...@apache.org.
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 ad89516be35997ecaccee8104b80333c37435202
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 14:53:28 2018 +0200
ISIS-1895: optimizing peeking
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index bce7206..f0f2c67 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.webapp;
+import static org.apache.isis.commons.internal._Constants.emptyStringArray;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -76,7 +78,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final ServletContext servletContext = servletContextEvent.getServletContext();
final String webInfDir = servletContext.getRealPath("/WEB-INF");
- loggingConfigurer.configureLogging(webInfDir, new String[0]);
+ loggingConfigurer.configureLogging(webInfDir, emptyStringArray);
final IsisConfigurationBuilder isisConfigurationBuilder =
IsisWebAppConfigProvider.getInstance().getConfigurationBuilder(servletContext);
@@ -135,7 +137,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
return deploymentTypeStr;
}
- deploymentTypeStr = isisConfigurationBuilder.peekConfiguration().getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
+ deploymentTypeStr = isisConfigurationBuilder.peekAt(SystemConstants.DEPLOYMENT_TYPE_KEY);
if (deploymentTypeStr != null) {
return deploymentTypeStr;
}
[isis] 03/09: ISIS-1976: remove some deprecated features
Posted by ah...@apache.org.
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 3c80e9a5d8f5a61da514308e6c5131631eea1f0e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 16:34:19 2018 +0200
ISIS-1976: remove some deprecated features
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 13 +------------
.../ActionInvocationFacetForDomainEventAbstract.java | 17 +++++++++++------
.../javautilcollection/JavaCollectionFacet.java | 3 ++-
.../isis/core/metamodel/spec/ObjectAdapterUtils.java | 2 --
4 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 0d1a002..3aa0365 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -200,8 +200,7 @@ public interface ObjectAdapter extends Instance {
public final class Util {
- private Util() {
- }
+ private Util() {}
public static Object unwrap(final ObjectAdapter adapter) {
return adapter != null ? adapter.getObject() : null;
@@ -477,16 +476,6 @@ public interface ObjectAdapter extends Instance {
return Util::unwrap;
}
- @Deprecated
- public static com.google.common.base.Function<ObjectAdapter, Object> get_Object() {
- return new com.google.common.base.Function<ObjectAdapter, Object>() {
- @Override
- public Object apply(ObjectAdapter input) {
- return Util.unwrap(input);
- }
- };
- }
-
public static Function<Object, ObjectAdapter> adapterForUsing(final AdapterManager adapterManager) {
return adapterManager::adapterFor;
}
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 3fdc0ba..bf94a59 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
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.action.invocation;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.Timestamp;
@@ -27,6 +29,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
@@ -76,11 +84,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
public abstract class ActionInvocationFacetForDomainEventAbstract
extends ActionInvocationFacetAbstract
@@ -503,7 +506,9 @@ implements ImperativeFacet {
interactionInitiatedBy);
final Object visibleObjects =
CollectionUtils.copyOf(
- Lists.transform(visibleAdapters, ObjectAdapter.Functions.get_Object()),
+ stream(visibleAdapters)
+ .map(ObjectAdapter.Functions.getObject())
+ .collect(Collectors.toList()),
method.getReturnType());
if (visibleObjects != null) {
return getPersistenceSessionServiceInternal().adapterFor(visibleObjects);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index e0502d9..e696609 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -42,7 +42,8 @@ public class JavaCollectionFacet extends CollectionFacetAbstract {
public Collection<ObjectAdapter> collection(final ObjectAdapter wrappedCollection) {
final Collection<?> collectionOfUnderlying = collectionOfUnderlying(wrappedCollection);
- //TODO [ahuber] java doc states, this is a live view, don't know if this is needed, or if a copy is sufficient
+ //TODO [ahuber] java doc states, this is a live view, don't know if this is needed,
+ // or if a copy is sufficient
return Collections2.transform(collectionOfUnderlying,
ObjectAdapter.Functions.adapter_ForUsing(getAdapterManager()));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
index 9f54613..2433ae8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
@@ -18,8 +18,6 @@ package org.apache.isis.core.metamodel.spec;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
/**
[isis] 09/09: ISIS-1976: minor cleanup
Posted by ah...@apache.org.
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 8619eb60b237a6de87e6b60037cdfd243da47c6a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 17:31:30 2018 +0200
ISIS-1976: minor cleanup
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../metamodel/specloader/specimpl/ObjectActionDefault.java | 4 +---
.../isis/core/runtime/persistence/adapter/PojoAdapter.java | 10 +++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 01f4aff..181fbde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.concurrent.Callable;
import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
@@ -34,11 +35,8 @@ import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.InvokedOn;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
-
-import com.google.common.base.Predicate;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 42ee3d9..c38b67e 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -21,8 +21,11 @@ package org.apache.isis.core.runtime.persistence.adapter;
import java.util.Objects;
+import org.datanucleus.enhancement.Persistable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -41,15 +44,12 @@ import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession4;
-import org.datanucleus.enhancement.Persistable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
private final static Logger LOG = LoggerFactory.getLogger(PojoAdapter.class);
- // -- Constructor, fields, finalizer
+ // -- Constructor, fields
private final AuthenticationSession authenticationSession;
private final SpecificationLoader specificationLoader;
[isis] 07/09: ISIS-1976: remove deprecated
ObjectAssociationContainer.getAssociations(Predicate)
Posted by ah...@apache.org.
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 e7cfe6d2e6bc72977d1383ce5488f251c3aa9b53
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 17:12:37 2018 +0200
ISIS-1976: remove deprecated
ObjectAssociationContainer.getAssociations(Predicate)
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../apache/isis/core/metamodel/spec/ObjectSpecification.java | 12 ------------
.../metamodel/spec/feature/ObjectAssociationContainer.java | 7 -------
.../specloader/specimpl/ObjectSpecificationAbstract.java | 9 +--------
.../core/metamodel/testspec/ObjectSpecificationStub.java | 6 ------
4 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 3931078..82700b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -171,18 +171,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
*/
String getHelp();
-// /**
-// * Returns the title string for the specified object.
-// *
-// * <p>
-// * Corresponds to the {@link TitleFacet#title(ObjectAdapter)} ) value} of
-// * {@link TitleFacet}; is not necessarily immutable.
-// *
-// * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter)}
-// */
-// @Deprecated
-// String getTitle(ObjectAdapter adapter);
-
/**
* Returns the title to display of target adapter, rendered within the context
* of some other adapter (if any).
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
index e4ccd0f..cef70f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
@@ -43,13 +43,6 @@ public interface ObjectAssociationContainer {
List<ObjectAssociation> getAssociations(Contributed contributed);
/**
- * Returns all {@link ObjectAssociation} ({@link Contributed#INCLUDED including contributed actions})
- * that match the supplied filter.
- */
- @Deprecated
- List<ObjectAssociation> getAssociations(Predicate<ObjectAssociation> predicate);
-
- /**
* Return all {@link ObjectAssociation}s matching the supplied filter.
*
* To get the statically visible fields (where any invisible and
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index bbce94c..3821e6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -611,9 +611,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return isAbstract;
}
-
-
// -- Associations
+
@Override
public List<ObjectAssociation> getAssociations(final Contributed contributed) {
// the "contributed.isIncluded()" guard is required because we cannot do this too early;
@@ -708,12 +707,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return null;
}
- @Deprecated
- @Override
- public List<ObjectAssociation> getAssociations(Predicate<ObjectAssociation> predicate) {
- return getAssociations(Contributed.INCLUDED, predicate);
- }
-
@Override
public List<ObjectAssociation> getAssociations(Contributed contributed, final Predicate<ObjectAssociation> predicate) {
final List<ObjectAssociation> allAssociations = getAssociations(contributed);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index c5ef9e3..17ae290 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -135,12 +135,6 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
return fields;
}
- @Deprecated
- @Override
- public List<ObjectAssociation> getAssociations(final Predicate<ObjectAssociation> predicate) {
- return getAssociations(Contributed.INCLUDED, predicate);
- }
-
@Override
@SuppressWarnings("unchecked")
public List<OneToOneAssociation> getProperties(final Contributed contributed) {
[isis] 08/09: ISIS-1976: remove deprecated
ObjectSpecification.getCssClass()
Posted by ah...@apache.org.
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 9409b1c759b3a0116d9795e36deb67e30d858ded
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 17:15:10 2018 +0200
ISIS-1976: remove deprecated ObjectSpecification.getCssClass()
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../org/apache/isis/core/metamodel/spec/ObjectSpecification.java | 7 -------
.../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 7 -------
.../isis/core/metamodel/testspec/ObjectSpecificationStub.java | 5 -----
3 files changed, 19 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 82700b3..36967d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -198,13 +198,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
Object getNavigableParent(Object object);
/**
- *
- * @deprecated - use {@link #getCssClass(org.apache.isis.core.metamodel.adapter.ObjectAdapter)}.
- */
- @Deprecated
- String getCssClass();
-
- /**
* Returns the CSS class name to use for the specified object.
*
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 3821e6c..cad7652 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -377,19 +377,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
: navigableParentFacet.navigableParent(object);
}
- @Deprecated
- @Override
- public String getCssClass() {
- return getCssClass(null);
- }
-
@Override
public String getCssClass(final ObjectAdapter reference) {
return cssClassFacet == null ? null : cssClassFacet.cssClass(reference);
}
-
// -- Hierarchical
/**
* Determines if this class represents the same class, or a subclass, of the
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 17ae290..9d3ab26 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -189,11 +189,6 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public String getCssClass() {
- return null;
- }
-
- @Override
public String getCssClass(final ObjectAdapter reference) {
return null;
}