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 2020/01/10 19:47:34 UTC
[isis] branch master updated: ISIS-2158: removing debug-lines and
sync adoc
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
The following commit(s) were added to refs/heads/master by this push:
new 044a96d ISIS-2158: removing debug-lines and sync adoc
044a96d is described below
commit 044a96dd1b7ddaf1a56c10fd48557ac91c97dced
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 10 20:47:24 2020 +0100
ISIS-2158: removing debug-lines and sync adoc
---
.../applib-ant/examples/annotation/Defaulted.java | 5 +-
.../applib-ant/examples/annotation/Value.java | 16 +--
.../examples/domain/DomainObjectList.java | 4 +-
.../events/domain/AbstractDomainEvent.java | 9 +-
.../examples/events/ui/AbstractUiEvent.java | 4 +-
.../layout/component/CollectionLayoutData.java | 4 +-
.../examples/layout/component/FieldSet.java | 6 +-
.../layout/component/PropertyLayoutData.java | 4 +-
.../examples/layout/grid/GridAbstract.java | 19 ++--
.../examples/layout/grid/bootstrap3/BS3Col.java | 14 +--
.../examples/layout/grid/bootstrap3/BS3Grid.java | 19 ++--
.../examples/layout/grid/bootstrap3/BS3Row.java | 4 +-
.../examples/layout/grid/bootstrap3/BS3Tab.java | 4 +-
.../layout/grid/bootstrap3/BS3TabGroup.java | 4 +-
.../examples/layout/menubars/MenuBarsAbstract.java | 4 +-
.../layout/menubars/bootstrap3/BS3Menu.java | 4 +-
.../layout/menubars/bootstrap3/BS3MenuBar.java | 5 +-
.../layout/menubars/bootstrap3/BS3MenuSection.java | 5 +-
.../examples/mixins/dto/Dto_downloadXsd.java | 2 +-
.../modules/applib-cm/examples/util/ZipWriter.java | 118 +++++++++++++++++++++
.../security/shiro/webmodule/WebModuleShiro.java | 4 -
21 files changed, 183 insertions(+), 75 deletions(-)
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
index eaff20c..3cc72fc 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
@@ -26,7 +26,6 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.core.commons.internal.encoding.Encodable;
/**
* Indicates that the class should have a default, by providing a link to a
@@ -41,8 +40,8 @@ import org.apache.isis.core.commons.internal.encoding.Encodable;
* of {@link DefaultsProvider} could adjust the default it provides according to
* circumstance, for example).
*
- * @see Encodable
- * @see Parseable
+ * @see <code>Encodable</code>
+ * @see <code>Parseable</code>
* @see Value
*
* <p>
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
index 2b4eec0..03e8dd2 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
@@ -27,33 +27,27 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.core.commons.internal.encoding.Encodable;
/**
* Indicates that the class has value semantics.
*
* <p>
* By "value semantics" all we actually mean that the class is
- * {@link Aggregated} and so therefore (conceptually) is not shared between
+ * aggregated (or embedded) and so therefore (conceptually) is not shared between
* instances of classes. However, values very often have other semantics, and so
* this annotation allows these to also be specified:
- * <li>it may be parseable (as per {@link Parseable})</li>
- * <li>it may be encodeable (as per {@link Encodable})</li>
- * <li>it may be immutable (as per {@link Immutable}), and by default is
- * presumed that it is</li>
+ * <li>it may be parseable</li>
+ * <li>it may be encodeable</li>
+ * <li>it may be immutable, and by default is presumed that it is</li>
* <li>it may follow the equal-by-content contract (as per
* {@link EqualByContent}), and by default is presumed that it does.</i> </ul>
*
* <p>
* Note also that though a value is conceptually not shared, if it is also
- * {@link Immutable immutable} then it is in fact safe to share objects (as in
+ * immutable then it is in fact safe to share objects (as in
* the flyweight pattern). In addition, the {@link EqualByContent} semantic
* means that we needn't care whether value types are being shared or not.
*
- * @see Aggregated
- * @see Parseable
- * @see Encodable
- * @see Immutable
* @see EqualByContent
*
* <p>
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
index 866c114..2a13734 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.domain;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
@@ -35,7 +36,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.core.commons.internal.collections._Lists;
@XmlRootElement(name = "list")
@XmlType(
@@ -161,7 +161,7 @@ public class DomainObjectList {
public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { }
@XmlJavaTypeAdapter(PersistentEntitiesAdapter.class)
- private List<Object> objects = _Lists.newArrayList();
+ private List<Object> objects = new ArrayList<>();
@Collection(
domainEvent = ObjectsDomainEvent.class,
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
index 55b7e38..f72000b 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
@@ -18,14 +18,15 @@
*/
package org.apache.isis.applib.events.domain;
+import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
@@ -99,8 +100,8 @@ public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
}
/**
- * When the {@link org.apache.isis.applib.services.command.Command} is made available on the {@link org.apache.isis.applib.events.domain.ActionDomainEvent}
- * via {@link org.apache.isis.applib.events.domain.ActionDomainEvent#getCommand()}.
+ * When the {@link org.apache.isis.applib.services.command.Command} is made available on the
+ * {@link org.apache.isis.applib.events.domain.ActionDomainEvent} via {@link CommandContext#getCommand()}.
*/
public boolean isExecutingOrLater() {
return isExecuting() || isExecuted();
@@ -315,7 +316,7 @@ public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
/**
* Provides a mechanism to pass data to the next {@link #getEventPhase() phase}.
*/
- private final Map<Object, Object> userData = _Maps.newHashMap();
+ private final Map<Object, Object> userData = new HashMap<>();
/**
* Obtain user-data, as set by a previous {@link #getEventPhase() phase}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
index e3a6731..72df250 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.applib.events.ui;
+import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.events.domain.EventObjectBase;
-import org.apache.isis.core.commons.internal.collections._Maps;
public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
@@ -42,7 +42,7 @@ public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
/**
* Provides a mechanism to pass data around.
*/
- private final Map<Object, Object> userData = _Maps.newHashMap();
+ private final Map<Object, Object> userData = new HashMap<>();
/**
* Obtain user-data, as set by any other subscribers.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
index e2df05c..46d4bb2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
@@ -198,7 +198,7 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
index 68d9d6d..335d65a 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* A {@link MemberRegion region} of the page containing a set of
@@ -135,7 +135,7 @@ Serializable {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@@ -151,7 +151,7 @@ Serializable {
- private List<PropertyLayoutData> properties = _Lists.newArrayList();
+ private List<PropertyLayoutData> properties = new ArrayList<>();
// no wrapper; required=false because may be auto-generated
@XmlElement(name = "property", required = false)
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
index 3e1d623..817a6aa 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -33,7 +34,6 @@ import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
@@ -234,7 +234,7 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.repainting = repainting;
}
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
index 0846eb9..5ebfa9d 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -33,8 +34,6 @@ import org.apache.isis.applib.layout.component.FieldSetOwner;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
import org.apache.isis.applib.services.layout.LayoutService;
-import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.internal.collections._Maps;
/**
* All top-level page layout classes should implement this interface.
@@ -103,7 +102,7 @@ public abstract class GridAbstract implements Grid {
if(actionLayoutDatas == null) {
return;
}
- for (final ActionLayoutData actionLayoutData : _Lists.newArrayList(actionLayoutDatas)) {
+ for (final ActionLayoutData actionLayoutData : new ArrayList<>(actionLayoutDatas)) {
actionLayoutData.setOwner(actionLayoutDataOwner);
visitor.visit(actionLayoutData);
}
@@ -115,12 +114,12 @@ public abstract class GridAbstract implements Grid {
*/
protected void traverseFieldSets(final FieldSetOwner fieldSetOwner, final GridAbstract.Visitor visitor) {
final List<FieldSet> fieldSets = fieldSetOwner.getFieldSets();
- for (FieldSet fieldSet : _Lists.newArrayList(fieldSets)) {
+ for (FieldSet fieldSet : new ArrayList<>(fieldSets)) {
fieldSet.setOwner(fieldSetOwner);
visitor.visit(fieldSet);
traverseActions(fieldSet, visitor);
final List<PropertyLayoutData> properties = fieldSet.getProperties();
- for (final PropertyLayoutData property : _Lists.newArrayList(properties)) {
+ for (final PropertyLayoutData property : new ArrayList<>(properties)) {
property.setOwner(fieldSet);
visitor.visit(property);
traverseActions(property, visitor);
@@ -135,7 +134,7 @@ public abstract class GridAbstract implements Grid {
protected void traverseCollections(
final CollectionLayoutDataOwner owner, final GridAbstract.Visitor visitor) {
final List<CollectionLayoutData> collections = owner.getCollections();
- for (CollectionLayoutData collection : _Lists.newArrayList(collections)) {
+ for (CollectionLayoutData collection : new ArrayList<>(collections)) {
collection.setOwner(owner);
visitor.visit(collection);
traverseActions(collection, visitor);
@@ -147,7 +146,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, PropertyLayoutData> getAllPropertiesById() {
- final LinkedHashMap<String, PropertyLayoutData> propertiesById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, PropertyLayoutData> propertiesById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
public void visit(final PropertyLayoutData propertyLayoutData) {
@@ -162,7 +161,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, CollectionLayoutData> getAllCollectionsById() {
- final LinkedHashMap<String, CollectionLayoutData> collectionsById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, CollectionLayoutData> collectionsById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -178,7 +177,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, ActionLayoutData> getAllActionsById() {
- final LinkedHashMap<String, ActionLayoutData> actionsById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, ActionLayoutData> actionsById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -193,7 +192,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, FieldSet> getAllFieldSetsByName() {
- final LinkedHashMap<String, FieldSet> fieldSetsByName = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, FieldSet> fieldSetsByName = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
index 91017a9..7f44432 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -34,7 +35,6 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.FieldSetOwner;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
@@ -158,7 +158,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
}
- private List<SizeSpan> sizeSpans = _Lists.newArrayList();
+ private List<SizeSpan> sizeSpans = new ArrayList<>();
// no wrapper
@XmlElement(name = "sizeSpan", required = false)
@@ -172,7 +172,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@@ -188,7 +188,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
@@ -203,7 +203,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<BS3TabGroup> tabGroups = _Lists.newArrayList();
+ private List<BS3TabGroup> tabGroups = new ArrayList<>();
// no wrapper
@Override
@@ -218,7 +218,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<FieldSet> fieldSets = _Lists.newArrayList();
+ private List<FieldSet> fieldSets = new ArrayList<>();
// no wrapper
@Override
@@ -233,7 +233,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<CollectionLayoutData> collections = _Lists.newArrayList();
+ private List<CollectionLayoutData> collections = new ArrayList<>();
// no wrapper
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
index b7a3d21..f50e427 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -36,8 +37,6 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.layout.grid.GridAbstract;
import org.apache.isis.applib.mixins.dto.Dto;
-import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.core.commons.internal.collections._Maps;
/**
* This is the top-level for rendering the domain object's properties, collections and actions. It simply consists
@@ -79,7 +78,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
@@ -94,7 +93,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
- private List<String> metadataErrors = _Lists.newArrayList();
+ private List<String> metadataErrors = new ArrayList<>();
/**
* For diagnostics; populated by the framework if and only if a metadata error.
@@ -170,7 +169,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
protected void traverseRows(final BS3RowOwner rowOwner, final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3Row> rows = rowOwner.getRows();
- for (BS3Row bs3Row : _Lists.newArrayList(rows)) {
+ for (BS3Row bs3Row : new ArrayList<>(rows)) {
bs3Row.setOwner(this);
bs3Visitor.preVisit(bs3Row);
bs3Visitor.visit(bs3Row);
@@ -182,7 +181,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
private void traverseCols(final Grid.Visitor visitor, final BS3Row bs3Row) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3RowContent> cols = bs3Row.getCols();
- for (BS3RowContent rowContent : _Lists.newArrayList(cols)) {
+ for (BS3RowContent rowContent : new ArrayList<>(cols)) {
rowContent.setOwner(bs3Row);
if(rowContent instanceof BS3Col) {
final BS3Col bs3Col = (BS3Col) rowContent;
@@ -219,7 +218,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3TabGroup> tabGroups = bs3TabGroupOwner.getTabGroups();
- for (BS3TabGroup bs3TabGroup : _Lists.newArrayList(tabGroups)) {
+ for (BS3TabGroup bs3TabGroup : new ArrayList<>(tabGroups)) {
bs3TabGroup.setOwner(bs3TabGroupOwner);
bs3Visitor.preVisit(bs3TabGroup);
bs3Visitor.visit(bs3TabGroup);
@@ -233,7 +232,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3Tab> tabs = bs3TabOwner.getTabs();
- for (BS3Tab tab : _Lists.newArrayList(tabs)) {
+ for (BS3Tab tab : new ArrayList<>(tabs)) {
tab.setOwner(bs3TabOwner);
bs3Visitor.preVisit(tab);
bs3Visitor.visit(tab);
@@ -270,7 +269,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
@Programmatic
@XmlTransient
public LinkedHashMap<String, BS3Tab> getAllTabsByName() {
- final LinkedHashMap<String, BS3Tab> tabsByName = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, BS3Tab> tabsByName = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -285,7 +284,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
@Programmatic
@XmlTransient
public LinkedHashMap<String, HasCssId> getAllCssId() {
- final LinkedHashMap<String, HasCssId> divsByCssId = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, HasCssId> divsByCssId = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
index ba2a6bd..9fc2d77 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -28,7 +29,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
@@ -67,7 +67,7 @@ public class BS3Row extends BS3ElementAbstract implements HasCssId, BS3RowConten
- private List<BS3RowContent> cols = _Lists.newArrayList();
+ private List<BS3RowContent> cols = new ArrayList<>();
// no wrapper
@XmlElementRefs({
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
index 70e5a89..772e6d4 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
@@ -32,7 +33,6 @@ import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Represents a tab within a {@link BS3TabGroup tab group}.
@@ -63,7 +63,7 @@ public class BS3Tab extends BS3ElementAbstract implements BS3RowOwner {
}
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
index ce896d6..02471b6 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,7 +27,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Represents a tab group containing one or more {@link BS3Tab tab}s.
@@ -79,7 +79,7 @@ public class BS3TabGroup extends BS3ElementAbstract implements BS3TabOwner {
- private List<BS3Tab> tabs = _Lists.newArrayList();
+ private List<BS3Tab> tabs = new ArrayList<>();
// no wrapper; required=false because may be auto-generated
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
index 7bf65cf..aa38830 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
-import org.apache.isis.core.commons.internal.collections._Maps;
+
import lombok.val;
@@ -55,7 +55,7 @@ public abstract class MenuBarsAbstract implements MenuBars, Serializable {
public LinkedHashMap<String, ServiceActionLayoutData> getAllServiceActionsByObjectTypeAndId() {
val serviceActionsByObjectTypeAndId =
- _Maps.<String, ServiceActionLayoutData>newLinkedHashMap();
+ new LinkedHashMap<String, ServiceActionLayoutData>();
visit(serviceActionLayoutData -> {
serviceActionsByObjectTypeAndId
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
index 3c7e8ce..a7ccaf0 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -27,7 +28,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.Menu;
-import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.ToString;
@@ -82,7 +82,7 @@ public class BS3Menu implements Menu, Serializable {
- private List<BS3MenuSection> sections = _Lists.newArrayList();
+ private List<BS3MenuSection> sections = new ArrayList<>();
// no wrapper
@XmlElement(name = "section", required = true)
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
index 04df142..cb65485 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -26,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.MenuBar;
-import org.apache.isis.core.commons.internal.collections._Lists;
+
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
@@ -45,7 +46,7 @@ public class BS3MenuBar implements MenuBar, Serializable {
}
- private List<BS3Menu> menus = _Lists.newArrayList();
+ private List<BS3Menu> menus = new ArrayList<>();
// no wrapper
@XmlElement(name = "menu", required = true)
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
index d3370c2..79716b6 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -27,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.component.ServiceActionLayoutDataOwner;
import org.apache.isis.applib.layout.menubars.MenuSection;
-import org.apache.isis.core.commons.internal.collections._Lists;
+
/**
* Corresponds to a domain service that contributes its serviceActions under a particular {@link BS3MenuBar}.
@@ -46,7 +47,7 @@ public class BS3MenuSection implements MenuSection, Serializable, ServiceActionL
}
- private List<ServiceActionLayoutData> serviceActions = _Lists.newArrayList();
+ private List<ServiceActionLayoutData> serviceActions = new ArrayList<>();
// no wrapper
@Override
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
index 9c72d26..e724daf 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.MixinConstants;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.applib.util.ZipWriter;
import org.apache.isis.applib.value.BlobClobFactory;
-import org.apache.isis.core.commons.compression.ZipWriter;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ZipWriter.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ZipWriter.java
new file mode 100644
index 0000000..bea7b06
--- /dev/null
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/ZipWriter.java
@@ -0,0 +1,118 @@
+/*
+ * 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.applib.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
+/**
+ * Typical use:
+ * <pre>
+ * val zipWriter = ZipWriter.newInstance();
+ *
+ * for (Map.Entry<String, String> entry : schemaMap.entrySet()) {
+ * val namespaceUri = entry.getKey();
+ * val schemaText = entry.getValue();
+ * zipWriter.nextEntry(zipEntryNameFor(namespaceUri), writer->{
+ * writer.write(schemaText);
+ * });
+ * }
+ *
+ * return BlobClobFactory.blobZip(fileName, zipWriter.toBytes());
+ * </pre>
+ * @return a new ZipWriter instance
+ *
+ * @since 2.0
+ * @apiNote Implementation is <em>not</em> thread safe.
+ *
+ */
+@RequiredArgsConstructor(staticName = "of", access = AccessLevel.PRIVATE)
+public class ZipWriter {
+
+ @FunctionalInterface
+ public interface OnZipEntry {
+ public void accept(OutputStreamWriter writer) throws IOException;
+ }
+
+ public static ZipWriter newInstance() {
+ return ofFailureMessage("Unable to create zip");
+ }
+
+ public static ZipWriter ofFailureMessage(String failureMessage) {
+ val baos = new ByteArrayOutputStream();
+ val zos = new ZipOutputStream(baos);
+ val writer = new OutputStreamWriter(zos);
+ return new ZipWriter(baos, zos, writer, failureMessage);
+ }
+
+ private final ByteArrayOutputStream baos;
+ private final ZipOutputStream zos;
+ private final OutputStreamWriter writer;
+ private final String failureMessage;
+ private byte[] content;
+
+ /**
+ * Adds a new zipEntry with given {@code zipEntryName}, and provides the
+ * {@link OutputStreamWriter} via {@link OnZipEntry} for the consumer to
+ * write the actual (uncompressed) zip-entry content.
+ * @param zipEntryName
+ * @param onZipEntry
+ */
+ public void nextEntry(String zipEntryName, OnZipEntry onZipEntry) {
+ if(content!=null) {
+ throw new IllegalStateException("Cannot create a new ZipEntry an a closed ZipWriter");
+ }
+ try {
+ zos.putNextEntry(new ZipEntry(zipEntryName));
+ onZipEntry.accept(writer);
+ writer.flush();
+ zos.closeEntry();
+ } catch (final IOException e) {
+ throw _Exceptions.unrecoverable(failureMessage, e);
+ }
+ }
+
+ /**
+ * Terminal operation, closes the writer.
+ * Calling this operation multiple times, will return the same array instance object.
+ * @return the byte array created by the underlying ZipOutputStream
+ */
+ public byte[] toBytes() {
+ if(content==null) {
+ try {
+ writer.close();
+ } catch (IOException e) {
+ throw _Exceptions.unrecoverable(failureMessage, e);
+ }
+ content = baos.toByteArray();
+ }
+ return content;
+ }
+
+
+}
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index a925d34..f6acb80 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -46,7 +46,6 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import org.apache.isis.core.webapp.modules.WebModuleContext;
@@ -131,9 +130,6 @@ public class WebModuleShiro extends WebModuleAbstract {
@Override
public void contextInitialized(ServletContextEvent sce) {
- System.err.println("intercepted: " + this);
- _Exceptions.dumpStackTrace();
- System.err.println("======================================================");
super.contextInitialized(sce);
}