From 122cb1397f980418437fd5e45bc985bd15c90483 Mon Sep 17 00:00:00 2001 From: Fabian Pichler Date: Fri, 13 Mar 2026 00:54:22 +0100 Subject: [PATCH] just formatting celements-core repo with lineending=KEEP and improved enums --- .../celements/appScript/AppScriptService.java | 4 +- .../celements/cells/classes/CellClass.java | 2 +- .../cells/classes/GroupCellClass.java | 6 +- .../cells/classes/PageDepCellConfigClass.java | 12 ++-- .../classes/PageLayoutPropertiesClass.java | 56 +++++++++---------- .../TranslationBoxCellConfigClass.java | 12 ++-- .../common/collections/ListUtils.java | 3 +- .../celements/docform/DocFormRequestKey.java | 4 +- .../java/com/celements/docform/IDocForm.java | 4 +- .../form/classes/FormConfigClass.java | 4 +- .../celements/inheritor/ContentInheritor.java | 3 +- .../celements/iterator/DocumentIterator.java | 6 +- .../javascript/FrontendResourceResolver.java | 4 +- .../com/celements/javascript/JsLoadMode.java | 4 +- .../MenuBar_SubMenuItemsClassMigrator.java | 12 ++-- .../TreeNodeRelativeParent_Database.java | 7 ++- .../navigation/cmd/EReorderLiteral.java | 1 + .../navigation/cmd/MenuItemsUtils.java | 3 +- .../filter/InternalRightsFilter.java | 3 +- .../TreeNodeDocumentCreatedListener.java | 3 +- .../TreeNodeDocumentDeletedListener.java | 3 +- .../TreeNodeDocumentUpdatedListener.java | 3 +- .../presentation/PresentationNodeData.java | 1 - .../RenderedExtractPresentationType.java | 3 +- .../navigation/service/TreeNodeService.java | 18 +++--- .../observation/save/SaveEventOperation.java | 3 +- .../save/object/XObjectEventConverter.java | 3 +- .../classes/PageTypePropertiesClass.java | 9 ++- .../IRequestValidationRuleRole.java | 1 - .../java/com/celements/web/FileAction.java | 3 +- .../web/classes/helper/CssMediaType.java | 14 ++++- .../web/contextmenu/ContextMenuBuilder.java | 3 +- .../web/contextmenu/ERequestLiteral.java | 1 + .../java/com/celements/web/css/CSSEngine.java | 3 +- .../celements/web/medialib/JSONExporter.java | 3 +- .../service/MobileLoggingScriptService.java | 3 +- .../PrepareVelocityContextService.java | 3 +- .../appScript/AppScriptServiceTest.java | 45 ++++++++++----- .../celements/cells/RenderingEngineTest.java | 2 +- .../common/collections/ListUtilsTest.java | 3 +- .../internal/DefaultEmptyDocStrategyTest.java | 3 +- .../NextNonEmptyChildrenCommandTest.java | 18 ++++-- .../service/EmptyCheckServiceTest.java | 42 +++++++++----- .../MenuNameMappingCelements2_8Test.java | 5 +- .../celements/navigation/TreeNodeTest.java | 3 +- .../factories/JavaNavigationFactoryTest.java | 9 ++- ...redContentDynLoadPresentationTypeTest.java | 6 +- .../RenderedContentPresentationTypeTest.java | 3 +- .../RenderedExtractPresentationTypeTest.java | 3 +- .../SitemapPresentationTypeTest.java | 6 +- .../navigation/service/TreeNodeCacheTest.java | 3 +- .../xobject/XObjectPageTypeCacheTest.java | 3 +- .../rights/CelementsRightServiceImplTest.java | 12 ++-- .../celements/sajson/LexicalParserTest.java | 1 + .../web/contextmenu/TestRequestHandler.java | 15 ++--- .../web/medialib/JSONExporterTest.java | 3 +- .../web/medialib/datafields/BooleanTest.java | 3 +- .../web/medialib/datafields/DateTest.java | 3 +- .../web/medialib/datafields/DefaultTest.java | 3 +- .../datafields/JSONDataFieldRowTest.java | 3 +- .../web/medialib/datafields/NumberTest.java | 3 +- .../web/medialib/datafields/StringTest.java | 3 +- .../plugin/cmd/AttachmentURLCommandTest.java | 8 +-- .../plugin/cmd/CelMailConfigurationTest.java | 15 +++-- .../web/plugin/cmd/CelSendMailTest.java | 9 ++- .../web/plugin/cmd/EmptyCheckCommandTest.java | 18 ++++-- .../web/plugin/cmd/FileBaseTagsCmdTest.java | 9 ++- .../plugin/cmd/RemoteUserValidatorTest.java | 24 +++++--- .../PrepareVelocityContextServiceTest.java | 12 ++-- 69 files changed, 310 insertions(+), 218 deletions(-) diff --git a/src/main/java/com/celements/appScript/AppScriptService.java b/src/main/java/com/celements/appScript/AppScriptService.java index baa028503..89765b04a 100644 --- a/src/main/java/com/celements/appScript/AppScriptService.java +++ b/src/main/java/com/celements/appScript/AppScriptService.java @@ -196,8 +196,8 @@ public Optional getAppRecursiveScript(String scriptName) { return findAppScriptRecursivly(scriptName, sn -> isAppScriptAvailable(sn + "++"), sn -> sn.lastIndexOf("/") > 0) - .map(sNT -> sNT + "++") - .filter(sNT -> !Strings.isNullOrEmpty(sNT) && isAppScriptAvailable(sNT)); + .map(sNT -> sNT + "++") + .filter(sNT -> !Strings.isNullOrEmpty(sNT) && isAppScriptAvailable(sNT)); } private Optional findAppScriptRecursivly(String scriptName, diff --git a/src/main/java/com/celements/cells/classes/CellClass.java b/src/main/java/com/celements/cells/classes/CellClass.java index 3f1f40e28..22b82df5d 100644 --- a/src/main/java/com/celements/cells/classes/CellClass.java +++ b/src/main/java/com/celements/cells/classes/CellClass.java @@ -55,7 +55,7 @@ public class CellClass extends AbstractClassDefinition public static final ClassField FIELD_EVENT_DATA_ATTR = new LargeStringField.Builder( CLASS_REF, "event_data_attr").rows(20).size(15).prettyName("celEventJS data attribute") - .build(); + .build(); public CellClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/cells/classes/GroupCellClass.java b/src/main/java/com/celements/cells/classes/GroupCellClass.java index 8cf54d774..0b57a5938 100644 --- a/src/main/java/com/celements/cells/classes/GroupCellClass.java +++ b/src/main/java/com/celements/cells/classes/GroupCellClass.java @@ -23,9 +23,9 @@ public class GroupCellClass extends AbstractClassDefinition public static final ClassField FIELD_RENDER_LAYOUT = new StringField.Builder(CLASS_REF, "render_layout") - .prettyName("Render Layout") - .size(30) - .build(); + .prettyName("Render Layout") + .size(30) + .build(); public GroupCellClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/cells/classes/PageDepCellConfigClass.java b/src/main/java/com/celements/cells/classes/PageDepCellConfigClass.java index 7ff7cfadf..8f6d3bf91 100644 --- a/src/main/java/com/celements/cells/classes/PageDepCellConfigClass.java +++ b/src/main/java/com/celements/cells/classes/PageDepCellConfigClass.java @@ -24,15 +24,15 @@ public class PageDepCellConfigClass extends AbstractClassDefinition public static final ClassField FIELD_SPACE_NAME = new StringField.Builder(CLASS_REF, "space_name") - .prettyName("Space Name") - .size(30) - .build(); + .prettyName("Space Name") + .size(30) + .build(); public static final ClassField FIELD_IS_ACTIVE = new BooleanField.Builder(CLASS_REF, "is_inheritable") - .displayType("yesno") - .prettyName("is inheritable") - .build(); + .displayType("yesno") + .prettyName("is inheritable") + .build(); public PageDepCellConfigClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/cells/classes/PageLayoutPropertiesClass.java b/src/main/java/com/celements/cells/classes/PageLayoutPropertiesClass.java index f7c0bcede..6442ec1b7 100644 --- a/src/main/java/com/celements/cells/classes/PageLayoutPropertiesClass.java +++ b/src/main/java/com/celements/cells/classes/PageLayoutPropertiesClass.java @@ -32,52 +32,52 @@ public class PageLayoutPropertiesClass extends AbstractClassDefinition public static final ClassField FIELD_PRETTYNAME = new StringField.Builder(CLASS_REF, "prettyname") - .prettyName("Layout Pretty Name") - .size(30) - .build(); + .prettyName("Layout Pretty Name") + .size(30) + .build(); public static final ClassField FIELD_IS_ACTIVE = new BooleanField.Builder(CLASS_REF, "isActive") - .displayType("yesno") - .prettyName("is active") - .build(); + .displayType("yesno") + .prettyName("is active") + .build(); public static final ClassField FIELD_AUTHORS = new StringField.Builder(CLASS_REF, "authors") - .prettyName("Authors") - .size(30) - .build(); + .prettyName("Authors") + .size(30) + .build(); public static final ClassField FIELD_LICENSE = new LargeStringField.Builder(CLASS_REF, "license") - .rows(30) - .size(15) - .prettyName("License") - .build(); + .rows(30) + .size(15) + .prettyName("License") + .build(); public static final ClassField FIELD_VERSION = new StringField.Builder(CLASS_REF, "version") - .prettyName("Version") - .size(30) - .build(); + .prettyName("Version") + .size(30) + .build(); public static final ClassField FIELD_LAYOUT_DOCTYPE = new StringSingleListField.Builder( CLASS_REF, "doctype") - .size(1) - .displayType(DisplayType.select) - .values(ImmutableList.of(HtmlDoctype.XHTML.toString(), HtmlDoctype.HTML5.toString())) - .prettyName("Doctype") - /* .relationalStorage(true) */ - .build(); + .size(1) + .displayType(DisplayType.select) + .values(ImmutableList.of(HtmlDoctype.XHTML.toString(), HtmlDoctype.HTML5.toString())) + .prettyName("Doctype") + /* .relationalStorage(true) */ + .build(); public static final ClassField FIELD_LAYOUT_TYPE = new StringSingleListField.Builder( CLASS_REF, "layout_type") - .size(1) - .displayType(DisplayType.select) - .values(ImmutableList.of(PAGE_LAYOUT_VALUE, EDITOR_LAYOUT_VALUE)) - .prettyName("Layout Type") - /* .relationalStorage(true) */ - .build(); + .size(1) + .displayType(DisplayType.select) + .values(ImmutableList.of(PAGE_LAYOUT_VALUE, EDITOR_LAYOUT_VALUE)) + .prettyName("Layout Type") + /* .relationalStorage(true) */ + .build(); public PageLayoutPropertiesClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/cells/classes/TranslationBoxCellConfigClass.java b/src/main/java/com/celements/cells/classes/TranslationBoxCellConfigClass.java index fde76d4ab..1cdad5942 100644 --- a/src/main/java/com/celements/cells/classes/TranslationBoxCellConfigClass.java +++ b/src/main/java/com/celements/cells/classes/TranslationBoxCellConfigClass.java @@ -23,15 +23,15 @@ public class TranslationBoxCellConfigClass extends AbstractClassDefinition public static final ClassField FIELD_PAGE_EXCEPTIONS = new StringField.Builder(CLASS_REF, "page_exceptions") - .prettyName("Page Exceptions (FullNames comma separated)") - .size(30) - .build(); + .prettyName("Page Exceptions (FullNames comma separated)") + .size(30) + .build(); public static final ClassField FIELD_PAGETYPE_EXCEPTIONS = new StringField.Builder( CLASS_REF, "pagetype_exceptions") - .prettyName("Page Type Exceptions (FullNames comma separated)") - .size(30) - .build(); + .prettyName("Page Type Exceptions (FullNames comma separated)") + .size(30) + .build(); public TranslationBoxCellConfigClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/common/collections/ListUtils.java b/src/main/java/com/celements/common/collections/ListUtils.java index 52afd8ff8..f5c8c3f24 100644 --- a/src/main/java/com/celements/common/collections/ListUtils.java +++ b/src/main/java/com/celements/common/collections/ListUtils.java @@ -23,8 +23,7 @@ public class ListUtils { - private ListUtils() { - } + private ListUtils() {} /** * Provides a type safe substract for Lists. diff --git a/src/main/java/com/celements/docform/DocFormRequestKey.java b/src/main/java/com/celements/docform/DocFormRequestKey.java index 03f254ecf..1cbef51ca 100644 --- a/src/main/java/com/celements/docform/DocFormRequestKey.java +++ b/src/main/java/com/celements/docform/DocFormRequestKey.java @@ -18,7 +18,9 @@ public class DocFormRequestKey implements Comparable { public enum Type { - DOC_FIELD, OBJ_FIELD, OBJ_REMOVE; + DOC_FIELD, + OBJ_FIELD, + OBJ_REMOVE; } private final String keyString; diff --git a/src/main/java/com/celements/docform/IDocForm.java b/src/main/java/com/celements/docform/IDocForm.java index 46af89569..691ed27ce 100644 --- a/src/main/java/com/celements/docform/IDocForm.java +++ b/src/main/java/com/celements/docform/IDocForm.java @@ -13,7 +13,9 @@ public interface IDocForm { public enum ResponseState { - successful, failed, unchanged; + successful, + failed, + unchanged; } IDocForm initialize(DocumentReference defaultDocRef, boolean isCreateAllowed); diff --git a/src/main/java/com/celements/form/classes/FormConfigClass.java b/src/main/java/com/celements/form/classes/FormConfigClass.java index 73e08ff29..13364a963 100644 --- a/src/main/java/com/celements/form/classes/FormConfigClass.java +++ b/src/main/java/com/celements/form/classes/FormConfigClass.java @@ -30,8 +30,8 @@ public class FormConfigClass extends AbstractClassDefinition implements FormClas public static final ClassField FIELD_EXCLUDE_FORM_IS_FILLED = new StringField.Builder( CLASS_REF, "excludeFromIsFilledCheck").size(30) - .prettyName("Exclude fields from 'isFilled' check. (separator: ',')") - .build(); + .prettyName("Exclude fields from 'isFilled' check. (separator: ',')") + .build(); public FormConfigClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/inheritor/ContentInheritor.java b/src/main/java/com/celements/inheritor/ContentInheritor.java index 9f6bc71cc..c292da189 100644 --- a/src/main/java/com/celements/inheritor/ContentInheritor.java +++ b/src/main/java/com/celements/inheritor/ContentInheritor.java @@ -37,8 +37,7 @@ public class ContentInheritor { private IEmptyDocumentChecker _emptyDocumentChecker; private String _language; - public ContentInheritor() { - } + public ContentInheritor() {} public void setIteratorFactory(IIteratorFactory iteratorFactory) { _iteratorFactory = iteratorFactory; diff --git a/src/main/java/com/celements/iterator/DocumentIterator.java b/src/main/java/com/celements/iterator/DocumentIterator.java index 298c2e926..d14809cd0 100644 --- a/src/main/java/com/celements/iterator/DocumentIterator.java +++ b/src/main/java/com/celements/iterator/DocumentIterator.java @@ -49,8 +49,7 @@ public class DocumentIterator implements Iterator, Iterable resolve(String sourcePath) { diff --git a/src/main/java/com/celements/javascript/JsLoadMode.java b/src/main/java/com/celements/javascript/JsLoadMode.java index 23c5d4004..3a019431a 100644 --- a/src/main/java/com/celements/javascript/JsLoadMode.java +++ b/src/main/java/com/celements/javascript/JsLoadMode.java @@ -2,6 +2,8 @@ public enum JsLoadMode { - SYNC, DEFER, ASYNC; + SYNC, + DEFER, + ASYNC; } diff --git a/src/main/java/com/celements/migrator/MenuBar_SubMenuItemsClassMigrator.java b/src/main/java/com/celements/migrator/MenuBar_SubMenuItemsClassMigrator.java index 8c6bcf6a1..2d8565ba8 100644 --- a/src/main/java/com/celements/migrator/MenuBar_SubMenuItemsClassMigrator.java +++ b/src/main/java/com/celements/migrator/MenuBar_SubMenuItemsClassMigrator.java @@ -60,7 +60,7 @@ public class MenuBar_SubMenuItemsClassMigrator IWebUtilsService webUtilsService; private XWikiContext getContext() { - return (XWikiContext)execution.getContext().getProperty("xwikicontext"); + return (XWikiContext) execution.getContext().getProperty("xwikicontext"); } @Override @@ -73,12 +73,13 @@ private MenuClasses getMenuClasses() { } @Override - public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext context - ) throws XWikiException { + public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext context) + throws XWikiException { getMenuClasses().runUpdate(getContext()); List result = context.getWiki().search( "select distinct o.name from BaseObject o" - + " where o.className = 'Celements2.MenuBarSubItem'", context); + + " where o.className = 'Celements2.MenuBarSubItem'", + context); LOGGER.info("found [" + ((result != null) ? result.size() : result) + "] documents to migrate."); for (Object fullName : result) { @@ -97,8 +98,7 @@ public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext con } } - private void migrateSubItem(BaseObject oldSubItemObj, XWikiDocument doc - ) throws XWikiException { + private void migrateSubItem(BaseObject oldSubItemObj, XWikiDocument doc) throws XWikiException { BaseObject newSubItemObj = doc.newXObject(menuService.getMenuBarSubItemClassRef(), getContext()); newSubItemObj.setStringValue("name", oldSubItemObj.getStringValue("name")); diff --git a/src/main/java/com/celements/migrator/TreeNodeRelativeParent_Database.java b/src/main/java/com/celements/migrator/TreeNodeRelativeParent_Database.java index b1de57e3a..75d9735ad 100644 --- a/src/main/java/com/celements/migrator/TreeNodeRelativeParent_Database.java +++ b/src/main/java/com/celements/migrator/TreeNodeRelativeParent_Database.java @@ -60,8 +60,8 @@ EntityReference getRelativeParentReference(String parentFN) { } @Override - public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext context - ) throws XWikiException { + public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext context) + throws XWikiException { Query theQuery; try { theQuery = queryManager.createQuery("from doc.object(Celements2.MenuItem) as mItem" @@ -87,7 +87,8 @@ public void migrate(SubSystemHibernateMigrationManager manager, XWikiContext con exp); throw new XWikiException(XWikiException.MODULE_XWIKI_APP, XWikiException.MODULE_XWIKI, "Failed to execute migration" - + " TreeNodeRelativeParent_Database", exp); + + " TreeNodeRelativeParent_Database", + exp); } } diff --git a/src/main/java/com/celements/navigation/cmd/EReorderLiteral.java b/src/main/java/com/celements/navigation/cmd/EReorderLiteral.java index f4c6aec11..8cdb8d9b7 100644 --- a/src/main/java/com/celements/navigation/cmd/EReorderLiteral.java +++ b/src/main/java/com/celements/navigation/cmd/EReorderLiteral.java @@ -26,6 +26,7 @@ import com.celements.sajson.IGenericLiteral; public enum EReorderLiteral implements IGenericLiteral { + ELEMENT_ID(ECommand.VALUE_COMMAND), ELEM_IDS_ARRAY(ECommand.ARRAY_COMMAND, ELEMENT_ID), PARENT_CHILDREN_PROPERTY(ECommand.PROPERTY_COMMAND, ELEM_IDS_ARRAY), diff --git a/src/main/java/com/celements/navigation/cmd/MenuItemsUtils.java b/src/main/java/com/celements/navigation/cmd/MenuItemsUtils.java index 9518306b8..b6e3073c1 100644 --- a/src/main/java/com/celements/navigation/cmd/MenuItemsUtils.java +++ b/src/main/java/com/celements/navigation/cmd/MenuItemsUtils.java @@ -9,8 +9,7 @@ public class MenuItemsUtils { - private MenuItemsUtils() { - } + private MenuItemsUtils() {} public static EntityReference resolveParentRef(@NotNull String parentFN) { return (parentFN.isEmpty()) ? null : Utils.getComponent(ModelUtils.class).resolveRef(parentFN); diff --git a/src/main/java/com/celements/navigation/filter/InternalRightsFilter.java b/src/main/java/com/celements/navigation/filter/InternalRightsFilter.java index 224f08b4c..6011c7e95 100644 --- a/src/main/java/com/celements/navigation/filter/InternalRightsFilter.java +++ b/src/main/java/com/celements/navigation/filter/InternalRightsFilter.java @@ -48,7 +48,8 @@ public String getMenuPart() { @Deprecated public boolean includeMenuItem(BaseObject baseObj, XWikiContext context) { return getRightsAccess().hasAccessLevel(baseObj.getDocumentReference(), EAccessLevel.VIEW, - context.getXWikiUser()) && (getMenuPart().isEmpty() || getMenuPart().equals( + context.getXWikiUser()) + && (getMenuPart().isEmpty() || getMenuPart().equals( baseObj.getStringValue("part_name"))); } diff --git a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentCreatedListener.java b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentCreatedListener.java index be76e105e..50aaf407c 100644 --- a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentCreatedListener.java +++ b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentCreatedListener.java @@ -44,7 +44,8 @@ public class TreeNodeDocumentCreatedListener extends AbstractTreeNodeDocumentListener implements EventListener { - private static final Logger LOGGER = LoggerFactory.getLogger(TreeNodeDocumentCreatedListener.class); + private static final Logger LOGGER = LoggerFactory + .getLogger(TreeNodeDocumentCreatedListener.class); @Requirement private IWebUtilsService webUtilsService; diff --git a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentDeletedListener.java b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentDeletedListener.java index a2ccca629..7aa6d676a 100644 --- a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentDeletedListener.java +++ b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentDeletedListener.java @@ -44,7 +44,8 @@ public class TreeNodeDocumentDeletedListener extends AbstractTreeNodeDocumentListener implements EventListener { - private static final Logger LOGGER = LoggerFactory.getLogger(TreeNodeDocumentDeletedListener.class); + private static final Logger LOGGER = LoggerFactory + .getLogger(TreeNodeDocumentDeletedListener.class); @Requirement private IWebUtilsService webUtilsService; diff --git a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentUpdatedListener.java b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentUpdatedListener.java index e2e028f85..8ee286e03 100644 --- a/src/main/java/com/celements/navigation/listener/TreeNodeDocumentUpdatedListener.java +++ b/src/main/java/com/celements/navigation/listener/TreeNodeDocumentUpdatedListener.java @@ -48,7 +48,8 @@ public class TreeNodeDocumentUpdatedListener extends AbstractTreeNodeDocumentListener implements EventListener { - private static final Logger LOGGER = LoggerFactory.getLogger(TreeNodeDocumentUpdatedListener.class); + private static final Logger LOGGER = LoggerFactory + .getLogger(TreeNodeDocumentUpdatedListener.class); @Requirement private IWebUtilsService webUtilsService; diff --git a/src/main/java/com/celements/navigation/presentation/PresentationNodeData.java b/src/main/java/com/celements/navigation/presentation/PresentationNodeData.java index 6f9f39073..d24e48141 100644 --- a/src/main/java/com/celements/navigation/presentation/PresentationNodeData.java +++ b/src/main/java/com/celements/navigation/presentation/PresentationNodeData.java @@ -1,6 +1,5 @@ package com.celements.navigation.presentation; - public interface PresentationNodeData { } diff --git a/src/main/java/com/celements/navigation/presentation/RenderedExtractPresentationType.java b/src/main/java/com/celements/navigation/presentation/RenderedExtractPresentationType.java index 9299092a8..99b5276aa 100644 --- a/src/main/java/com/celements/navigation/presentation/RenderedExtractPresentationType.java +++ b/src/main/java/com/celements/navigation/presentation/RenderedExtractPresentationType.java @@ -106,7 +106,8 @@ private String getDocExtract(DocumentReference docRef) throws XWikiException { if (extractObj == null) { extractObj = contentDoc.getXObject(documentExtractClassRef, DocumentDetailsClasses.FIELD_DOC_EXTRACT_LANGUAGE, webUtilsService.getDefaultLanguage( - docRef.getLastSpaceReference()), false); + docRef.getLastSpaceReference()), + false); } if (extractObj != null) { return extractObj.getStringValue(DocumentDetailsClasses.FIELD_DOC_EXTRACT_CONTENT); diff --git a/src/main/java/com/celements/navigation/service/TreeNodeService.java b/src/main/java/com/celements/navigation/service/TreeNodeService.java index da984e562..24843028a 100644 --- a/src/main/java/com/celements/navigation/service/TreeNodeService.java +++ b/src/main/java/com/celements/navigation/service/TreeNodeService.java @@ -267,12 +267,14 @@ List fetchNodesForParent(EntityReference parentRef) { private List fetchNodesForParentKey(String parentKey) { long starttotal = System.currentTimeMillis(); long start = starttotal; - List notMappedmenuItems = treeNodeCache.getNotMappedMenuItemsForParentCmd().getTreeNodesForParentKey( - parentKey); + List notMappedmenuItems = treeNodeCache.getNotMappedMenuItemsForParentCmd() + .getTreeNodesForParentKey( + parentKey); LOGGER.debug("fetchNodesForParentKey: time for getNotMappedMenuItemsFromDatabase: {}", (System.currentTimeMillis() - start)); - List mappedTreeNodes = treeNodeCache.getMappedMenuItemsForParentCmd().getTreeNodesForParentKey( - parentKey); + List mappedTreeNodes = treeNodeCache.getMappedMenuItemsForParentCmd() + .getTreeNodesForParentKey( + parentKey); LOGGER.debug("fetchNodesForParentKey: time for getMappedMenuItemsForParentCmd: {}", (System.currentTimeMillis() - start)); start = System.currentTimeMillis(); @@ -449,12 +451,14 @@ private List getNavObjectsOnConfigDocs() { try { BaseCollection navConfigObj = getInheritorFactory().getConfigDocFieldInheritor( INavigationClassConfig.NAVIGATION_CONFIG_CLASS, getParentKey( - getContext().getDoc().getDocumentReference(), false), getContext()).getObject( - "menu_element_name"); + getContext().getDoc().getDocumentReference(), false), + getContext()).getObject( + "menu_element_name"); if (navConfigObj != null) { XWikiDocument navConfigDoc = getContext().getWiki().getDocument( navConfigObj.getDocumentReference(), getContext()); - String navConfigDocWikiName = navConfigDoc.getDocumentReference().getLastSpaceReference().getParent().getName(); + String navConfigDocWikiName = navConfigDoc.getDocumentReference().getLastSpaceReference() + .getParent().getName(); navConfigObjects2 = navConfigDoc.getXObjects(navClassConfig.getNavigationConfigClassRef( navConfigDocWikiName)); } else { diff --git a/src/main/java/com/celements/observation/save/SaveEventOperation.java b/src/main/java/com/celements/observation/save/SaveEventOperation.java index a10a226cf..e128029eb 100644 --- a/src/main/java/com/celements/observation/save/SaveEventOperation.java +++ b/src/main/java/com/celements/observation/save/SaveEventOperation.java @@ -37,7 +37,8 @@ public boolean isDelete() { * A) if an original and new entity (doc, object, ...) exists * B) if the operation is before or after save. */ - public static Optional from(boolean origExists, boolean newExists, boolean beforeSave) { + public static Optional from(boolean origExists, boolean newExists, + boolean beforeSave) { int val = ((newExists ? 0 : 1) << 1) | (origExists ? 0 : 1); if (val < 3) { return Optional.of(values()[val + (beforeSave ? 0 : 3)]); diff --git a/src/main/java/com/celements/observation/save/object/XObjectEventConverter.java b/src/main/java/com/celements/observation/save/object/XObjectEventConverter.java index 819a049d9..65b281bd6 100644 --- a/src/main/java/com/celements/observation/save/object/XObjectEventConverter.java +++ b/src/main/java/com/celements/observation/save/object/XObjectEventConverter.java @@ -56,7 +56,8 @@ public List getEvents() { protected void onEventInternal(Event sourceEvent, XWikiDocument doc, XWikiContext context) { if (doc.getTranslation() == 0) { Map newObjMap = getObjectMap(doc); - Map origObjMap = getObjectMap(doc.getOriginalDocument()); + Map origObjMap = getObjectMap( + doc.getOriginalDocument()); for (ImmutableObjectReference objRef : Sets.union(newObjMap.keySet(), origObjMap.keySet())) { BaseObject newObj = newObjMap.get(objRef); BaseObject origObj = origObjMap.get(objRef); diff --git a/src/main/java/com/celements/pagetype/classes/PageTypePropertiesClass.java b/src/main/java/com/celements/pagetype/classes/PageTypePropertiesClass.java index 25eb4cc95..c75f9afdb 100644 --- a/src/main/java/com/celements/pagetype/classes/PageTypePropertiesClass.java +++ b/src/main/java/com/celements/pagetype/classes/PageTypePropertiesClass.java @@ -51,7 +51,8 @@ public class PageTypePropertiesClass extends AbstractClassDefinition implements CLASS_REF, "show_frame").prettyName("Show Frame").displayType("yesno").build(); public static final ClassField PAGETYPE_PROP_LOAD_RICHTEXT = new BooleanField.Builder( CLASS_REF, "load_richtext").prettyName("Load Richtext Editor").displayType( - "yesno").build(); + "yesno") + .build(); public static final ClassField PAGETYPE_PROP_RTE_WIDTH = new IntField.Builder( CLASS_REF, "rte_width").prettyName("Richtext Editor Width").size(30).build(); public static final ClassField PAGETYPE_PROP_RTE_HEIGHT = new IntField.Builder( @@ -60,12 +61,14 @@ public class PageTypePropertiesClass extends AbstractClassDefinition implements CLASS_REF, "haspagetitle").prettyName("Has Page Title").displayType("yesno").build(); public static final ClassField PAGETYPE_PROP_IS_UNCONNECTED_PARENT = new BooleanField.Builder( CLASS_REF, "unconnected_parent").prettyName("Is Unconnected Parent").displayType( - "yesno").build(); + "yesno") + .build(); public static final ClassField PAGETYPE_PROP_TAG_NAME = new StringField.Builder( CLASS_REF, "tag_name").size(30).prettyName("Tag Name").build(); public static final ClassField PAGETYPE_PROP_INLINE_EDITOR_MODE = new BooleanField.Builder( CLASS_REF, "inline_editor").prettyName("Use Inline Editor Mode").displayType( - "yesno").build(); + "yesno") + .build(); public PageTypePropertiesClass() { super(CLASS_REF); diff --git a/src/main/java/com/celements/validation/IRequestValidationRuleRole.java b/src/main/java/com/celements/validation/IRequestValidationRuleRole.java index 3ad91c6e8..535725bf4 100644 --- a/src/main/java/com/celements/validation/IRequestValidationRuleRole.java +++ b/src/main/java/com/celements/validation/IRequestValidationRuleRole.java @@ -26,7 +26,6 @@ /** * @deprecated instead use {@link IRequestValidationRule} - * */ @Deprecated @ComponentRole diff --git a/src/main/java/com/celements/web/FileAction.java b/src/main/java/com/celements/web/FileAction.java index 199897ec5..8cbdd7754 100644 --- a/src/main/java/com/celements/web/FileAction.java +++ b/src/main/java/com/celements/web/FileAction.java @@ -198,7 +198,8 @@ private boolean renderSkin(String filename, XWikiDocument doc, XWikiContext cont } } else { return renderFileFromObjectField(filename, doc, context) || renderFileFromAttachment( - filename, doc, context) || (SKINS_DIRECTORY.equals(doc.getSpace()) + filename, doc, context) + || (SKINS_DIRECTORY.equals(doc.getSpace()) && renderFileFromFilesystem(getSkinFilePath(filename, doc.getName()), context)); } } catch (IOException e) { diff --git a/src/main/java/com/celements/web/classes/helper/CssMediaType.java b/src/main/java/com/celements/web/classes/helper/CssMediaType.java index 3bd96ca67..14677b138 100644 --- a/src/main/java/com/celements/web/classes/helper/CssMediaType.java +++ b/src/main/java/com/celements/web/classes/helper/CssMediaType.java @@ -20,8 +20,18 @@ package com.celements.web.classes.helper; public enum CssMediaType { - ALL("all"), AURAL("aural"), BRAILLE("braille"), EMBOSSED("embossed"), HANDHELD("handheld"), PRINT( - "print"), PROJECTION("projection"), SCREEN("screen"), TTY("tty"), TV("tv"); + + ALL("all"), + AURAL("aural"), + BRAILLE("braille"), + EMBOSSED("embossed"), + HANDHELD("handheld"), + PRINT( + "print"), + PROJECTION("projection"), + SCREEN("screen"), + TTY("tty"), + TV("tv"); private final String mediaType; diff --git a/src/main/java/com/celements/web/contextmenu/ContextMenuBuilder.java b/src/main/java/com/celements/web/contextmenu/ContextMenuBuilder.java index 11b859998..8930196e6 100644 --- a/src/main/java/com/celements/web/contextmenu/ContextMenuBuilder.java +++ b/src/main/java/com/celements/web/contextmenu/ContextMenuBuilder.java @@ -81,8 +81,7 @@ public void openEvent(ERequestLiteral literal) { } @Override - public void readPropertyKey(String key) { - } + public void readPropertyKey(String key) {} @Override public void stringEvent(String value) { diff --git a/src/main/java/com/celements/web/contextmenu/ERequestLiteral.java b/src/main/java/com/celements/web/contextmenu/ERequestLiteral.java index ce9e4e40d..90142a163 100644 --- a/src/main/java/com/celements/web/contextmenu/ERequestLiteral.java +++ b/src/main/java/com/celements/web/contextmenu/ERequestLiteral.java @@ -26,6 +26,7 @@ import com.celements.sajson.IGenericLiteral; public enum ERequestLiteral implements IGenericLiteral { + ELEMENT_ID(ECommand.VALUE_COMMAND), ELEM_IDS_ARRAY(ECommand.ARRAY_COMMAND, ELEMENT_ID), ELEM_ID_KEY(ECommand.PROPERTY_COMMAND, ELEM_IDS_ARRAY), diff --git a/src/main/java/com/celements/web/css/CSSEngine.java b/src/main/java/com/celements/web/css/CSSEngine.java index 6c670bcae..dcbbfedbe 100644 --- a/src/main/java/com/celements/web/css/CSSEngine.java +++ b/src/main/java/com/celements/web/css/CSSEngine.java @@ -35,8 +35,7 @@ public class CSSEngine implements ICSSEngine { private static final String _CSS_ENGINE_OBJECT_KEY = "com.celements.web.css.CSSEngine"; static final Logger LOGGER = LoggerFactory.getLogger(CSSEngine.class); - private CSSEngine() { - } + private CSSEngine() {} public static ICSSEngine getCSSEngine(XWikiContext context) { Object storeObj = context.get(_CSS_ENGINE_OBJECT_KEY); diff --git a/src/main/java/com/celements/web/medialib/JSONExporter.java b/src/main/java/com/celements/web/medialib/JSONExporter.java index 8c2d298a6..bc46c2b4b 100644 --- a/src/main/java/com/celements/web/medialib/JSONExporter.java +++ b/src/main/java/com/celements/web/medialib/JSONExporter.java @@ -23,8 +23,7 @@ public class JSONExporter { private static JSONExporter exporter; - private JSONExporter() { - } + private JSONExporter() {} public static JSONExporter getInstance() { if (exporter == null) { diff --git a/src/main/java/com/celements/web/service/MobileLoggingScriptService.java b/src/main/java/com/celements/web/service/MobileLoggingScriptService.java index 3b06e0d8e..5be169757 100644 --- a/src/main/java/com/celements/web/service/MobileLoggingScriptService.java +++ b/src/main/java/com/celements/web/service/MobileLoggingScriptService.java @@ -30,7 +30,8 @@ public String dimensionAndAgentLog(String message) { LOGGER.info("dimensionAndAgentLog: mobileDim [" + getContext().getRequest().getParameter( "mobileDim") + "], userAgent [" + getContext().getRequest().getParameter("userAgent") + "], isOrientationLandscape [" + getContext().getRequest().getParameter( - "isOrientationLandscape") + "], message [" + message + "]"); + "isOrientationLandscape") + + "], message [" + message + "]"); Builder jsonBuilder = new Builder(); jsonBuilder.openDictionary(); jsonBuilder.addStringProperty("message", "OK"); diff --git a/src/main/java/com/celements/web/service/PrepareVelocityContextService.java b/src/main/java/com/celements/web/service/PrepareVelocityContextService.java index 679e91d3c..743a15299 100644 --- a/src/main/java/com/celements/web/service/PrepareVelocityContextService.java +++ b/src/main/java/com/celements/web/service/PrepareVelocityContextService.java @@ -484,7 +484,8 @@ private String getSpaceOverwrite(XWikiContext context) { private boolean isGlobalPref(XWikiContext context) { if ((context.getDoc() != null) && (context.getRequest() != null)) { return new DocumentReference(context.getDatabase(), "XWiki", "XWikiPreferences").equals( - context.getDoc().getDocumentReference()) || "globaladmin".equals(context.getRequest().get( + context.getDoc().getDocumentReference()) + || "globaladmin".equals(context.getRequest().get( "editor")); } return false; diff --git a/src/test/java/com/celements/appScript/AppScriptServiceTest.java b/src/test/java/com/celements/appScript/AppScriptServiceTest.java index bf4ee3e7e..c8fee7674 100644 --- a/src/test/java/com/celements/appScript/AppScriptServiceTest.java +++ b/src/test/java/com/celements/appScript/AppScriptServiceTest.java @@ -66,7 +66,8 @@ public void test_isAppScriptRequest_appXpage() { expect(mockRequest.getParameter(eq("s"))).andReturn("myScript").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.login").anyTimes(); + "Content.login") + .anyTimes(); replayDefault(mockRequest); assertTrue(appScriptService.isAppScriptRequest()); verifyDefault(mockRequest); @@ -111,7 +112,8 @@ public void test_isAppScriptRequest_view_overwriteAppDoc_comma() { expect(mockRequest.getParameter(eq("xpage"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.login,Content.WhatsNew").anyTimes(); + "Content.login,Content.WhatsNew") + .anyTimes(); replayDefault(mockRequest); assertTrue(appScriptService.isAppScriptRequest()); verifyDefault(mockRequest); @@ -129,7 +131,8 @@ public void test_isAppScriptRequest_view_overwriteAppDoc_space() { expect(mockRequest.getParameter(eq("xpage"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.WhatsNew Content.login").anyTimes(); + "Content.WhatsNew Content.login") + .anyTimes(); replayDefault(mockRequest); assertTrue(appScriptService.isAppScriptRequest()); verifyDefault(mockRequest); @@ -147,7 +150,8 @@ public void test_isAppScriptRequest_view_overwriteAppDoc_noConfig() { expect(mockRequest.getParameter(eq("xpage"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq("appScriptOverwriteDocs"), eq( "com.celements.appScript.overwriteDocs"), eq("-"), same(context))).andReturn( - "-").anyTimes(); + "-") + .anyTimes(); replayDefault(mockRequest); assertFalse(appScriptService.isAppScriptRequest()); verifyDefault(mockRequest); @@ -165,7 +169,8 @@ public void test_isAppScriptRequest_view_noAppSpace() { expect(mockRequest.getParameter(eq("xpage"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq("appScriptOverwriteDocs"), eq( "com.celements.appScript.overwriteDocs"), eq("-"), same(context))).andReturn( - "-").anyTimes(); + "-") + .anyTimes(); replayDefault(mockRequest); assertFalse(appScriptService.isAppScriptRequest()); verifyDefault(mockRequest); @@ -185,7 +190,8 @@ public void test_getAppScriptNameFromRequestURL_appXpage() { expect(mockRequest.getParameter(eq("s"))).andReturn("myScript").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.login").anyTimes(); + "Content.login") + .anyTimes(); replayDefault(mockRequest); assertEquals("myScript", appScriptService.getAppScriptNameFromRequestURL()); verifyDefault(mockRequest); @@ -268,7 +274,8 @@ public void test_getAppScriptNameFromRequestURL_view_noAppSpace() { IAppScriptService.APP_SCRIPT_XPAGE); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.login").anyTimes(); + "Content.login") + .anyTimes(); replayDefault(mockRequest); assertEquals("", appScriptService.getAppScriptNameFromRequestURL()); verifyDefault(mockRequest); @@ -290,7 +297,8 @@ public void test_getAppScriptNameFromRequestURL_view_overwriteAppDoc() { IAppScriptService.APP_SCRIPT_XPAGE); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Content.WhatsNew Content.login").anyTimes(); + "Content.WhatsNew Content.login") + .anyTimes(); replayDefault(mockRequest); assertEquals("login", appScriptService.getAppScriptNameFromRequestURL()); verifyDefault(mockRequest); @@ -366,7 +374,8 @@ public void test_getAppScriptDocRef_localOverwritesCentral() throws Exception { appScriptDoc).anyTimes(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); expect(emptyCheckMock.isEmptyRTEDocument(eq(appScriptDocRef))).andReturn(false).anyTimes(); replayDefault(mockRequest); DocumentReference expectedAppDocRef = new DocumentReference(context.getDatabase(), @@ -421,7 +430,8 @@ public void test_getScriptNameFromURL_emptyPathInfo() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Main.WebHome").anyTimes(); + "Main.WebHome") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("").anyTimes(); replayDefault(mockRequest); assertEquals("WebHome", appScriptService.getScriptNameFromURL()); @@ -440,7 +450,8 @@ public void test_getScriptNameFromURL_explicit_DefaultSpace() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Main.Test").anyTimes(); + "Main.Test") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("/Main/Test").anyTimes(); replayDefault(mockRequest); assertEquals("Test", appScriptService.getScriptNameFromURL()); @@ -460,7 +471,8 @@ public void test_getScriptNameFromURL_explicit_DefaultPage() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Test.WebHome").anyTimes(); + "Test.WebHome") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("/Test/WebHome").anyTimes(); replayDefault(mockRequest); assertEquals("Test/WebHome", appScriptService.getScriptNameFromURL()); @@ -480,7 +492,8 @@ public void test_getScriptNameFromURL_implicit_DefaultPage() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Test.WebHome").anyTimes(); + "Test.WebHome") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("/Test/").anyTimes(); replayDefault(mockRequest); assertEquals("Test/WebHome", appScriptService.getScriptNameFromURL()); @@ -500,7 +513,8 @@ public void test_getScriptNameFromURL_explicit_DefaultSpace_DefaultPage() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "Main.WebHome").anyTimes(); + "Main.WebHome") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("/Main/WebHome").anyTimes(); replayDefault(mockRequest); assertEquals("WebHome", appScriptService.getScriptNameFromURL()); @@ -520,7 +534,8 @@ public void test_getScriptNameFromURL_export_action() { expect(mockRequest.getParameter(eq("s"))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq(IAppScriptService.APP_SCRIPT_XWPREF_OVERW_DOCS), eq( IAppScriptService.APP_SCRIPT_CONF_OVERW_DOCS), eq("-"), same(context))).andReturn( - "TestSpace.TestScript").anyTimes(); + "TestSpace.TestScript") + .anyTimes(); expect(mockRequest.getPathInfo()).andReturn("/export/TestSpace/TestScript").anyTimes(); replayDefault(mockRequest); assertEquals("TestSpace/TestScript", appScriptService.getScriptNameFromURL()); diff --git a/src/test/java/com/celements/cells/RenderingEngineTest.java b/src/test/java/com/celements/cells/RenderingEngineTest.java index de3e600e0..e5492fc88 100644 --- a/src/test/java/com/celements/cells/RenderingEngineTest.java +++ b/src/test/java/com/celements/cells/RenderingEngineTest.java @@ -149,7 +149,7 @@ public void test_renderPageLayoutPartial() { renderStrategyMock.endRendering(); expect(renderStrategyMock .isRenderSubCells(eq(node.getDocumentReference()))).andReturn(false) - .once(); + .once(); replayDefault(); renderingEngine.renderLayoutPartial(node); verifyDefault(); diff --git a/src/test/java/com/celements/common/collections/ListUtilsTest.java b/src/test/java/com/celements/common/collections/ListUtilsTest.java index 95b255d71..cb32d519a 100644 --- a/src/test/java/com/celements/common/collections/ListUtilsTest.java +++ b/src/test/java/com/celements/common/collections/ListUtilsTest.java @@ -30,8 +30,7 @@ public class ListUtilsTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testImplode_null() { diff --git a/src/test/java/com/celements/emptycheck/internal/DefaultEmptyDocStrategyTest.java b/src/test/java/com/celements/emptycheck/internal/DefaultEmptyDocStrategyTest.java index cb05760af..0abc733f1 100644 --- a/src/test/java/com/celements/emptycheck/internal/DefaultEmptyDocStrategyTest.java +++ b/src/test/java/com/celements/emptycheck/internal/DefaultEmptyDocStrategyTest.java @@ -405,7 +405,8 @@ public void testIsEmptyRTEDocument_nbsp() { assertTrue("Non breaking spaces in a paragraph should be treated as empty", defEmptyDocStrategy.isEmptyRTEDocument(getTestDoc("

 

"))); assertTrue("Non breaking spaces in a paragraph with white spaces" - + " should be treated as empty", defEmptyDocStrategy.isEmptyRTEDocument(getTestDoc( + + " should be treated as empty", + defEmptyDocStrategy.isEmptyRTEDocument(getTestDoc( "

 

"))); assertFalse("Regular Text should not be treated as empty.", defEmptyDocStrategy.isEmptyRTEDocument(getTestDoc("

adsf  

"))); diff --git a/src/test/java/com/celements/emptycheck/internal/NextNonEmptyChildrenCommandTest.java b/src/test/java/com/celements/emptycheck/internal/NextNonEmptyChildrenCommandTest.java index 5cba586fc..907c312f3 100644 --- a/src/test/java/com/celements/emptycheck/internal/NextNonEmptyChildrenCommandTest.java +++ b/src/test/java/com/celements/emptycheck/internal/NextNonEmptyChildrenCommandTest.java @@ -81,7 +81,8 @@ public void testGetNextNonEmptyChildren_notEmpty() throws Exception { expect(xwiki.getDocument(eq(documentRef), same(context))).andReturn(myXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(documentRef, nextNonEmptChildCmd.getNextNonEmptyChildren(documentRef)); verifyDefault(); @@ -96,7 +97,8 @@ public void testGetNextNonEmptyChildren_empty_but_noChildren() throws Exception Collections.emptyList()).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertNull(nextNonEmptChildCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -119,7 +121,8 @@ public void testGetNextNonEmptyChildren_empty_with_nonEmptyChildren() throws Exc expect(xwiki.getDocument(eq(expectedChildDocRef), same(context))).andReturn(childXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, nextNonEmptChildCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -155,7 +158,8 @@ public void testGetNextNonEmptyChildren_empty_with_nonEmptyChildren_notFirstChil expect(xwiki.getDocument(eq(expectedChildDocRef), same(context))).andReturn(childXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, nextNonEmptChildCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -188,7 +192,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren() throws childChildXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, nextNonEmptChildCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -231,7 +236,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren_reconize_ Collections.emptyList()).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertNull(nextNonEmptChildCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); diff --git a/src/test/java/com/celements/emptycheck/service/EmptyCheckServiceTest.java b/src/test/java/com/celements/emptycheck/service/EmptyCheckServiceTest.java index ee53df22e..fee0b6770 100644 --- a/src/test/java/com/celements/emptycheck/service/EmptyCheckServiceTest.java +++ b/src/test/java/com/celements/emptycheck/service/EmptyCheckServiceTest.java @@ -93,7 +93,8 @@ public void testGetCheckImplNamesConfig_bugReturningEmtpy() { public void testGetCheckImplNamesConfig_noConfig() { expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(Arrays.asList("default"), emptyCheckService.getCheckImplNamesConfig()); verifyDefault(); @@ -103,7 +104,8 @@ public void testGetCheckImplNamesConfig_noConfig() { public void testGetCheckImplNamesConfig_commaSeparated() { expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default,sharedContent").anyTimes(); + "default,sharedContent") + .anyTimes(); replayDefault(); assertEquals(Arrays.asList("default", "sharedContent"), emptyCheckService.getCheckImplNamesConfig()); @@ -114,7 +116,8 @@ public void testGetCheckImplNamesConfig_commaSeparated() { public void testGetCheckImplNames_semicolonSeparated() { expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default;sharedContent").anyTimes(); + "default;sharedContent") + .anyTimes(); replayDefault(); assertEquals(Arrays.asList("default", "sharedContent"), emptyCheckService.getCheckImplNamesConfig()); @@ -136,7 +139,8 @@ public void testIsEmptyRTEDocument_two_impl_oneNotEmpty_skipAfterNotEmpty() { expect(testOneMock.isEmptyRTEDocument(eq(docRef))).andReturn(false).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertFalse(emptyCheckService.isEmptyRTEDocument(docRef)); verifyDefault(); @@ -158,7 +162,8 @@ public void testIsEmptyRTEDocument_two_impl_oneNotEmpty() { expect(testTwoMock.isEmptyRTEDocument(eq(docRef))).andReturn(false).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertFalse(emptyCheckService.isEmptyRTEDocument(docRef)); verifyDefault(); @@ -180,7 +185,8 @@ public void testIsEmptyRTEDocument_two_impl_isEmpty() { expect(testTwoMock.isEmptyRTEDocument(eq(docRef))).andReturn(true).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertTrue(emptyCheckService.isEmptyRTEDocument(docRef)); verifyDefault(); @@ -201,7 +207,8 @@ public void testIsEmptyDocument_two_impl_oneNotEmpty_skipAfterNotEmpty() { expect(testOneMock.isEmptyDocument(eq(docRef))).andReturn(false).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertFalse(emptyCheckService.isEmptyDocument(docRef)); verifyDefault(); @@ -223,7 +230,8 @@ public void testIsEmptyDocument_two_impl_oneNotEmpty() { expect(testTwoMock.isEmptyDocument(eq(docRef))).andReturn(false).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertFalse(emptyCheckService.isEmptyDocument(docRef)); verifyDefault(); @@ -245,7 +253,8 @@ public void testIsEmptyDocument_two_impl_isEmpty() { expect(testTwoMock.isEmptyDocument(eq(docRef))).andReturn(true).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "testOne;testTwo;;wrongTest;").anyTimes(); + "testOne;testTwo;;wrongTest;") + .anyTimes(); replayDefault(); assertTrue(emptyCheckService.isEmptyDocument(docRef)); verifyDefault(); @@ -260,7 +269,8 @@ public void testGetNextNonEmptyChildren_notEmpty() throws Exception { expect(xwiki.getDocument(eq(documentRef), same(context))).andReturn(myXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(documentRef, emptyCheckService.getNextNonEmptyChildren(documentRef)); verifyDefault(); @@ -276,7 +286,8 @@ public void testGetNextNonEmptyChildren_empty_but_noChildren() throws Exception noChildrenList).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(emptyDocRef, emptyCheckService.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -299,7 +310,8 @@ public void testGetNextNonEmptyChildren_empty_with_nonEmptyChildren() throws Exc expect(xwiki.getDocument(eq(expectedChildDocRef), same(context))).andReturn(childXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, emptyCheckService.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -332,7 +344,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren() throws childChildXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, emptyCheckService.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -375,7 +388,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren_reconize_ Collections.emptyList()).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(emptyDocRef, emptyCheckService.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); diff --git a/src/test/java/com/celements/migrator/MenuNameMappingCelements2_8Test.java b/src/test/java/com/celements/migrator/MenuNameMappingCelements2_8Test.java index d89d0af98..74439960c 100644 --- a/src/test/java/com/celements/migrator/MenuNameMappingCelements2_8Test.java +++ b/src/test/java/com/celements/migrator/MenuNameMappingCelements2_8Test.java @@ -51,13 +51,12 @@ public void testGetNavigationClasses() { verifyAll(); } - - private void replayAll(Object ... mocks) { + private void replayAll(Object... mocks) { replay(xwiki); replay(mocks); } - private void verifyAll(Object ... mocks) { + private void verifyAll(Object... mocks) { verify(xwiki); verify(mocks); } diff --git a/src/test/java/com/celements/navigation/TreeNodeTest.java b/src/test/java/com/celements/navigation/TreeNodeTest.java index 19c7d2917..d7f542f32 100644 --- a/src/test/java/com/celements/navigation/TreeNodeTest.java +++ b/src/test/java/com/celements/navigation/TreeNodeTest.java @@ -102,7 +102,8 @@ public void test_ConstructorParentSpaceRef_strategy_lazy() { context.getDatabase())), 1, partNameGetterMock); expect(partNameGetterMock.getPartName(eq(docRef2))).andThrow(new RuntimeException( "partNameGetter must be called lazily for" - + " NotMappedMenuItems for performance reasons.")).anyTimes(); + + " NotMappedMenuItems for performance reasons.")) + .anyTimes(); replayDefault(); assertTrue(treeNode.equals(treeNodeTest)); verifyDefault(); diff --git a/src/test/java/com/celements/navigation/factories/JavaNavigationFactoryTest.java b/src/test/java/com/celements/navigation/factories/JavaNavigationFactoryTest.java index c99ce7fb3..12961c15f 100644 --- a/src/test/java/com/celements/navigation/factories/JavaNavigationFactoryTest.java +++ b/src/test/java/com/celements/navigation/factories/JavaNavigationFactoryTest.java @@ -85,9 +85,12 @@ public void testGetNavigationConfigString() throws Exception { String cmCssClass = "cm_cssTestClass2"; final NavigationConfig expectedNavConfig = new NavigationConfig.Builder().configName( configName).fromHierarchyLevel(fromHierarchyLevel).toHierarchyLevel( - toHierarchyLevel).showInactiveToLevel(showInactiveToLevel).menuPart(menuPart).dataType( - dataType).nodeSpaceRef(nodeSpaceRef).layoutType(layoutType).nrOfItemsPerPage( - itemsPerPage).cmCssClass(cmCssClass).build(); + toHierarchyLevel) + .showInactiveToLevel(showInactiveToLevel).menuPart(menuPart).dataType( + dataType) + .nodeSpaceRef(nodeSpaceRef).layoutType(layoutType).nrOfItemsPerPage( + itemsPerPage) + .cmCssClass(cmCssClass).build(); expect(testConfigurator.handles(eq(pageTypeRef))).andReturn(true); expect(testConfigurator.getNavigationConfig(eq(pageTypeRef))).andReturn(expectedNavConfig); replayDefault(); diff --git a/src/test/java/com/celements/navigation/presentation/RenderedContentDynLoadPresentationTypeTest.java b/src/test/java/com/celements/navigation/presentation/RenderedContentDynLoadPresentationTypeTest.java index db5f966b4..b13842670 100644 --- a/src/test/java/com/celements/navigation/presentation/RenderedContentDynLoadPresentationTypeTest.java +++ b/src/test/java/com/celements/navigation/presentation/RenderedContentDynLoadPresentationTypeTest.java @@ -114,7 +114,8 @@ public void test_writeNodeContent_emptyQuery() throws Exception { "id=\"N3:Content:Content.MyPage\"").once(); expect(nav.addCssClasses(eq(currentDocRef), eq(true), eq(isFirstItem), eq(isLastItem), eq( isLeaf), eq(1))).andReturn("class=\"cel_cm_navigation_menuitem" - + " first cel_nav_isLeaf RichText\"").once(); + + " first cel_nav_isLeaf RichText\"") + .once(); expect(urlServiceMock.getURL(eq(currentDocRef), eq("view"), eq(queryString))) .andReturn(expectedUrl); XWikiRequest requestMock = createDefaultMock(XWikiRequest.class); @@ -151,7 +152,8 @@ public void test_writeNodeContent_withQuery() throws Exception { "id=\"N3:Content:Content.MyPage\"").once(); expect(nav.addCssClasses(eq(currentDocRef), eq(true), eq(isFirstItem), eq(isLastItem), eq( isLeaf), eq(1))).andReturn("class=\"cel_cm_navigation_menuitem" - + " first cel_nav_isLeaf RichText\"").once(); + + " first cel_nav_isLeaf RichText\"") + .once(); expect(urlServiceMock.getURL(eq(currentDocRef), eq("view"), eq(queryString))) .andReturn(expectedUrl); XWikiRequest requestMock = createDefaultMock(XWikiRequest.class); diff --git a/src/test/java/com/celements/navigation/presentation/RenderedContentPresentationTypeTest.java b/src/test/java/com/celements/navigation/presentation/RenderedContentPresentationTypeTest.java index 071402236..cd638bfd6 100644 --- a/src/test/java/com/celements/navigation/presentation/RenderedContentPresentationTypeTest.java +++ b/src/test/java/com/celements/navigation/presentation/RenderedContentPresentationTypeTest.java @@ -104,7 +104,8 @@ public void testWriteNodeContent() throws Exception { "id=\"N3:Content:Content.MyPage\"").once(); expect(nav.addCssClasses(eq(currentDocRef), eq(true), eq(isFirstItem), eq(isLastItem), eq( isLeaf), eq(1))).andReturn("class=\"cel_cm_navigation_menuitem" - + " first cel_nav_isLeaf RichText\"").once(); + + " first cel_nav_isLeaf RichText\"") + .once(); replayDefault(); vtPresType.writeNodeContent(outStream, isFirstItem, isLastItem, currentDocRef, isLeaf, 1, nav); assertEquals("
> pageTypeRefCache = xObjPageTypeCache.getPageTypeRefCache(); + Map> pageTypeRefCache = xObjPageTypeCache + .getPageTypeRefCache(); assertNotNull(pageTypeRefCache); PageTypeReference pageTypeRefMack = createDefaultMock(PageTypeReference.class); pageTypeRefCache.put(wikiRef, Arrays.asList(pageTypeRefMack)); diff --git a/src/test/java/com/celements/rights/CelementsRightServiceImplTest.java b/src/test/java/com/celements/rights/CelementsRightServiceImplTest.java index 1e7ff4afe..954733a5a 100644 --- a/src/test/java/com/celements/rights/CelementsRightServiceImplTest.java +++ b/src/test/java/com/celements/rights/CelementsRightServiceImplTest.java @@ -47,7 +47,8 @@ public void testCheckRight_publishNotActive() throws XWikiRightNotFoundException Collection emptyGroupsList = Collections.emptyList(); expect(gs.getAllGroupsReferencesForMember(eq(new DocumentReference(getContext().getDatabase(), "XWiki", "XWikiAllGroup")), eq(0), eq(0), same(getContext()))).andReturn( - emptyGroupsList).anyTimes(); + emptyGroupsList) + .anyTimes(); expect(xwiki.isVirtualMode()).andReturn(true).anyTimes(); XWikiDocument doc = new XWikiDocument(new DocumentReference(getContext().getDatabase(), "TestSpace", "TestDoc")); @@ -78,7 +79,8 @@ public void testCheckRight_publishActive_defaultNoObject() throws XWikiRightNotF Collection emptyGroupsList = Collections.emptyList(); expect(gs.getAllGroupsReferencesForMember(eq(new DocumentReference(getContext().getDatabase(), "XWiki", "XWikiAllGroup")), eq(0), eq(0), same(getContext()))).andReturn( - emptyGroupsList).anyTimes(); + emptyGroupsList) + .anyTimes(); expect(xwiki.isVirtualMode()).andReturn(true).anyTimes(); expect(xwiki.getSpacePreference(eq("publishdate_active"), eq("TestSpace"), eq("-1"), same( getContext()))).andReturn("1").anyTimes(); @@ -109,7 +111,8 @@ public void testCheckRight_publishActive_unpublished() throws XWikiRightNotFound Collection emptyGroupsList = Collections.emptyList(); expect(gs.getAllGroupsReferencesForMember(eq(new DocumentReference(getContext().getDatabase(), "XWiki", "XWikiAllGroup")), eq(0), eq(0), same(getContext()))).andReturn( - emptyGroupsList).anyTimes(); + emptyGroupsList) + .anyTimes(); expect(xwiki.isVirtualMode()).andReturn(true).anyTimes(); expect(xwiki.getSpacePreference(eq("publishdate_active"), eq("TestSpace"), eq("-1"), same( getContext()))).andReturn("1").anyTimes(); @@ -147,7 +150,8 @@ public void testCheckRight_publishActive_published() throws XWikiRightNotFoundEx Collection emptyGroupsList = Collections.emptyList(); expect(gs.getAllGroupsReferencesForMember(eq(new DocumentReference(getContext().getDatabase(), "XWiki", "XWikiAllGroup")), eq(0), eq(0), same(getContext()))).andReturn( - emptyGroupsList).anyTimes(); + emptyGroupsList) + .anyTimes(); expect(xwiki.isVirtualMode()).andReturn(true).anyTimes(); expect(xwiki.getSpacePreference(eq("publishdate_active"), eq("TestSpace"), eq("-1"), same( getContext()))).andReturn("1").anyTimes(); diff --git a/src/test/java/com/celements/sajson/LexicalParserTest.java b/src/test/java/com/celements/sajson/LexicalParserTest.java index deab42172..1439471cf 100644 --- a/src/test/java/com/celements/sajson/LexicalParserTest.java +++ b/src/test/java/com/celements/sajson/LexicalParserTest.java @@ -290,6 +290,7 @@ private void verifyAll(Object... mocks) { } private enum ERulesLiteral implements IGenericLiteral { + OBJECT_VALUE(ECommand.VALUE_COMMAND), RULE_ATTRIBUTE(OBJECT_VALUE, "name", "*"), CON_OR_ACT_ATTRIBUTE(OBJECT_VALUE, "type"), diff --git a/src/test/java/com/celements/web/contextmenu/TestRequestHandler.java b/src/test/java/com/celements/web/contextmenu/TestRequestHandler.java index 8d30365ad..f9820c8b3 100644 --- a/src/test/java/com/celements/web/contextmenu/TestRequestHandler.java +++ b/src/test/java/com/celements/web/contextmenu/TestRequestHandler.java @@ -29,22 +29,17 @@ public class TestRequestHandler extends AbstractEventHandler { /** * @param requestLiteralTest */ - public TestRequestHandler() { - } + public TestRequestHandler() {} @Override - public void closeEvent(ERequestLiteral literal) { - } + public void closeEvent(ERequestLiteral literal) {} @Override - public void openEvent(ERequestLiteral literal) { - } + public void openEvent(ERequestLiteral literal) {} @Override - public void readPropertyKey(String key) { - } + public void readPropertyKey(String key) {} @Override - public void stringEvent(String value) { - } + public void stringEvent(String value) {} } diff --git a/src/test/java/com/celements/web/medialib/JSONExporterTest.java b/src/test/java/com/celements/web/medialib/JSONExporterTest.java index ce6e9a7c0..3cefb09e0 100644 --- a/src/test/java/com/celements/web/medialib/JSONExporterTest.java +++ b/src/test/java/com/celements/web/medialib/JSONExporterTest.java @@ -25,8 +25,7 @@ public class JSONExporterTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testExport() { diff --git a/src/test/java/com/celements/web/medialib/datafields/BooleanTest.java b/src/test/java/com/celements/web/medialib/datafields/BooleanTest.java index 797ce12fa..7a6470148 100644 --- a/src/test/java/com/celements/web/medialib/datafields/BooleanTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/BooleanTest.java @@ -25,8 +25,7 @@ public class BooleanTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testGetColumnId() { diff --git a/src/test/java/com/celements/web/medialib/datafields/DateTest.java b/src/test/java/com/celements/web/medialib/datafields/DateTest.java index 558d00e4c..59a53b9f5 100644 --- a/src/test/java/com/celements/web/medialib/datafields/DateTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/DateTest.java @@ -25,8 +25,7 @@ public class DateTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testGetColumnId() { diff --git a/src/test/java/com/celements/web/medialib/datafields/DefaultTest.java b/src/test/java/com/celements/web/medialib/datafields/DefaultTest.java index cb40bd0f4..3230af253 100644 --- a/src/test/java/com/celements/web/medialib/datafields/DefaultTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/DefaultTest.java @@ -25,8 +25,7 @@ public class DefaultTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testGetColumnId() { diff --git a/src/test/java/com/celements/web/medialib/datafields/JSONDataFieldRowTest.java b/src/test/java/com/celements/web/medialib/datafields/JSONDataFieldRowTest.java index ca00ba1d0..7fc92a2ab 100644 --- a/src/test/java/com/celements/web/medialib/datafields/JSONDataFieldRowTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/JSONDataFieldRowTest.java @@ -25,8 +25,7 @@ public class JSONDataFieldRowTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testHasNext() { diff --git a/src/test/java/com/celements/web/medialib/datafields/NumberTest.java b/src/test/java/com/celements/web/medialib/datafields/NumberTest.java index 372b8f6e3..5a451cced 100644 --- a/src/test/java/com/celements/web/medialib/datafields/NumberTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/NumberTest.java @@ -25,8 +25,7 @@ public class NumberTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testGetColumnId() { diff --git a/src/test/java/com/celements/web/medialib/datafields/StringTest.java b/src/test/java/com/celements/web/medialib/datafields/StringTest.java index 8476df22f..784b63b73 100644 --- a/src/test/java/com/celements/web/medialib/datafields/StringTest.java +++ b/src/test/java/com/celements/web/medialib/datafields/StringTest.java @@ -25,8 +25,7 @@ public class StringTest { @Before - public void prepareTest() throws Exception { - } + public void prepareTest() throws Exception {} @Test public void testGetColumnId() { diff --git a/src/test/java/com/celements/web/plugin/cmd/AttachmentURLCommandTest.java b/src/test/java/com/celements/web/plugin/cmd/AttachmentURLCommandTest.java index 0cfdfca42..b9195ddeb 100644 --- a/src/test/java/com/celements/web/plugin/cmd/AttachmentURLCommandTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/AttachmentURLCommandTest.java @@ -63,7 +63,7 @@ public void setUp_AttachmentURLCommandTest() throws Exception { context.setURLFactory(mockURLFactory); expect(wiki.getXWikiPreference(eq("celdefaultAttAction"), eq( "celements.attachmenturl.defaultaction"), eq("file"), same(context))) - .andReturn("file").anyTimes(); + .andReturn("file").anyTimes(); } @Test @@ -108,7 +108,7 @@ public void test_getAttachmentURL_fullInternalLink() throws Exception { blaAtt.setFilename("bla.txt"); expect(getMock(IAttachmentServiceRole.class) .getAttachmentNameEqual(anyObject(AttachmentReference.class))) - .andReturn(blaAtt); + .andReturn(blaAtt); replayDefault(); String attachmentURL = attUrlCmd.getAttachmentURL("celements2web:A.B;bla.txt", context); verifyDefault(); @@ -125,7 +125,7 @@ public void test_getAttachmentURL_partInternalLink() throws Exception { blaAtt.setFilename(attRef.getName()); expect(getMock(IAttachmentServiceRole.class) .getAttachmentNameEqual(anyObject(AttachmentReference.class))) - .andReturn(blaAtt); + .andReturn(blaAtt); replayDefault(); String attachmentURL = attUrlCmd.getAttachmentURL("A.B;bla.txt", context); verifyDefault(); @@ -138,7 +138,7 @@ public void test_getAttachmentURL_partInternalLink_notExists() throws Exception new DocumentReference(context.getDatabase(), "A", "B")); expect(getMock(IAttachmentServiceRole.class) .getAttachmentNameEqual(anyObject(AttachmentReference.class))) - .andThrow(new AttachmentNotExistsException(attRef)); + .andThrow(new AttachmentNotExistsException(attRef)); replayDefault(); assertNull(attUrlCmd.getAttachmentURL("A.B;bla.txt", context)); verifyDefault(); diff --git a/src/test/java/com/celements/web/plugin/cmd/CelMailConfigurationTest.java b/src/test/java/com/celements/web/plugin/cmd/CelMailConfigurationTest.java index d42c51a8a..a0f3a1b8b 100644 --- a/src/test/java/com/celements/web/plugin/cmd/CelMailConfigurationTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/CelMailConfigurationTest.java @@ -75,7 +75,8 @@ public void testGetDefaultGeneralSenderAddress() { public void testGetFrom() { expect(xwiki.getXWikiPreference(eq("smtp_from"), eq( CelMailConfiguration.MAIL_DEFAULT_SMTP_FROM_KEY), eq(""), same(context))).andReturn( - "test@unit.test").once(); + "test@unit.test") + .once(); replayDefault(); assertEquals("test@unit.test", celMailConfiguration.getFrom()); assertEquals("multiple reads must not lead to multiple config reads.", "test@unit.test", @@ -87,7 +88,8 @@ public void testGetFrom() { public void testGetFrom_setBackToEmpty() { expect(xwiki.getXWikiPreference(eq("smtp_from"), eq( CelMailConfiguration.MAIL_DEFAULT_SMTP_FROM_KEY), eq(""), same(context))).andReturn( - "test@unit.test").times(2); + "test@unit.test") + .times(2); replayDefault(); assertEquals("test@unit.test", celMailConfiguration.getFrom()); celMailConfiguration.setFrom(""); @@ -100,7 +102,8 @@ public void testGetFrom_setBackToEmpty() { public void testGetFrom_overwrittenBy_setFrom() { expect(xwiki.getXWikiPreference(eq("smtp_from"), eq( CelMailConfiguration.MAIL_DEFAULT_SMTP_FROM_KEY), eq(""), same(context))).andReturn( - "test@unit.test").anyTimes(); + "test@unit.test") + .anyTimes(); replayDefault(); celMailConfiguration.setFrom("myTest@specialUnit.test"); assertEquals("myTest@specialUnit.test", celMailConfiguration.getFrom()); @@ -111,10 +114,12 @@ public void testGetFrom_overwrittenBy_setFrom() { public void testGetFrom_fallbackToAdminEmailAdress() { expect(xwiki.getXWikiPreference(eq("smtp_from"), eq( CelMailConfiguration.MAIL_DEFAULT_SMTP_FROM_KEY), eq(""), same(context))).andReturn( - "").once(); + "") + .once(); expect(xwiki.getXWikiPreference(eq("admin_email"), eq( CelMailConfiguration.MAIL_DEFAULT_ADMIN_EMAIL_KEY), eq(""), same(context))).andReturn( - "test@unit.test").once(); + "test@unit.test") + .once(); replayDefault(); assertEquals("test@unit.test", celMailConfiguration.getFrom()); assertEquals("multiple reads must not lead to multiple config reads.", "test@unit.test", diff --git a/src/test/java/com/celements/web/plugin/cmd/CelSendMailTest.java b/src/test/java/com/celements/web/plugin/cmd/CelSendMailTest.java index 803705d6b..d19213cf9 100644 --- a/src/test/java/com/celements/web/plugin/cmd/CelSendMailTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/CelSendMailTest.java @@ -191,13 +191,16 @@ public void testSendMail() { ""), same(context))).andReturn("").anyTimes(); expect(xwiki.getXWikiPreference(eq("smtp_server_username"), eq( "celements.mail.default.smtp_server_username"), eq(""), same(context))).andReturn( - "").anyTimes(); + "") + .anyTimes(); expect(xwiki.getXWikiPreference(eq("smtp_server_password"), eq( "celements.mail.default.smtp_server_password"), eq(""), same(context))).andReturn( - "").anyTimes(); + "") + .anyTimes(); expect(xwiki.getXWikiPreference(eq("javamail_extra_props"), eq( "celements.mail.default.javamail_extra_props"), eq(""), same(context))).andReturn( - "").anyTimes(); + "") + .anyTimes(); replayDefault(); assertEquals(1, sendMail.sendMail()); verifyDefault(); diff --git a/src/test/java/com/celements/web/plugin/cmd/EmptyCheckCommandTest.java b/src/test/java/com/celements/web/plugin/cmd/EmptyCheckCommandTest.java index ebfe03b22..6c2e2ce18 100644 --- a/src/test/java/com/celements/web/plugin/cmd/EmptyCheckCommandTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/EmptyCheckCommandTest.java @@ -136,7 +136,8 @@ public void testIsEmptyRTEDocument_nbsp() { assertTrue("Non breaking spaces in a paragraph should be treated as empty", emptyChildCheckCmd.isEmptyRTEDocument(getTestDoc("

 

"))); assertTrue("Non breaking spaces in a paragraph with white spaces" - + " should be treated as empty", emptyChildCheckCmd.isEmptyRTEDocument(getTestDoc( + + " should be treated as empty", + emptyChildCheckCmd.isEmptyRTEDocument(getTestDoc( "

 

"))); assertFalse("Regular Text should not be treated as empty.", emptyChildCheckCmd.isEmptyRTEDocument(getTestDoc("

adsf  

"))); @@ -152,7 +153,8 @@ public void testGetNextNonEmptyChildren_notEmpty() throws Exception { expect(xwiki.getDocument(eq(documentRef), same(context))).andReturn(myXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(documentRef, emptyChildCheckCmd.getNextNonEmptyChildren(documentRef)); verifyDefault(); @@ -169,7 +171,8 @@ public void testGetNextNonEmptyChildren_empty_but_noChildren() throws Exception noChildrenList).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(emptyDocRef, emptyChildCheckCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -193,7 +196,8 @@ public void testGetNextNonEmptyChildren_empty_with_nonEmptyChildren() throws Exc expect(xwiki.getDocument(eq(expectedChildDocRef), same(context))).andReturn(childXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, emptyChildCheckCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -227,7 +231,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren() throws childChildXdoc).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(expectedChildDocRef, emptyChildCheckCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); @@ -271,7 +276,8 @@ public void testGetNextNonEmptyChildren_empty_recurse_on_EmptyChildren_reconize_ Collections.emptyList()).once(); expect(xwiki.getXWikiPreference(eq(IEmptyCheckRole.EMPTYCHECK_MODULS_PREF_NAME), eq( "celements.emptycheckModuls"), eq("default"), same(context))).andReturn( - "default").anyTimes(); + "default") + .anyTimes(); replayDefault(); assertEquals(emptyDocRef, emptyChildCheckCmd.getNextNonEmptyChildren(emptyDocRef)); verifyDefault(); diff --git a/src/test/java/com/celements/web/plugin/cmd/FileBaseTagsCmdTest.java b/src/test/java/com/celements/web/plugin/cmd/FileBaseTagsCmdTest.java index bbf33eb02..0c49ec274 100644 --- a/src/test/java/com/celements/web/plugin/cmd/FileBaseTagsCmdTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/FileBaseTagsCmdTest.java @@ -206,7 +206,8 @@ public void testGetTagDocument_docExists_addingMenuItem() throws Exception { "tag1"); expect(mockTreeNodeSrv.getSubNodesForParent(eq(celFileBaseRef), isA( InternalRightsFilter.class))).andReturn(Arrays.asList(new TreeNode(tagDocRef2, null, - 0))).atLeastOnce(); + 0))) + .atLeastOnce(); XWikiDocument existingTagDoc = new XWikiDocument(tagDocRef); existingTagDoc.setNew(false); BaseClass menuItemBaseClass = createDefaultMock(BaseClass.class); @@ -302,7 +303,8 @@ public void testGetOrCreateTagDocument_docExists_addingMenuItem() throws Excepti "tag1"); expect(mockTreeNodeSrv.getSubNodesForParent(eq(celFileBaseRef), isA( InternalRightsFilter.class))).andReturn(Arrays.asList(new TreeNode(tagDocRef2, null, - 0))).atLeastOnce(); + 0))) + .atLeastOnce(); XWikiDocument existingTagDoc = new XWikiDocument(tagDocRef); existingTagDoc.setNew(false); BaseClass menuItemBaseClass = createDefaultMock(BaseClass.class); @@ -349,7 +351,8 @@ public void testGetOrCreateTagDocument_docNotExists_Exception() throws Exception "tag1"); expect(mockTreeNodeSrv.getSubNodesForParent(eq(celFileBaseRef), isA( InternalRightsFilter.class))).andReturn(Arrays.asList(new TreeNode(tagDocRef2, null, - 0))).atLeastOnce(); + 0))) + .atLeastOnce(); BaseClass menuItemBaseClass = createDefaultMock(BaseClass.class); expect(xwiki.getXClass(eq(navClassConfig.getMenuItemClassRef()), same(context))).andReturn( menuItemBaseClass).once(); diff --git a/src/test/java/com/celements/web/plugin/cmd/RemoteUserValidatorTest.java b/src/test/java/com/celements/web/plugin/cmd/RemoteUserValidatorTest.java index 5a8d8c8cf..aa52c8eac 100644 --- a/src/test/java/com/celements/web/plugin/cmd/RemoteUserValidatorTest.java +++ b/src/test/java/com/celements/web/plugin/cmd/RemoteUserValidatorTest.java @@ -88,7 +88,8 @@ public void test_isValidUserJSON_noUser() throws XWikiException { HttpServletRequest httpRequest = createDefaultMock(HttpServletRequest.class); expect(request.getHttpServletRequest()).andReturn(httpRequest).once(); expect(httpRequest.getRemoteHost()).andReturn(" "); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.absent()); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.absent()); replayDefault(); // important only call setUser after replayDefault. In unstable-2.0 branch setUser @@ -107,7 +108,8 @@ public void test_isValidUserJSON_notAuthenticated() throws XWikiException { expect(request.getHttpServletRequest()).andReturn(httpRequest).once(); expect(httpRequest.getRemoteHost()).andReturn(" "); User userMock = createUserMock("XWiki.7sh2lya35"); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.of(userMock)); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.of(userMock)); expect(xWikiAuthServiceMock.authenticate(eq("XWiki.7sh2lya35"), eq("pwd"), same( context))).andReturn(null).once(); @@ -128,7 +130,8 @@ public void test_isValidUserJSON_validUser_wrongGroup() throws XWikiException { expect(request.getHttpServletRequest()).andReturn(httpRequest).once(); expect(httpRequest.getRemoteHost()).andReturn(" "); User userMock = createUserMock("XWiki.7sh2lya35"); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.of(userMock)); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.of(userMock)); expectAuth("XWiki.7sh2lya35", "pwd"); expectInGroup(userMock, "grp", false); @@ -149,7 +152,8 @@ public void test_isValidUserJSON_validUser_isInGroup_inactiveUser() throws XWiki expect(request.getHttpServletRequest()).andReturn(httpRequest).once(); expect(httpRequest.getRemoteHost()).andReturn(" "); User userMock = createUserMock("XWiki.7sh2lya35"); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.of(userMock)); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.of(userMock)); expectAuth("XWiki.7sh2lya35", "pwd"); expectInGroup(userMock, "grp", true); expect(userMock.isActive()).andReturn(false); @@ -171,7 +175,8 @@ public void testIsValidUserJSON_validUser_isInGroup_noRetGroup() throws XWikiExc expect(request.getHttpServletRequest()).andReturn(httpRequest).once(); expect(httpRequest.getRemoteHost()).andReturn(" "); User userMock = createUserMock("XWiki.7sh2lya35"); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.of(userMock)); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.of(userMock)); expectAuth("XWiki.7sh2lya35", "pwd"); expectInGroup(userMock, "grp", true); expect(userMock.isActive()).andReturn(true); @@ -181,7 +186,8 @@ public void testIsValidUserJSON_validUser_isInGroup_noRetGroup() throws XWikiExc // calls xwiki.isVirtualMode context.setUser("xwiki:XWiki.superadmin"); assertEquals("{\"access\" : \"true\", \"username\" : \"blabla@mail.com\", " - + "\"group_membership\" : {}}", cmd.isValidUserJSON("blabla@mail.com", "pwd", "grp", null, + + "\"group_membership\" : {}}", + cmd.isValidUserJSON("blabla@mail.com", "pwd", "grp", null, context)); verifyDefault(); } @@ -199,7 +205,8 @@ public void testIsValidUserJSON_validUser_isInGroup_retGroup() throws XWikiExcep expect(context.getMessageTool()).andReturn(getMessageToolStub()).anyTimes(); User userMock = createUserMock("XWiki.7sh2lya35"); - expect(userServiceMock.getUserForLoginField("blabla@mail.com")).andReturn(Optional.of(userMock)); + expect(userServiceMock.getUserForLoginField("blabla@mail.com")) + .andReturn(Optional.of(userMock)); expectAuth("XWiki.7sh2lya35", "pwd"); expect(userMock.isActive()).andReturn(true); List returnGroups = Arrays.asList("XWiki.TestGroup1", "XWiki.TestGroup2", @@ -285,7 +292,8 @@ public void test_getResultJSON() throws Exception { replayDefault(); assertEquals("{\"access\" : \"true\", \"username\" : \"user@synventis.com\", " - + "\"group_membership\" : {}}", cmd.getResultJSON(userMock, "user@synventis.com", null, + + "\"group_membership\" : {}}", + cmd.getResultJSON(userMock, "user@synventis.com", null, context)); verifyDefault(); } diff --git a/src/test/java/com/celements/web/service/PrepareVelocityContextServiceTest.java b/src/test/java/com/celements/web/service/PrepareVelocityContextServiceTest.java index 6b29498fa..4dca67543 100644 --- a/src/test/java/com/celements/web/service/PrepareVelocityContextServiceTest.java +++ b/src/test/java/com/celements/web/service/PrepareVelocityContextServiceTest.java @@ -317,7 +317,8 @@ public void testFixLanguagePreference_addCookieOnlyOnce() throws Exception { expect(xwiki.isMultiLingual(same(context))).andReturn(true).atLeastOnce(); expect(xwiki.getXWikiPreference(eq("celSuppressInvalidLang"), eq( "celements.language.suppressInvalid"), eq("0"), same(context))).andReturn( - "1").atLeastOnce(); + "1") + .atLeastOnce(); responseMock.addCookie(isA(Cookie.class)); expectLastCall().once(); expect(requestMock.getParameter(eq("language"))).andReturn("fr").atLeastOnce(); @@ -354,7 +355,8 @@ public void testIsInvalidLanguageOrDefault_yes() { "de")).atLeastOnce(); expect(xwiki.getXWikiPreference(eq("celSuppressInvalidLang"), eq( "celements.language.suppressInvalid"), eq("0"), same(context))).andReturn( - "1").atLeastOnce(); + "1") + .atLeastOnce(); replayDefault(); assertFalse(prepVeloContextService.isInvalidLanguageOrDefault("en")); verifyDefault(); @@ -366,7 +368,8 @@ public void testIsInvalidLanguageOrDefault_no() { "de")).atLeastOnce(); expect(xwiki.getXWikiPreference(eq("celSuppressInvalidLang"), eq( "celements.language.suppressInvalid"), eq("0"), same(context))).andReturn( - "1").atLeastOnce(); + "1") + .atLeastOnce(); replayDefault(); assertTrue(prepVeloContextService.isInvalidLanguageOrDefault("fr")); verifyDefault(); @@ -376,7 +379,8 @@ public void testIsInvalidLanguageOrDefault_no() { public void testIsInvalidLanguageOrDefault_no_noSuppress() { expect(xwiki.getXWikiPreference(eq("celSuppressInvalidLang"), eq( "celements.language.suppressInvalid"), eq("0"), same(context))).andReturn( - "0").atLeastOnce(); + "0") + .atLeastOnce(); replayDefault(); assertFalse(prepVeloContextService.isInvalidLanguageOrDefault("fr")); verifyDefault();