From a173bb7f7716fc2c59e56dc6fb30c1af619bb696 Mon Sep 17 00:00:00 2001
From: Simon Danner <simon.danner@gmx.de>
Date: Sat, 21 Mar 2020 13:04:26 +0100
Subject: [PATCH] Applied new code style to all classes

---
 .idea/codeStyles/Project.xml                  | 16 +++-
 .../ojcms/beans/AbstractEncapsulatedData.java |  9 ++-
 .../de/adito/ojcms/beans/BeanContainer.java   | 11 ++-
 .../java/de/adito/ojcms/beans/BeanCopies.java | 28 ++++---
 .../adito/ojcms/beans/BeanCreationEvents.java | 26 +++---
 .../adito/ojcms/beans/BeanFieldFactory.java   |  9 ++-
 .../adito/ojcms/beans/BeanInternalEvents.java | 41 ++++++----
 .../adito/ojcms/beans/EReferableResolver.java | 20 +++--
 .../beans/EncapsulatedBeanContainerData.java  |  7 +-
 .../ojcms/beans/EncapsulatedBeanData.java     | 21 ++---
 .../main/java/de/adito/ojcms/beans/IBean.java | 59 ++++++++------
 .../de/adito/ojcms/beans/IBeanContainer.java  | 24 +++---
 .../ojcms/beans/IBeanEventPublisher.java      | 14 ++--
 .../ojcms/beans/IEncapsulatedBeanData.java    |  2 +-
 .../java/de/adito/ojcms/beans/IMapBean.java   |  1 +
 .../de/adito/ojcms/beans/IModifiableBean.java |  7 +-
 .../java/de/adito/ojcms/beans/MapBean.java    | 44 +++++++----
 .../java/de/adito/ojcms/beans/OJBean.java     |  1 +
 .../java/de/adito/ojcms/beans/OJFields.java   | 20 +++--
 .../ListBasedBeanContainerDataSource.java     |  2 +-
 .../datasource/MapBasedBeanDataSource.java    |  8 +-
 .../beans/exceptions/OJRuntimeException.java  |  2 +-
 .../bean/InvalidChainException.java           |  3 +-
 .../copy/BeanCopyNotSupportedException.java   |  3 +-
 .../field/BeanFieldCreationException.java     |  7 +-
 .../field/BeanFieldDoesNotExistException.java |  3 +-
 .../field/BeanFieldDuplicateException.java    |  4 +-
 .../beans/literals/fields/FieldJavaTypes.java | 24 +++---
 .../ojcms/beans/literals/fields/IField.java   |  7 +-
 .../literals/fields/types/ContainerField.java |  2 +-
 .../literals/fields/types/DateField.java      |  4 +-
 .../literals/fields/types/EnumField.java      |  3 +-
 .../literals/fields/types/GenericField.java   |  8 +-
 .../literals/fields/types/ListField.java      |  4 +-
 .../beans/literals/fields/types/MapField.java |  2 +-
 .../ojcms/beans/references/BeanReference.java | 14 ++--
 .../beans/references/IReferenceProvider.java  | 21 ++---
 .../beans/statistics/IStatisticData.java      |  4 +-
 .../statistics/IntervalStatisticsMap.java     |  6 +-
 .../ojcms/beans/statistics/StatisticData.java |  1 +
 .../adito/ojcms/beans/util/BeanReflector.java | 30 +++----
 .../adito/ojcms/beans/BeanContainerTest.java  | 28 ++++---
 .../de/adito/ojcms/beans/BeanCopyTest.java    |  6 +-
 .../ojcms/beans/BeanCreationEventsTest.java   | 24 +++---
 .../ojcms/beans/BeanFieldConverterTest.java   |  4 +-
 .../adito/ojcms/beans/BeanFieldCopyTest.java  | 31 ++++----
 .../adito/ojcms/beans/BeanObserverTest.java   | 79 ++++++++++---------
 .../ojcms/beans/BeanOptionalFieldTest.java    |  9 ++-
 .../java/de/adito/ojcms/beans/BeanTest.java   |  8 +-
 .../literals/fields/types/MapFieldTest.java   | 11 ++-
 .../beans/references/BeanReferenceTest.java   |  9 ++-
 .../beans/statistics/BeanStatisticsTest.java  | 20 ++---
 .../de/adito/ojcms/cdi/AbstractCdiTest.java   |  4 +-
 .../java/de/adito/ojcms/cdi/CdiContainer.java |  7 +-
 .../ojcms/cdi/CustomScopesExtension.java      |  2 +-
 .../cdi/context/AbstractCustomContext.java    |  4 +-
 .../ojcms/cdi/startup/StartupExtension.java   |  6 +-
 .../datasource/BeanProducerExtension.java     |  4 +-
 .../PersistentContainerDatasource.java        |  4 +-
 .../visual/AbstractVisualTransformator.java   |  6 +-
 .../rest/config/FileBasedDatabaseConfig.java  |  4 +-
 .../ojcms/sqlbuilder/AbstractSQLBuilder.java  | 39 ++++-----
 .../sqlbuilder/AbstractSQLStatement.java      |  2 +-
 .../ojcms/sqlbuilder/OJSQLBuilderFactory.java |  2 +-
 .../sqlbuilder/OJSQLBuilderForTableImpl.java  |  3 +-
 .../definition/IColumnIdentification.java     |  8 +-
 .../definition/IColumnValueTuple.java         |  7 +-
 .../definition/INumericValueAdaption.java     |  8 +-
 .../definition/column/EColumnType.java        | 10 +--
 .../definition/column/IColumnDefinition.java  |  6 +-
 .../definition/column/IColumnType.java        |  5 +-
 .../AbstractStatementConcatenation.java       |  6 +-
 .../condition/IMultipleCondition.java         |  6 +-
 .../definition/condition/IWhereCondition.java | 34 ++++----
 .../condition/IWhereConditions.java           |  4 +-
 .../definition/condition/InConditionImpl.java |  8 +-
 .../definition/condition/WhereModifiers.java  |  3 +
 .../executors/StatementExecution.java         | 12 ++-
 .../ojcms/sqlbuilder/format/ESeparator.java   |  4 +-
 .../sqlbuilder/format/StatementFormatter.java | 30 +++----
 .../platform/AbstractDatabasePlatform.java    |  2 +-
 .../ExternalConnectionProvider.java           |  4 +-
 .../adito/ojcms/sqlbuilder/result/Result.java |  4 +-
 .../ojcms/sqlbuilder/result/ResultRow.java    |  4 +-
 .../sqlbuilder/result/SingleColumnResult.java |  4 +-
 .../serialization/DefaultValueSerializer.java |  8 +-
 .../AbstractConditionStatement.java           | 11 +--
 .../types/select/AbstractSelect.java          |  4 +-
 .../cleanup/SingleBeanRowCleanup.java         |  6 +-
 .../connection/SQLCdiProducers.java           | 12 +--
 .../model/SingleBeanPersistenceModel.java     | 55 +++++++------
 .../column/BeanColumnIdentification.java      | 16 ----
 .../model/column/BeanColumnValueTuple.java    |  4 +-
 .../model/column/BeanWhereCondition.java      |  2 +-
 .../datasource/util/BeanSQLSerializer.java    |  4 +-
 ...Config.java => DatabaseConfigForTest.java} |  2 +-
 .../model/SingleBeanPersistenceModelTest.java |  8 +-
 .../OverallTransactionalChanges.java          |  7 +-
 .../annotations/ETransactionMode.java         |  2 +-
 .../transactions/api/AbstractIndexKey.java    |  6 +-
 .../ojcms/transactions/api/SingleBeanKey.java |  4 +-
 .../adito/ojcms/utils/IndexBasedIterator.java |  5 +-
 .../de/adito/ojcms/utils/IndexChecker.java    |  1 +
 .../adito/ojcms/utils/OptionalNullable.java   |  3 +-
 .../de/adito/ojcms/utils/StringUtility.java   |  1 +
 .../utils/collections/IIndexedCache.java      | 12 +--
 .../collections/MapBasedIndexedCache.java     | 43 +++++-----
 .../collections/WeakInputSortedContainer.java |  6 +-
 .../ojcms/utils/copy/SneakyCopyUtils.java     | 21 +++--
 .../readonly/ReadOnlyInvocationHandler.java   |  6 +-
 .../ojcms/utils/IndexBasedIteratorTest.java   | 46 +++++++----
 .../collections/InputSortedElementsTest.java  |  6 +-
 .../WeakInputSortedContainerTest.java         |  2 +-
 .../ojcms/utils/copy/SneakyCopyUtilsTest.java | 10 +--
 .../readonly/ReadOnlyInvocationTest.java      |  2 +-
 115 files changed, 718 insertions(+), 604 deletions(-)
 rename ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/{TestDatabaseConfig.java => DatabaseConfigForTest.java} (91%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1b44fdc..4b7a1cb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -21,6 +21,7 @@
     <option name="METHOD_BRACE_STYLE" value="2" />
     <JavaCodeStyleSettings>
       <option name="PARAMETER_NAME_PREFIX" value="p" />
+      <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
       <option name="JD_P_AT_EMPTY_LINES" value="false" />
@@ -69,9 +70,22 @@
       <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
       <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
       <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="PREFER_PARAMETERS_WRAP" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="RESOURCE_LIST_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ASSERT_STATEMENT_WRAP" value="1" />
       <option name="WRAP_LONG_LINES" value="true" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="1" />
       <option name="WRAP_ON_TYPING" value="0" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/AbstractEncapsulatedData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/AbstractEncapsulatedData.java
index 16df706..e1e6c2a 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/AbstractEncapsulatedData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/AbstractEncapsulatedData.java
@@ -28,8 +28,7 @@
 @EncapsulatedData
 abstract class AbstractEncapsulatedData<ELEMENT, DATASOURCE extends IDataSource> implements IEncapsulatedData<ELEMENT, DATASOURCE>
 {
-  private final Map<IEncapsulatedBeanData, Set<BeanReference>> weakReferencesMapping =
-      Collections.synchronizedMap(new WeakHashMap<>());
+  private final Map<IEncapsulatedBeanData, Set<BeanReference>> weakReferencesMapping = Collections.synchronizedMap(new WeakHashMap<>());
   private final Map<Class<? extends IEvent>, PublishSubject<? extends IEvent>> eventSubjects = new ConcurrentHashMap<>();
   private DATASOURCE datasource;
 
@@ -52,8 +51,8 @@ public void setDataSource(@NotNull DATASOURCE pDataSource)
   @Override
   public Set<BeanReference> getDirectReferences()
   {
-    return weakReferencesMapping.values().stream()
-        .flatMap(Collection::stream)
+    return weakReferencesMapping.values().stream() //
+        .flatMap(Collection::stream) //
         .collect(Collectors.toSet());
   }
 
@@ -69,6 +68,7 @@ public void removeReference(IBean pBean, IField<?> pField)
   {
     final IEncapsulatedBeanData encapsulatedData = requestEncapsulatedDataForField(pBean, pField);
     boolean removed = false;
+
     if (weakReferencesMapping.containsKey(encapsulatedData))
     {
       final Set<BeanReference> references = weakReferencesMapping.get(encapsulatedData);
@@ -86,6 +86,7 @@ public void removeReference(IBean pBean, IField<?> pField)
         }
       }
     }
+
     if (!removed)
       throw new OJInternalException("Unable to remove reference! bean: " + pBean + " field: " + pField);
   }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanContainer.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanContainer.java
index 159b5a3..4e7386b 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanContainer.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanContainer.java
@@ -60,10 +60,9 @@ public IEncapsulatedBeanContainerData<BEAN> getEncapsulatedData()
   @Override
   public String toString()
   {
-    return getClass().getSimpleName() + "{beanType: " + getBeanType().getSimpleName() + ", count: " + size() + "}\nbeans:\n" +
-        stream()
-            .map(Objects::toString)
-            .collect(Collectors.joining("\n"));
+    return getClass().getSimpleName() + "{beanType: " + getBeanType().getSimpleName() + ", count: " + size() + "}\nbeans:\n" + stream() //
+        .map(Objects::toString) //
+        .collect(Collectors.joining("\n"));
   }
 
   @Override
@@ -78,8 +77,8 @@ public boolean equals(Object pOther)
     //noinspection unchecked
     final BeanContainer<BEAN> otherContainer = (BeanContainer<BEAN>) pOther;
     final int size = size();
-    return size == otherContainer.size() &&
-        IntStream.range(0, size).allMatch(pIndex -> Objects.equals(getBean(pIndex), otherContainer.getBean(pIndex)));
+    return size == otherContainer.size() && IntStream.range(0, size).allMatch(
+        pIndex -> Objects.equals(getBean(pIndex), otherContainer.getBean(pIndex)));
   }
 
   @Override
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCopies.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCopies.java
index a0cffdb..d48ce9a 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCopies.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCopies.java
@@ -50,7 +50,7 @@ static IBean doCreateCopy(IBean pOriginal, ECopyMode pMode, CustomFieldCopy<?>..
     final Class<? extends IBean> beanType = BeanReflector.requiresDeclaredBeanType(pOriginal.getClass());
     final List<IField<?>> fieldOrder = pOriginal.streamFields().collect(Collectors.toList());
 
-    final IBean copyInstance = _createBeanPerDefaultConstructorAndSetDataSource(beanType)
+    final IBean copyInstance = _createBeanPerDefaultConstructorAndSetDataSource(beanType) //
         .orElse(_createBeanSneakyAndInjectEncapsulatedData(beanType, fieldOrder));
 
     return _setValues(pOriginal, copyInstance, pMode, pCustomCopies);
@@ -64,7 +64,8 @@ static IBean doCreateCopy(IBean pOriginal, ECopyMode pMode, CustomFieldCopy<?>..
    *
    * @param pOriginal              the original bean to create the copy of
    * @param pMode                  the copy mode
-   * @param pCustomConstructorCall a custom constructor call defined as function (the input is the existing bean, the function should create the copy)
+   * @param pCustomConstructorCall a custom constructor call defined as function (the input is the existing bean, the function should
+   *                               create the copy)
    * @param pCustomCopies          a collection of custom copy mechanisms for specific bean fields
    * @return a copy of the bean
    */
@@ -138,15 +139,17 @@ private static IBean _setValues(IBean pOriginal, IBean pCopy, ECopyMode pMode, C
   {
     final _BeanValueCopyCreator beanValueCopyCreator = new _BeanValueCopyCreator(pMode, pCustomCopies);
     //noinspection unchecked,RedundantCast
-    requestEncapsulatedData(pOriginal).streamFields()
-        .forEach(pField -> pCopy.setValue((IField) pField, beanValueCopyCreator.copyFieldValue((IField) pField, pOriginal.getValue(pField))));
+    requestEncapsulatedData(pOriginal).streamFields() //
+        .forEach(
+            pField -> pCopy.setValue((IField) pField, beanValueCopyCreator.copyFieldValue((IField) pField, pOriginal.getValue(pField))));
 
     //If required set non bean values as well
     if (pMode.shouldCopyAllFields())
     {
       final _NonBeanValueCopyCreator copyCreator = new _NonBeanValueCopyCreator(pMode);
-      BeanReflector.reflectDeclaredNonBeanFields(pOriginal.getClass())
-          .forEach(pField -> {
+      BeanReflector.reflectDeclaredNonBeanFields(pOriginal.getClass()) //
+          .forEach(pField ->
+          {
             try
             {
               if (!pField.isAccessible())
@@ -182,8 +185,8 @@ private _BeanValueCopyCreator(ECopyMode pMode, CustomFieldCopy<?>[] pCustomCopie
     {
       mode = pMode;
       customCopies = pCustomCopies;
-      fieldCustomCopyMapping = Arrays.stream(pCustomCopies)
-          .collect(Collectors.toMap(CustomFieldCopy::getField, CustomFieldCopy::getCopyCreator));
+      fieldCustomCopyMapping = Arrays.stream(pCustomCopies).collect(
+          Collectors.toMap(CustomFieldCopy::getField, CustomFieldCopy::getCopyCreator));
     }
 
     /**
@@ -202,9 +205,8 @@ <VALUE> VALUE copyFieldValue(IField<VALUE> pField, VALUE pValue)
       try
       {
         //noinspection unchecked
-        return (VALUE) Optional.ofNullable(fieldCustomCopyMapping.get(pField))
-            .map(pCreator -> pCreator.apply(pValue))
-            .orElse(pField.copyValue(pValue, mode, customCopies));
+        return (VALUE) Optional.ofNullable(fieldCustomCopyMapping.get(pField)).map(pCreator -> pCreator.apply(pValue)).orElse(
+            pField.copyValue(pValue, mode, customCopies));
       }
       catch (BeanCopyNotSupportedException pE)
       {
@@ -244,8 +246,8 @@ Object copyValue(Field pDeclaredField, Object pValue)
 
       final Class<?> dataType = pDeclaredField.getType();
       final Type genericType = pDeclaredField.getGenericType();
-      final Type[] genericTypes = genericType instanceof ParameterizedType ?
-          ((ParameterizedType) genericType).getActualTypeArguments() : new Type[0];
+      final Type[] genericTypes =
+          genericType instanceof ParameterizedType ? ((ParameterizedType) genericType).getActualTypeArguments() : new Type[0];
       try
       {
         return SneakyCopyUtils.createDeepCopy(pValue, dataType, genericTypes);
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCreationEvents.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCreationEvents.java
index 380ccf3..e6e3099 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCreationEvents.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanCreationEvents.java
@@ -23,7 +23,8 @@
 public final class BeanCreationEvents
 {
   private static final Map<Class<? extends IBean>, PublishSubject<IBean>> PUBLISHERS_BY_TYPE = new ConcurrentHashMap<>();
-  private static final Map<Class<? extends Annotation>, PublishSubject<? extends BeanCreationEvent<?>>> PUBLISHERS_BY_ANNOTATION = new ConcurrentHashMap<>();
+  private static final Map<Class<? extends Annotation>, PublishSubject<? extends BeanCreationEvent<?>>> PUBLISHERS_BY_ANNOTATION =
+      new ConcurrentHashMap<>();
 
   private BeanCreationEvents()
   {
@@ -39,7 +40,7 @@ public static <BEAN extends IBean> Observable<BEAN> observeCreationByBeanType(Cl
   {
     _getObservableAnnotation(pBeanType); //check, if annotation is present
     //noinspection unchecked
-    return (Observable<BEAN>) PUBLISHERS_BY_TYPE.computeIfAbsent(pBeanType, pType -> PublishSubject.create())
+    return (Observable<BEAN>) PUBLISHERS_BY_TYPE.computeIfAbsent(pBeanType, pType -> PublishSubject.create()) //
         .observeOn(Schedulers.newThread());
   }
 
@@ -55,8 +56,8 @@ public static <ANNOTATION extends Annotation> Observable<BeanCreationEvent<ANNOT
     if (!_isObservableAnnotation(pAnnotationType))
       throw new BeanCreationNotObservableException(pAnnotationType.getName() + " is not a valid creation observer annotation.");
     //noinspection unchecked
-    return (Observable<BeanCreationEvent<ANNOTATION>>) PUBLISHERS_BY_ANNOTATION.computeIfAbsent(pAnnotationType, pType -> PublishSubject.create())
-        .observeOn(Schedulers.newThread());
+    return (Observable<BeanCreationEvent<ANNOTATION>>) PUBLISHERS_BY_ANNOTATION.computeIfAbsent(pAnnotationType,
+        pType -> PublishSubject.create()).observeOn(Schedulers.newThread());
   }
 
   /**
@@ -89,7 +90,9 @@ static void fireCreation(IBean pCreatedBean)
     if (PUBLISHERS_BY_ANNOTATION.containsKey(annotationType))
     {
       //noinspection unchecked
-      final PublishSubject<BeanCreationEvent<?>> publisher = (PublishSubject<BeanCreationEvent<?>>) PUBLISHERS_BY_ANNOTATION.get(annotationType);
+      final PublishSubject<BeanCreationEvent<?>> publisher = (PublishSubject<BeanCreationEvent<?>>) PUBLISHERS_BY_ANNOTATION.get(
+          annotationType);
+
       publisher.onNext(new BeanCreationEvent<>(pCreatedBean, beanType.getAnnotation(annotationType)));
     }
   }
@@ -112,7 +115,7 @@ static boolean hasObservableAnnotation(Class<? extends IBean> pBeanType)
    */
   private static boolean _observersPresent()
   {
-    return Stream.concat(PUBLISHERS_BY_TYPE.values().stream(), PUBLISHERS_BY_ANNOTATION.values().stream())
+    return Stream.concat(PUBLISHERS_BY_TYPE.values().stream(), PUBLISHERS_BY_ANNOTATION.values().stream()) //
         .anyMatch(PublishSubject::hasObservers);
   }
 
@@ -126,8 +129,7 @@ private static boolean _observersPresent()
    */
   private static Class<? extends Annotation> _getObservableAnnotation(Class<? extends IBean> pBeanType)
   {
-    return _searchObservableAnnotation(pBeanType)
-        .orElseThrow(() -> new BeanCreationNotObservableException(pBeanType));
+    return _searchObservableAnnotation(pBeanType).orElseThrow(() -> new BeanCreationNotObservableException(pBeanType));
   }
 
   /**
@@ -139,10 +141,10 @@ private static Class<? extends Annotation> _getObservableAnnotation(Class<? exte
    */
   private static Optional<Class<? extends Annotation>> _searchObservableAnnotation(Class<? extends IBean> pBeanType)
   {
-    return Stream.of(pBeanType.getDeclaredAnnotations())
-        .map(Annotation::annotationType)
-        .filter(BeanCreationEvents::_isObservableAnnotation)
-        .findAny()
+    return Stream.of(pBeanType.getDeclaredAnnotations()) //
+        .map(Annotation::annotationType) //
+        .filter(BeanCreationEvents::_isObservableAnnotation) //
+        .findAny() //
         .map(pAnnotationType -> (Class<? extends Annotation>) pAnnotationType);
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanFieldFactory.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanFieldFactory.java
index fd2459f..df64236 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanFieldFactory.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanFieldFactory.java
@@ -69,13 +69,14 @@ static <VALUE, FIELD extends IField<VALUE>> FIELD createField(Class<FIELD> pFiel
     {
       final Optional<Class<?>> optionalGenericType = _getGenericType(pFieldType, pGenericTypeSupplier);
       final boolean isOptional = pActiveCondition != null;
+
       //Constructor argument distinction between generic and non generic values (generic types provide their type additionally)
-      final Class[] constructorArgumentTypes = optionalGenericType
-          .map(pType -> new Class[]{Class.class, String.class, Collection.class, boolean.class, boolean.class})
+      final Class[] constructorArgumentTypes = optionalGenericType //
+          .map(pType -> new Class[]{Class.class, String.class, Collection.class, boolean.class, boolean.class}) //
           .orElseGet(() -> new Class[]{String.class, Collection.class, boolean.class, boolean.class});
 
-      final Object[] constructorArguments = optionalGenericType
-          .map(pClass -> new Object[]{pClass, pName, pAnnotations, isOptional, pIsPrivate})
+      final Object[] constructorArguments = optionalGenericType //
+          .map(pClass -> new Object[]{pClass, pName, pAnnotations, isOptional, pIsPrivate}) //
           .orElseGet(() -> new Object[]{pName, pAnnotations, isOptional, pIsPrivate});
 
       //Create the field by using the reflected constructor
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanInternalEvents.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanInternalEvents.java
index 2acc585..0625979 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanInternalEvents.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/BeanInternalEvents.java
@@ -46,8 +46,10 @@ static <E, D extends IDataSource, ENCAPSULATED extends IEncapsulatedData<E, D>>
       IEncapsulatedDataHolder<E, D, ENCAPSULATED> pEncapsulatedHolder)
   {
     final ENCAPSULATED encapsulatedData = requireNonNull(pEncapsulatedHolder).getEncapsulatedData();
+
     if (encapsulatedData == null)
       throw new MissingDataCoreException(pEncapsulatedHolder.getClass());
+
     return encapsulatedData;
   }
 
@@ -62,8 +64,10 @@ static <E, D extends IDataSource, ENCAPSULATED extends IEncapsulatedData<E, D>>
   static IEncapsulatedBeanData requestEncapsulatedDataForField(IBean pBean, IField<?> pField)
   {
     final IEncapsulatedBeanData encapsulatedBeanData = requestEncapsulatedData(pBean);
+
     if (!encapsulatedBeanData.containsField(requireNonNull(pField)))
       throw new BeanFieldDoesNotExistException(pBean, pField);
+
     return encapsulatedBeanData;
   }
 
@@ -114,8 +118,8 @@ static <VALUE> void setValueAndPropagate(IBean pBean, IField<VALUE> pField, VALU
     //We have to check the states of the optional fields and then change the value with a following propagation of the change
     final IBeanFieldActivePredicate fieldActiveSupplier = pBean.getFieldActivePredicate();
     //Store before active optional fields to detect differences later on
-    final List<IField<?>> optionalActiveFields = encapsulatedData.streamFields()
-        .filter(pBeanField -> pBeanField.isOptional() && fieldActiveSupplier.isOptionalActive(pBeanField))
+    final List<IField<?>> optionalActiveFields = encapsulatedData.streamFields() //
+        .filter(pBeanField -> pBeanField.isOptional() && fieldActiveSupplier.isOptionalActive(pBeanField)) //
         .collect(Collectors.toList());
 
     final VALUE oldValue = encapsulatedData.getValue(pField); //Store old value for later comparison
@@ -128,14 +132,14 @@ static <VALUE> void setValueAndPropagate(IBean pBean, IField<VALUE> pField, VALU
       return;
 
     //Find newly activated optional fields and fire them as added fields
-    encapsulatedData.streamFields()
-        .filter(pBeanField -> pBeanField.isOptional() && fieldActiveSupplier.isOptionalActive(pBeanField))
-        .filter(pActiveField -> !optionalActiveFields.remove(pActiveField))
+    encapsulatedData.streamFields() //
+        .filter(pBeanField -> pBeanField.isOptional() && fieldActiveSupplier.isOptionalActive(pBeanField)) //
+        .filter(pActiveField -> !optionalActiveFields.remove(pActiveField)) //
         .forEach(pNewActiveField -> propagateChange(new BeanFieldAddition<>(pBean, pNewActiveField)));
 
     //Fire the remaining as removed fields
-    optionalActiveFields.stream()
-        .map(pBeforeActiveField -> (IField) pBeforeActiveField)
+    optionalActiveFields.stream() //
+        .map(pBeforeActiveField -> (IField) pBeforeActiveField) //
         .forEach(pRemovedField -> propagateChange(new BeanFieldRemoval<>(pBean, pRemovedField, encapsulatedData.getValue(pRemovedField))));
 
     //IMPORTANT: The value change itself must be fired after all optional fields have their correct active state
@@ -147,16 +151,14 @@ static <VALUE> void setValueAndPropagate(IBean pBean, IField<VALUE> pField, VALU
     {
       final Function<Object, Stream<IReferable>> resolver = pReferenceField.resolverType().getResolver();
       //Remove old references based on the old value
-      resolver.apply(oldValue)
-          .forEach(pReferable -> pReferable.removeReference(pBean, pField));
+      resolver.apply(oldValue).forEach(pReferable -> pReferable.removeReference(pBean, pField));
       //Add the new ones
-      resolver.apply(pNewValue)
-          .forEach(pReferable -> pReferable.addWeakReference(pBean, pField));
+      resolver.apply(pNewValue).forEach(pReferable -> pReferable.addWeakReference(pBean, pField));
     });
 
     //Add a statistic entry if necessary
-    Optional.ofNullable(encapsulatedData.getStatisticData().get(pField))
-        .map(pData -> (IStatisticData<VALUE>) pData)
+    Optional.ofNullable(encapsulatedData.getStatisticData().get(pField)) //
+        .map(pData -> (IStatisticData<VALUE>) pData) //
         .ifPresent(pData -> pData.addEntry(pNewValue));
   }
 
@@ -173,8 +175,8 @@ static <BEAN extends IBean> void beanAdded(IBeanContainer<BEAN> pContainer, BEAN
   {
     //Pass the references of the container to the beans as well
     final IEncapsulatedBeanData beanEncapsulated = requestEncapsulatedData(pBean);
-    pContainer.getDirectReferences()
-        .forEach(pNode -> beanEncapsulated.addWeakReference(pNode.getBean(), pNode.getField()));
+    pContainer.getDirectReferences().forEach(pNode -> beanEncapsulated.addWeakReference(pNode.getBean(), pNode.getField()));
+
     _tryAddStatisticEntry(pContainer);
     propagateChange(new BeanContainerAddition<>(pContainer, pBean));
   }
@@ -192,9 +194,11 @@ static <BEAN extends IBean> void beanRemoved(IBeanContainer<BEAN> pContainer, BE
   {
     //Remove the references from the bean, which were created through the container
     final IEncapsulatedBeanData beanEncapsulated = requestEncapsulatedData(pBean);
-    pBean.getDirectReferences().stream()
+
+    pBean.getDirectReferences().stream() //
         .filter(pNode -> pNode.getBean().getValue(pNode.getField()) == pContainer) //Filter the references to the affected container
         .forEach(pNode -> beanEncapsulated.removeReference(pNode.getBean(), pNode.getField()));
+
     _tryAddStatisticEntry(pContainer);
     propagateChange(new BeanContainerRemoval<>(pContainer, pBean));
   }
@@ -213,8 +217,10 @@ static <BEAN extends IBean> Optional<BEAN> removeFromContainer(IBeanContainer<BE
                                                                  Function<IEncapsulatedBeanContainerData<BEAN>, BEAN> pDeleteFunction)
   {
     final BEAN removedBean = pDeleteFunction.apply(requestEncapsulatedData(pContainer));
+
     if (removedBean != null)
       beanRemoved(pContainer, removedBean);
+
     return Optional.ofNullable(removedBean);
   }
 
@@ -233,6 +239,7 @@ static <BEAN extends IBean> boolean doRemoveBeanIf(IBeanContainer<BEAN> pContain
   {
     final Iterator<BEAN> it = requestEncapsulatedData(pContainer).iterator();
     boolean removed = false;
+
     while (it.hasNext())
     {
       final BEAN bean = it.next();
@@ -241,10 +248,12 @@ static <BEAN extends IBean> boolean doRemoveBeanIf(IBeanContainer<BEAN> pContain
         it.remove();
         beanRemoved(pContainer, bean);
         removed = true;
+
         if (pBreak)
           break;
       }
     }
+
     return removed;
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EReferableResolver.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EReferableResolver.java
index ceab95c..ee5b736 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EReferableResolver.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EReferableResolver.java
@@ -58,8 +58,8 @@ Function<Object, Stream<IReferable>> getResolver()
    */
   private static Stream<IReferable> _single(Object pValue)
   {
-    return _tryGetEncapsulated(pValue)
-        .map(pEncapsulated -> Stream.of((IReferable) pEncapsulated))
+    return _tryGetEncapsulated(pValue) //
+        .map(pEncapsulated -> Stream.of((IReferable) pEncapsulated)) //
         .orElse(Stream.empty());
   }
 
@@ -72,13 +72,12 @@ private static Stream<IReferable> _single(Object pValue)
    */
   private static Stream<IReferable> _withMulti(Object pValue)
   {
-    return _tryGetEncapsulated(pValue)
-        .map(pEncapsulated -> Stream.concat(pEncapsulated.stream()
-                                                .filter(pElement -> pElement instanceof IEncapsulatedDataHolder)
-                                                .map(EReferableResolver::_toEncapsulated)
-                                                .map(pInnerEncapsulated -> (IReferable) pInnerEncapsulated),
-                                            Stream.of(pEncapsulated)))
-        .orElse(Stream.empty());
+    return _tryGetEncapsulated(pValue) //
+        .map(pEncapsulated -> Stream.concat(pEncapsulated.stream() //
+                .filter(pElement -> pElement instanceof IEncapsulatedDataHolder) //
+                .map(EReferableResolver::_toEncapsulated) //
+                .map(pInnerEncapsulated -> (IReferable) pInnerEncapsulated), //
+            Stream.of(pEncapsulated))).orElse(Stream.empty());
   }
 
   /**
@@ -90,8 +89,7 @@ private static Stream<IReferable> _withMulti(Object pValue)
    */
   private static Optional<IEncapsulatedData<?, ?>> _tryGetEncapsulated(Object pValue)
   {
-    return Optional.ofNullable(pValue)
-        .map(pHolder -> _toEncapsulated(pValue));
+    return Optional.ofNullable(pValue).map(pHolder -> _toEncapsulated(pValue));
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanContainerData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanContainerData.java
index 8bc0070..f9805bb 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanContainerData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanContainerData.java
@@ -60,6 +60,7 @@ public void addBean(BEAN pBean, int pIndex)
     {
       if (!limitInfo.evicting)
         throw new BeanContainerLimitReachedException(limitInfo.limit);
+
       removeBean(getBean(0)); //Remove first bean if limit is reached and evicting flag is set
       pIndex--;
     }
@@ -178,10 +179,10 @@ private Optional<IStatisticData<Integer>> _tryCreateStatisticData()
   private BEAN _observeBean(BEAN pBean)
   {
     final Observable<IEvent<IBean>> combinedObservables = Observable.concat(pBean.observeValues(), pBean.observeFieldAdditions(),
-                                                                            pBean.observeFieldRemovals());
+        pBean.observeFieldRemovals());
     //noinspection unchecked
-    final Disposable disposable = combinedObservables
-        .subscribe(pChangeEvent -> getEventObserverFromType((Class<IEvent<IBean>>) pChangeEvent.getClass()).onNext(pChangeEvent));
+    final Disposable disposable = combinedObservables.subscribe(
+        pChangeEvent -> getEventObserverFromType((Class<IEvent<IBean>>) pChangeEvent.getClass()).onNext(pChangeEvent));
 
     beanDisposableMapping.put(pBean, disposable);
     return pBean;
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanData.java
index 285ecc5..defb472 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/EncapsulatedBeanData.java
@@ -12,7 +12,10 @@
 
 import java.util.*;
 import java.util.function.*;
-import java.util.stream.*;
+import java.util.stream.Stream;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * The encapsulated bean data core implementation based on a {@link IBeanDataSource}.
@@ -20,8 +23,7 @@
  * @author Simon Danner, 08.12.2018
  */
 @EncapsulatedData
-class EncapsulatedBeanData extends AbstractEncapsulatedData<FieldValueTuple<?>, IBeanDataSource>
-    implements IEncapsulatedBeanData
+class EncapsulatedBeanData extends AbstractEncapsulatedData<FieldValueTuple<?>, IBeanDataSource> implements IEncapsulatedBeanData
 {
   private final List<IField<?>> fieldOrder;
   private final Map<IField<?>, IStatisticData<?>> statisticData;
@@ -67,7 +69,8 @@ public <VALUE> void addField(IField<VALUE> pField, int pIndex)
   @Override
   public <VALUE> void removeField(IField<VALUE> pField)
   {
-    _ifFieldExists(pField, pCheckedField -> {
+    _ifFieldExists(pField, pCheckedField ->
+    {
       getDatasource().removeField(pCheckedField);
       fieldOrder.remove(pCheckedField);
     });
@@ -115,8 +118,9 @@ public Stream<IField<?>> streamFields()
   @Override
   public Iterator<FieldValueTuple<?>> iterator()
   {
-    final Stream<FieldValueTuple<?>> fieldValueTupleStream = fieldOrder.stream()
+    final Stream<FieldValueTuple<?>> fieldValueTupleStream = fieldOrder.stream() //
         .map(pField -> pField.newUntypedTuple(getValue(pField)));
+
     return fieldValueTupleStream.iterator();
   }
 
@@ -127,10 +131,9 @@ public Iterator<FieldValueTuple<?>> iterator()
    */
   private Map<IField<?>, IStatisticData<?>> _createBeanStatisticMapping()
   {
-    return fieldOrder.stream()
-        .filter(pField -> pField.hasAnnotation(Statistics.class))
-        .collect(Collectors.toMap(Function.identity(),
-                                  pField -> new StatisticData<>(pField.getAnnotationOrThrow(Statistics.class).capacity(), null)));
+    return fieldOrder.stream() //
+        .filter(pField -> pField.hasAnnotation(Statistics.class)) //
+        .collect(toMap(identity(), pField -> new StatisticData<>(pField.getAnnotationOrThrow(Statistics.class).capacity(), null)));
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBean.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBean.java
index 7556e52..bee0b39 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBean.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBean.java
@@ -89,11 +89,13 @@ default <VALUE> VALUE getValueOrDefault(IField<VALUE> pField)
   default <VALUE, TARGET> TARGET getValueConverted(IField<VALUE> pField, Class<TARGET> pConvertType)
   {
     final VALUE actualValue = getValue(pField);
+
     if (actualValue == null || pConvertType.isAssignableFrom(actualValue.getClass()))
       //noinspection unchecked
       return (TARGET) actualValue;
-    return pField.getFromConverter(pConvertType)
-        .orElseThrow(() -> new ValueConversionUnsupportedException(pField, pConvertType))
+
+    return pField.getFromConverter(pConvertType) //
+        .orElseThrow(() -> new ValueConversionUnsupportedException(pField, pConvertType)) //
         .apply(actualValue);
   }
 
@@ -131,14 +133,16 @@ default <VALUE> void setValue(IField<VALUE> pField, VALUE pValue)
   default <VALUE, SOURCE> void setValueConverted(IField<VALUE> pField, SOURCE pValueToConvert)
   {
     VALUE convertedValue = null;
+
     if (pValueToConvert != null)
     {
       final Class<SOURCE> sourceType = (Class<SOURCE>) pValueToConvert.getClass();
-      convertedValue = requireNonNull(pField).getDataType().isAssignableFrom(sourceType) ? (VALUE) pValueToConvert :
-          pField.getToConverter(sourceType)
-              .orElseThrow(() -> new ValueConversionUnsupportedException(pField, sourceType))
+      convertedValue = requireNonNull(pField).getDataType().isAssignableFrom(sourceType) ? (VALUE) pValueToConvert : //
+          pField.getToConverter(sourceType) //
+              .orElseThrow(() -> new ValueConversionUnsupportedException(pField, sourceType)) //
               .apply(pValueToConvert);
     }
+
     setValue(pField, convertedValue);
   }
 
@@ -149,10 +153,10 @@ default <VALUE, SOURCE> void setValueConverted(IField<VALUE> pField, SOURCE pVal
   default void clear()
   {
     //noinspection unchecked,rawtypes
-    streamFields()
-        .filter(pField -> !pField.isPrivate())
-        .filter(pField -> !pField.isValueFinal())
-        .filter(pField -> pField.getInitialValue() != null || !pField.mustNeverBeNull())
+    streamFields() //
+        .filter(pField -> !pField.isPrivate()) //
+        .filter(pField -> !pField.isValueFinal()) //
+        .filter(pField -> pField.getInitialValue() != null || !pField.mustNeverBeNull()) //
         .forEach(pField -> setValue((IField) pField, pField.getInitialValue()));
   }
 
@@ -198,8 +202,8 @@ default int getFieldCount()
    */
   default <VALUE> int getFieldIndex(IField<VALUE> pField)
   {
-    return streamFields()
-        .collect(Collectors.toList())
+    return streamFields() //
+        .collect(Collectors.toList()) //
         .indexOf(pField);
   }
 
@@ -214,9 +218,9 @@ default <VALUE> int getFieldIndex(IField<VALUE> pField)
   default IField<?> getFieldByName(String pFieldName)
   {
     StringUtility.requireNotEmpty(pFieldName, "field name");
-    return streamFields()
-        .filter(pField -> pField.getName().equals(pFieldName))
-        .findAny()
+    return streamFields() //
+        .filter(pField -> pField.getName().equals(pFieldName)) //
+        .findAny() //
         .orElseThrow(() -> new BeanFieldDoesNotExistException(this, pFieldName));
   }
 
@@ -224,7 +228,8 @@ default IField<?> getFieldByName(String pFieldName)
    * Creates a copy of this bean.
    * This method expects an existing default constructor for this concrete bean type.
    * If the copy should include deep fields, all deep beans are supposed to have default constructors as well.
-   * If it is not possible to provide a default constructor, you may use {@link IBean#createCopy(ECopyMode, UnaryOperator, CustomFieldCopy[])}
+   * If it is not possible to provide a default constructor, you may use
+   * {@link IBean#createCopy(ECopyMode, UnaryOperator, CustomFieldCopy[])}
    * to create bean copies. It allows you to define a custom constructor call to create the new instance.
    *
    * A copy will always be created with the default {@link IBeanDataSource}.
@@ -247,11 +252,13 @@ default <BEAN extends IBean> BEAN createCopy(ECopyMode pMode, CustomFieldCopy<?>
    * a custom constructor call. If the copy should be deep, all deep bean values are supposed to have a default constructors.
    *
    * @param pMode                  the copy mode
-   * @param pCustomConstructorCall a custom constructor call defined as function (the input is the existing bean, the function should create the copy)
+   * @param pCustomConstructorCall a custom constructor call defined as function (the input is the existing bean, the function should
+   *                               create the copy)
    * @param pCustomFieldCopies     a collection of custom copy mechanisms for specific bean fields
    * @return a copy of this bean
    */
-  default <BEAN extends IBean> BEAN createCopy(ECopyMode pMode, UnaryOperator<BEAN> pCustomConstructorCall, CustomFieldCopy<?>... pCustomFieldCopies)
+  default <BEAN extends IBean> BEAN createCopy(ECopyMode pMode, UnaryOperator<BEAN> pCustomConstructorCall,
+                                               CustomFieldCopy<?>... pCustomFieldCopies)
   {
     //noinspection unchecked
     return doCreateCopy((BEAN) this, pMode, pCustomConstructorCall, pCustomFieldCopies);
@@ -268,7 +275,7 @@ default <VALUE> Optional<IStatisticData<VALUE>> getStatisticData(IField<VALUE> p
   {
     final IStatisticData<?> statisticData = requestEncapsulatedDataForField(this, pField).getStatisticData().get(pField);
     //noinspection unchecked
-    return Optional.ofNullable(statisticData)
+    return Optional.ofNullable(statisticData) //
         .map(pData -> (IStatisticData<VALUE>) pData);
   }
 
@@ -280,8 +287,8 @@ default <VALUE> Optional<IStatisticData<VALUE>> getStatisticData(IField<VALUE> p
    */
   default Set<FieldValueTuple<?>> getIdentifiers()
   {
-    return stream()
-        .filter(pTuple -> pTuple.getField().hasAnnotation(Identifier.class))
+    return stream() //
+        .filter(pTuple -> pTuple.getField().hasAnnotation(Identifier.class)) //
         .collect(Collectors.toCollection(LinkedHashSet::new));
   }
 
@@ -313,9 +320,11 @@ default IBean resolveDeepBean(List<IField<?>> pChain)
     {
       if (!current.hasField(field))
         throw new InvalidChainException(current, field);
+
       final Object value = current.getValue(field);
       if (!(value instanceof IBean))
         throw new InvalidChainException(field);
+
       current = (IBean) value;
     }
 
@@ -350,8 +359,10 @@ default <VALUE> VALUE resolveDeepValue(IField<VALUE> pDeepField, IField<?>... pC
   default <VALUE> VALUE resolveDeepValue(IField<VALUE> pDeepField, List<IField<?>> pChain)
   {
     final IBean deepBean = resolveDeepBean(pChain);
+
     if (!deepBean.hasField(pDeepField))
       throw new InvalidChainException(deepBean, pDeepField);
+
     return deepBean.getValue(pDeepField);
   }
 
@@ -374,8 +385,8 @@ default Map<IField<?>, Object> toMap()
    */
   default Stream<IField<?>> streamFields()
   {
-    return requestEncapsulatedData(this).streamFields()
-        .filter(pField -> !pField.isPrivate())
+    return requestEncapsulatedData(this).streamFields() //
+        .filter(pField -> !pField.isPrivate()) //
         .filter(pField -> getFieldActivePredicate().isOptionalActive(pField));
   }
 
@@ -387,8 +398,8 @@ default Stream<IField<?>> streamFields()
    */
   default Stream<FieldValueTuple<?>> stream()
   {
-    return requestEncapsulatedData(this).stream()
-        .filter(pFieldTuple -> !pFieldTuple.getField().isPrivate())
+    return requestEncapsulatedData(this).stream() //
+        .filter(pFieldTuple -> !pFieldTuple.getField().isPrivate()) //
         .filter(pFieldTuple -> getFieldActivePredicate().isOptionalActive(pFieldTuple.getField()));
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanContainer.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanContainer.java
index 998a3f6..4d32f60 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanContainer.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanContainer.java
@@ -115,6 +115,7 @@ static <BEAN extends IBean> IBeanContainer<BEAN> ofVariableNotEmpty(BEAN... pBea
   {
     if (pBeans.length == 0)
       throw new OJRuntimeException("Unable to infer bean type! Empty varargs argument not allowed here!");
+
     //noinspection unchecked
     final Class<BEAN> type = (Class<BEAN>) pBeans[0].getClass();
     return ofVariable(type, pBeans);
@@ -147,6 +148,7 @@ static <BEAN extends IBean> IBeanContainer<BEAN> ofIterableNotEmpty(Iterable<BEA
     final Iterator<BEAN> it = pBeans.iterator();
     if (!it.hasNext())
       throw new OJRuntimeException("Unable to infer bean type! The amount of beans cannot be empty!");
+
     //noinspection unchecked
     final Class<BEAN> type = (Class<BEAN>) it.next().getClass();
     return ofIterable(type, pBeans);
@@ -175,8 +177,7 @@ static <BEAN extends IBean> IBeanContainer<BEAN> ofIterable(Class<BEAN> pBeanTyp
    * @param <BEAN>      the generic bean type of the container
    * @return an  bean container with the custom data source
    */
-  static <BEAN extends IBean> IBeanContainer<BEAN> withCustomDataSource(Class<BEAN> pBeanType,
-                                                                        IBeanContainerDataSource<BEAN> pDataSource)
+  static <BEAN extends IBean> IBeanContainer<BEAN> withCustomDataSource(Class<BEAN> pBeanType, IBeanContainerDataSource<BEAN> pDataSource)
   {
     return new BeanContainer<>(pBeanType, pDataSource);
   }
@@ -264,6 +265,7 @@ default BEAN replaceBean(BEAN pBean, int pIndex)
     final BEAN removed = requestEncapsulatedData(this).replaceBean(requireNonNull(pBean), IndexChecker.check(this::size, pIndex));
     if (removed != null)
       beanRemoved(this, removed);
+
     beanAdded(this, pBean);
     return removed;
   }
@@ -291,7 +293,7 @@ default boolean removeBean(BEAN pBean)
   default BEAN removeBean(int pIndex)
   {
     IndexChecker.check(this::size, pIndex);
-    return removeFromContainer(this, pEncapsulated -> pEncapsulated.removeBean(pIndex))
+    return removeFromContainer(this, pEncapsulated -> pEncapsulated.removeBean(pIndex)) //
         .orElseThrow(() -> new OJInternalException("Unable to remove bean at index" + pIndex));
   }
 
@@ -441,11 +443,11 @@ default List<BEAN> findByFieldValues(FieldValueTuple<?>... pFieldValueTuples)
     if (pFieldValueTuples.length == 0)
       return Collections.emptyList();
 
-    final Predicate<BEAN> combinedPredicate = pBean -> Stream.of(pFieldValueTuples)
+    final Predicate<BEAN> combinedPredicate = pBean -> Stream.of(pFieldValueTuples) //
         .allMatch(pTuple -> Objects.equals(pBean.getValue(pTuple.getField()), pTuple.getValue()));
 
-    return stream()
-        .filter(combinedPredicate)
+    return stream() //
+        .filter(combinedPredicate) //
         .collect(Collectors.toList());
   }
 
@@ -482,7 +484,7 @@ default IBeanContainer<BEAN> withLimit(int pMaxCount, boolean pEvicting)
   default Observable<BeanContainerAddition<BEAN>> observeAdditions()
   {
     //noinspection unchecked
-    return requestEncapsulatedData(this).observeByType(BeanContainerAddition.class)
+    return requestEncapsulatedData(this).observeByType(BeanContainerAddition.class) //
         .map(pChange -> (BeanContainerAddition<BEAN>) pChange);
   }
 
@@ -494,7 +496,7 @@ default Observable<BeanContainerAddition<BEAN>> observeAdditions()
   default Observable<BeanContainerRemoval<BEAN>> observeRemovals()
   {
     //noinspection unchecked
-    return requestEncapsulatedData(this).observeByType(BeanContainerRemoval.class)
+    return requestEncapsulatedData(this).observeByType(BeanContainerRemoval.class) //
         .map(pChange -> (BeanContainerRemoval<BEAN>) pChange);
   }
 
@@ -536,9 +538,9 @@ default <VALUE> Set<VALUE> getDistinctValuesFromField(IField<VALUE> pField)
    */
   default <VALUE> Set<VALUE> getDistinctValues(Function<BEAN, VALUE> pValueResolver)
   {
-    return stream()
-        .map(pValueResolver)
-        .filter(Objects::nonNull)
+    return stream() //
+        .map(pValueResolver) //
+        .filter(Objects::nonNull) //
         .collect(Collectors.toSet());
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanEventPublisher.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanEventPublisher.java
index 7fa81b0..0a5ed01 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanEventPublisher.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IBeanEventPublisher.java
@@ -19,8 +19,8 @@
  * @author Simon Danner, 07.12.2018
  */
 @EncapsulatedData
-interface IBeanEventPublisher<ELEMENT, DATASOURCE extends IDataSource,
-    ENCAPSULATED extends IEncapsulatedData<ELEMENT, DATASOURCE>> extends IEncapsulatedDataHolder<ELEMENT, DATASOURCE, ENCAPSULATED>
+interface IBeanEventPublisher<ELEMENT, DATASOURCE extends IDataSource, ENCAPSULATED extends IEncapsulatedData<ELEMENT, DATASOURCE>>
+    extends IEncapsulatedDataHolder<ELEMENT, DATASOURCE, ENCAPSULATED>
 {
   /**
    * An {@link Observable} to observe value changes of bean values.
@@ -29,7 +29,7 @@ interface IBeanEventPublisher<ELEMENT, DATASOURCE extends IDataSource,
    */
   default Observable<BeanValueChange<?>> observeValues()
   {
-    return requestEncapsulatedData(this).observeByType(BeanValueChange.class)
+    return requestEncapsulatedData(this).observeByType(BeanValueChange.class) //
         .map(pChange -> (BeanValueChange<?>) pChange);
   }
 
@@ -42,8 +42,8 @@ default <VALUE> Observable<BeanValueChange<VALUE>> observeFieldValue(IField<VALU
   {
     Objects.requireNonNull(pField);
     //noinspection unchecked
-    return observeValues()
-        .filter(pChange -> pChange.getField() == pField)
+    return observeValues() //
+        .filter(pChange -> pChange.getField() == pField) //
         .map(pChange -> (BeanValueChange<VALUE>) pChange);
   }
 
@@ -54,7 +54,7 @@ default <VALUE> Observable<BeanValueChange<VALUE>> observeFieldValue(IField<VALU
    */
   default Observable<BeanFieldAddition<?>> observeFieldAdditions()
   {
-    return requestEncapsulatedData(this).observeByType(BeanFieldAddition.class)
+    return requestEncapsulatedData(this).observeByType(BeanFieldAddition.class) //
         .map(pChange -> (BeanFieldAddition<?>) pChange);
   }
 
@@ -65,7 +65,7 @@ default Observable<BeanFieldAddition<?>> observeFieldAdditions()
    */
   default Observable<BeanFieldRemoval<?>> observeFieldRemovals()
   {
-    return requestEncapsulatedData(this).observeByType(BeanFieldRemoval.class)
+    return requestEncapsulatedData(this).observeByType(BeanFieldRemoval.class) //
         .map(pChange -> (BeanFieldRemoval<?>) pChange);
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IEncapsulatedBeanData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IEncapsulatedBeanData.java
index f6b0711..e0575d0 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IEncapsulatedBeanData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IEncapsulatedBeanData.java
@@ -109,7 +109,7 @@ interface IEncapsulatedBeanData extends IEncapsulatedData<FieldValueTuple<?>, IB
    */
   default <VALUE> boolean containsField(IField<VALUE> pField)
   {
-    return streamFields()
+    return streamFields() //
         .anyMatch(pExistingBean -> pExistingBean == pField); //Compare references because of the static definition of bean fields
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IMapBean.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IMapBean.java
index 6583c90..caeeeba 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IMapBean.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IMapBean.java
@@ -51,6 +51,7 @@ static <KEY, VALUE> IMapBean<KEY, VALUE> createCopy(IMapBean<KEY, VALUE> pOrigin
   {
     if (!(pOriginalMapBean instanceof MapBean))
       throw new OJRuntimeException("Only map beans created by this interface can be used for copying!");
+
     return new MapBean<>((MapBean<KEY, VALUE>) pOriginalMapBean);
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IModifiableBean.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IModifiableBean.java
index fcb2799..48f4b22 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/IModifiableBean.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/IModifiableBean.java
@@ -38,6 +38,7 @@ default <VALUE, FIELD extends IField<VALUE>> BeanFieldAdder<VALUE, FIELD> fieldA
     final IEncapsulatedBeanData encapsulated = requestEncapsulatedData(this);
     if (encapsulated.streamFields().anyMatch(pField -> pField.getName().equals(pName)))
       throw new BeanFieldDuplicateException(pName);
+
     return new BeanFieldAdder<>(this::addFieldAtIndex, encapsulated::getFieldCount, pFieldType, pName, pAnnotations);
   }
 
@@ -65,6 +66,7 @@ default <VALUE> void addFieldAtIndex(IField<VALUE> pField, int pIndex)
 
     if (encapsulated.containsField(pField))
       throw new BeanFieldDuplicateException(pField.getName());
+
     encapsulated.addField(pField, pIndex);
 
     if (getFieldActivePredicate().isOptionalActive(pField))
@@ -106,9 +108,10 @@ default Object removeFieldByName(String pFieldName)
    */
   default void removeFieldIf(Predicate<IField<?>> pFieldPredicate)
   {
-    final List<IField<?>> toRemove = streamFields()
-        .filter(pFieldPredicate)
+    final List<IField<?>> toRemove = streamFields() //
+        .filter(pFieldPredicate) //
         .collect(Collectors.toList());
+
     toRemove.forEach(this::removeField);
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/MapBean.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/MapBean.java
index ea58574..51c9adc 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/MapBean.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/MapBean.java
@@ -64,10 +64,13 @@ final class MapBean<KEY, VALUE> extends AbstractMap<KEY, VALUE> implements IMapB
     fieldKeyMapping = new HashMap<>();
     fieldCache = pFieldCache;
     fieldCacheCallback = pFieldCacheCallback;
-    final BiConsumer<LinkedHashMap<IField<?>, VALUE>, Map.Entry<KEY, VALUE>> accumulator =
-        (pSorted, pEntry) -> pSorted.put(_createField(pEntry.getKey()), pEntry.getValue());
-    final Map<IField<?>, VALUE> fieldValueMapping = pMap.entrySet().stream()
+
+    final BiConsumer<LinkedHashMap<IField<?>, VALUE>, Map.Entry<KEY, VALUE>> accumulator = (pSorted, pEntry) -> pSorted.put(
+        _createField(pEntry.getKey()), pEntry.getValue());
+
+    final Map<IField<?>, VALUE> fieldValueMapping = pMap.entrySet().stream() //
         .collect(LinkedHashMap::new, accumulator, Map::putAll);
+
     final List<IField<?>> fields = new ArrayList<>(fieldValueMapping.keySet());
     encapsulated = new EncapsulatedBeanData(new MapBasedBeanDataSource(fields), fields);
     fieldValueMapping.forEach(this::setValueConverted);
@@ -88,6 +91,7 @@ final class MapBean<KEY, VALUE> extends AbstractMap<KEY, VALUE> implements IMapB
     fieldKeyMapping = new HashMap<>(pExistingMapBean.fieldKeyMapping);
     fieldCache = pExistingMapBean.fieldCache;
     fieldCacheCallback = pExistingMapBean.fieldCacheCallback;
+
     final List<IField<?>> fields = pExistingMapBean.streamFields().collect(Collectors.toList());
     encapsulated = new EncapsulatedBeanData(new MapBasedBeanDataSource(pExistingMapBean), fields);
   }
@@ -110,6 +114,7 @@ public VALUE put(KEY pKey, VALUE pValue)
   {
     final IField<?> field;
     VALUE oldValue = null;
+
     if (keyFieldMapping.containsKey(pKey))
     {
       field = keyFieldMapping.get(pKey);
@@ -120,6 +125,7 @@ public VALUE put(KEY pKey, VALUE pValue)
       field = _createField(pKey);
       encapsulated.addField(field, encapsulated.getFieldCount());
     }
+
     setValueConverted(field, pValue);
     return oldValue;
   }
@@ -133,15 +139,17 @@ public VALUE put(KEY pKey, VALUE pValue)
    */
   private IField<?> _createField(KEY pKey)
   {
-    final IField<?> newField = fieldCache.apply(pKey)
+    final IField<?> newField = fieldCache.apply(pKey) //
         .orElseGet(() ->
-                   {
-                     //noinspection unchecked,RedundantCast
-                     final IField<?> field = BeanFieldFactory.createField((Class<IField>) fieldType, genericFieldTypeSupplier,
-                                                                          Objects.toString(pKey), false, annotationsForField, null);
-                     fieldCacheCallback.accept(pKey, field);
-                     return field;
-                   });
+        {
+          //noinspection unchecked,RedundantCast
+          final IField<?> field = BeanFieldFactory.createField((Class<IField>) fieldType, genericFieldTypeSupplier, Objects.toString(pKey),
+              false, annotationsForField, null);
+
+          fieldCacheCallback.accept(pKey, field);
+          return field;
+        });
+
     keyFieldMapping.put(pKey, newField);
     fieldKeyMapping.put(newField, pKey);
     return newField;
@@ -179,10 +187,12 @@ public boolean equals(Object pObject)
     final MapBean other = (MapBean) pObject;
     //MapBeans are the same, if all fields and associated values are equal
     //noinspection unchecked
-    return encapsulated.getFieldCount() == other.encapsulated.getFieldCount() &&
-        encapsulated.streamFields().allMatch(other::hasField) && encapsulated.streamFields()
-        .map(pField -> (IField) pField)
-        .allMatch(pIdentifierField -> Objects.equals(getValue(pIdentifierField), other.getValue(pIdentifierField)));
+    return encapsulated.getFieldCount() == other.encapsulated.getFieldCount() && //
+        encapsulated.streamFields() //
+            .allMatch(other::hasField) && //
+        encapsulated.streamFields() //
+            .map(pField -> (IField) pField) //
+            .allMatch(pIdentifierField -> Objects.equals(getValue(pIdentifierField), other.getValue(pIdentifierField)));
   }
 
   @Override
@@ -201,8 +211,8 @@ private class _EntrySet extends AbstractSet<Map.Entry<KEY, VALUE>>
     @Override
     public Iterator<Entry<KEY, VALUE>> iterator()
     {
-      return IndexBasedIterator.buildIterator(this::_createEntryForField, this::size)
-          .withRemover(encapsulated::removeFieldAtIndex)
+      return IndexBasedIterator.buildIterator(this::_createEntryForField, this::size) //
+          .withRemover(encapsulated::removeFieldAtIndex) //
           .createIterator();
     }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJBean.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJBean.java
index f4416d3..0850a56 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJBean.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJBean.java
@@ -134,6 +134,7 @@ public boolean equals(Object pOther)
   public int hashCode()
   {
     final Set<FieldValueTuple<?>> identifiers = getIdentifiers();
+
     return identifiers.isEmpty() ? super.hashCode() : Objects.hash(identifiers.stream() //
         .map(FieldValueTuple::getValue) //
         .toArray(Object[]::new));
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJFields.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJFields.java
index 55b9bfe..1092837 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJFields.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/OJFields.java
@@ -75,8 +75,9 @@ public static <BEAN extends OJBean, VALUE, FIELD extends IField<VALUE>> FIELD cr
   private static <VALUE, FIELD extends IField<VALUE>> FIELD _createField(Class<? extends OJBean> pBeanType,
                                                                          @Nullable BiPredicate<? extends OJBean, VALUE> pActiveCondition)
   {
-    final Field declaredFieldToCreate = BeanReflector.reflectDeclaredBeanFields(pBeanType).stream()
-        .filter(pField -> {
+    final Field declaredFieldToCreate = BeanReflector.reflectDeclaredBeanFields(pBeanType).stream() //
+        .filter(pField ->
+        {
           try
           {
             if (!pField.isAccessible())
@@ -87,8 +88,8 @@ private static <VALUE, FIELD extends IField<VALUE>> FIELD _createField(Class<? e
           {
             throw new OJInternalException(pE);
           }
-        })
-        .findAny()
+        }) //
+        .findAny() //
         .orElseThrow(() -> new BeanFieldCreationException(pBeanType));
 
     //noinspection unchecked
@@ -114,7 +115,8 @@ private static <VALUE, FIELD extends IField<VALUE>> FIELD _createField(Class<? e
    */
   private static <FIELD extends IField<?>> Supplier<Class<?>> _genericTypeSupplier(Field pDeclaredField, Class<FIELD> pBeanFieldType)
   {
-    return () -> {
+    return () ->
+    {
       try
       {
         final Type genericType = ((ParameterizedType) pDeclaredField.getGenericType()).getActualTypeArguments()[0];
@@ -122,9 +124,11 @@ private static <FIELD extends IField<?>> Supplier<Class<?>> _genericTypeSupplier
       }
       catch (Exception pE)
       {
-        throw new BeanFieldCreationException("Unable to reflect generic type of bean field " + pBeanFieldType.getName() + "! " +
-                                                 "The annotation " + GenericBeanField.class.getSimpleName() + " can only be used " +
-                                                 "if the field type uses exactly one generic type which is the data type of the field.", pE);
+        throw new BeanFieldCreationException(
+            "Unable to reflect generic type of bean field " + pBeanFieldType.getName() + "! " + "The annotation " + GenericBeanField.class
+                .getSimpleName() + " can only be used " + "if the field type uses exactly one generic type which is the data type of the " +
+                "field.",
+            pE);
       }
     };
   }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/ListBasedBeanContainerDataSource.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/ListBasedBeanContainerDataSource.java
index e430184..b8112b4 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/ListBasedBeanContainerDataSource.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/ListBasedBeanContainerDataSource.java
@@ -24,7 +24,7 @@ public final class ListBasedBeanContainerDataSource<BEAN extends IBean> implemen
    */
   public ListBasedBeanContainerDataSource(Iterable<BEAN> pBeans)
   {
-    beanList = StreamSupport.stream(Objects.requireNonNull(pBeans).spliterator(), false)
+    beanList = StreamSupport.stream(Objects.requireNonNull(pBeans).spliterator(), false) //
         .collect(Collectors.toList());
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/MapBasedBeanDataSource.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/MapBasedBeanDataSource.java
index c7fea24..77c98eb 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/MapBasedBeanDataSource.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/datasource/MapBasedBeanDataSource.java
@@ -26,7 +26,7 @@ public final class MapBasedBeanDataSource implements IBeanDataSource
    */
   public MapBasedBeanDataSource(List<IField<?>> pFields)
   {
-    values = pFields.stream()
+    values = pFields.stream() //
         .collect(HashMap::new, (pMap, pField) -> pMap.put(pField, pField.getInitialValue()), Map::putAll);
   }
 
@@ -37,8 +37,9 @@ public MapBasedBeanDataSource(List<IField<?>> pFields)
    */
   public MapBasedBeanDataSource(IBean pBean)
   {
-    values = pBean.stream().collect(toMap(FieldValueTuple::getField,
-                                          pTuple -> pTuple.getValue() == null ? pTuple.getField().getInitialValue() : pTuple.getValue()));
+    values = pBean.stream() //
+        .collect(toMap(FieldValueTuple::getField,
+            pTuple -> pTuple.getValue() == null ? pTuple.getField().getInitialValue() : pTuple.getValue()));
   }
 
   @Override
@@ -54,6 +55,7 @@ public <VALUE> void setValue(IField<VALUE> pField, VALUE pValue, boolean pAllowN
     final boolean existing = values.containsKey(pField);
     if (!pAllowNewField && !existing)
       throw new OJInternalException("It is not allowed to add new fields for this bean data core. field: " + pField.getName());
+
     values.put(pField, pValue == null ? pField.getInitialValue() : pValue);
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/OJRuntimeException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/OJRuntimeException.java
index 4e5f704..cf788d7 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/OJRuntimeException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/OJRuntimeException.java
@@ -34,7 +34,7 @@ public OJRuntimeException(Throwable pCause)
    * Creates new exception with a detailed message and a throwable cause.
    *
    * @param pDetailMessage a detailed message describing the cause of the exception
-   * @param pCause the cause of the exception
+   * @param pCause         the cause of the exception
    */
   public OJRuntimeException(String pDetailMessage, Throwable pCause)
   {
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/bean/InvalidChainException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/bean/InvalidChainException.java
index 83fa0ad..03dbe93 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/bean/InvalidChainException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/bean/InvalidChainException.java
@@ -32,7 +32,8 @@ public InvalidChainException(IBean pParentBean, IField<?> pNotPresentField)
    */
   public InvalidChainException(IField<?> pNoBeanField)
   {
-    this("It can only contain bean reference fields. " + pNoBeanField.getName() + " is of data type " + pNoBeanField.getDataType().getName());
+    this("It can only contain bean reference fields. " + pNoBeanField.getName() + " is of data type " +
+        pNoBeanField.getDataType().getName());
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/copy/BeanCopyNotSupportedException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/copy/BeanCopyNotSupportedException.java
index 4c5d579..2834c0e 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/copy/BeanCopyNotSupportedException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/copy/BeanCopyNotSupportedException.java
@@ -40,6 +40,7 @@ private static String _createErrorMessage(IField<?> pBeanField)
   {
     return "It is not possible to create a value copy of the following bean field: " + pBeanField.getClass().getName() + " value type: " +
         pBeanField.getDataType().getName() + " There may be no copy mechanism provided by the field and no default constructor for " +
-        "the value type. As a workaround you may use custom field copy functions. For further information take a look at the bean interface.";
+        "the value type. As a workaround you may use custom field copy functions. For further information take a look at the bean " +
+        "interface.";
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldCreationException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldCreationException.java
index 97315ad..c463eb1 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldCreationException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldCreationException.java
@@ -17,9 +17,10 @@ public class BeanFieldCreationException extends OJRuntimeException
    */
   public BeanFieldCreationException(Class<? extends IBean> pBeanType)
   {
-    super("Unable to create field. There are no static field or all of them are initialized already. " +
-              "bean-type: " + pBeanType.getName() + ". Check the class type given to the field factory! " +
-              "It must be the same as the type containing the bean field to create.");
+    super(
+        "Unable to create field. There are no static field or all of them are initialized already. " + "bean-type: " + pBeanType.getName() +
+            ". Check the class type given to the field factory! " + "It must be the same as the type containing the bean field " +
+            "to create.");
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDoesNotExistException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDoesNotExistException.java
index c0d9d3e..07f8fee 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDoesNotExistException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDoesNotExistException.java
@@ -19,7 +19,8 @@ public class BeanFieldDoesNotExistException extends OJRuntimeException
    */
   public BeanFieldDoesNotExistException(IBean pBean, IField<?> pField)
   {
-    super("Missing bean field: bean-type: " + pBean.getClass().getSimpleName() + " field: " + pField.getName() + ". Consider field filters!");
+    super(
+        "Missing bean field: bean-type: " + pBean.getClass().getSimpleName() + " field: " + pField.getName() + ". Consider field filters!");
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDuplicateException.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDuplicateException.java
index ace8fc5..33ff641 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDuplicateException.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/exceptions/field/BeanFieldDuplicateException.java
@@ -20,8 +20,8 @@ public class BeanFieldDuplicateException extends OJRuntimeException
    */
   public BeanFieldDuplicateException(List<IField<?>> pDuplicateFields)
   {
-    super("A bean cannot define a field twice! duplicates: " + pDuplicateFields.stream()
-        .map(IField::getName)
+    super("A bean cannot define a field twice! duplicates: " + pDuplicateFields.stream() //
+        .map(IField::getName) //
         .collect(Collectors.joining(", ")));
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/FieldJavaTypes.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/FieldJavaTypes.java
index 7d98a08..1941908 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/FieldJavaTypes.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/FieldJavaTypes.java
@@ -32,19 +32,19 @@ private FieldJavaTypes()
   static Optional<Class<IField<?>>> findFieldTypeFromDataType(Class<?> pDataType)
   {
     if (typeFieldMapping == null)
-      typeFieldMapping = IPicoRegistry.INSTANCE.find(IField.class, TypeDefaultField.class).entrySet().stream()
-          .flatMap(pEntry -> Stream.of(pEntry.getValue().types())
-              .map(pType -> new AbstractMap.SimpleEntry<>(pType, pEntry.getKey())))
-          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
-                                    (pFieldType1, pFieldType2) ->
-                                    {
-                                      throw new OJInternalException("Incorrect default data types for bean field: " + pFieldType1.getSimpleName() +
-                                                                        " supports the same data type as " + pFieldType2.getSimpleName());
-                                    }));
+      typeFieldMapping = IPicoRegistry.INSTANCE.find(IField.class, TypeDefaultField.class).entrySet().stream() //
+          .flatMap(pEntry -> Stream.of(pEntry.getValue().types()) //
+              .map(pType -> new AbstractMap.SimpleEntry<>(pType, pEntry.getKey()))) //
+          .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (pFieldType1, pFieldType2) ->
+          {
+            throw new OJInternalException("Incorrect default data types for bean field: " + pFieldType1
+                .getSimpleName() + " supports the same data type as " + pFieldType2.getSimpleName());
+          }));
+
     //noinspection unchecked
-    return typeFieldMapping.entrySet().stream()
-        .filter(pEntry -> pEntry.getKey().isAssignableFrom(pDataType))
-        .findAny()
+    return typeFieldMapping.entrySet().stream() //
+        .filter(pEntry -> pEntry.getKey().isAssignableFrom(pDataType)) //
+        .findAny() //
         .map(pEntry -> (Class<IField<?>>) pEntry.getValue());
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/IField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/IField.java
index 690fb21..75e5648 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/IField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/IField.java
@@ -28,7 +28,7 @@ public interface IField<VALUE> extends IMemberLiteral
    */
   static Class<IField<?>> getFieldTypeFromDataType(Class<?> pDataType)
   {
-    return findFieldTypeFromDataType(pDataType)
+    return findFieldTypeFromDataType(pDataType) //
         .orElseThrow(() -> new OJRuntimeException("There is no bean field for this data type: " + pDataType.getSimpleName()));
   }
 
@@ -203,8 +203,9 @@ default FieldValueTuple<?> emptyUntypedTuple()
   default FieldValueTuple<?> newUntypedTuple(Object pValue)
   {
     if (pValue != null && !getDataType().isAssignableFrom(pValue.getClass()))
-      throw new OJRuntimeException("type-mismatch for field value tuple:" +
-                                       " field type: " + getDataType().getName() + " value type: " + pValue.getClass().getName());
+      throw new OJRuntimeException(
+          "type-mismatch for field value tuple:" + " field type: " + getDataType().getName() + " value type: " + pValue.getClass()
+              .getName());
     //noinspection unchecked
     return new FieldValueTuple(this, pValue);
   }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ContainerField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ContainerField.java
index 49f5db6..29ef0f9 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ContainerField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ContainerField.java
@@ -31,7 +31,7 @@ protected ContainerField(Class<IBeanContainer<BEAN>> pType, @NotNull String pNam
   @Override
   public IBeanContainer<BEAN> copyValue(IBeanContainer<BEAN> pOriginalContainer, ECopyMode pMode, CustomFieldCopy<?>... pCustomFieldCopies)
   {
-    return IBeanContainer.ofStream(pOriginalContainer.getBeanType(), pOriginalContainer.stream()
+    return IBeanContainer.ofStream(pOriginalContainer.getBeanType(), pOriginalContainer.stream() //
         .map(pOriginalBean -> pMode.shouldCopyDeep() ? pOriginalBean.createCopy(pMode, pCustomFieldCopies) : pOriginalBean));
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/DateField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/DateField.java
index b89454a..8e395eb 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/DateField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/DateField.java
@@ -31,8 +31,8 @@ protected DateField(@NotNull String pName, Collection<Annotation> pAnnotations,
   public String display(Instant pValue, IClientInfo pClientInfo)
   {
     final ZonedDateTime date = ZonedDateTime.ofInstant(pValue, pClientInfo.getZoneId());
-    return DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.MEDIUM)
-        .withLocale(pClientInfo.getLocale())
+    return DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.MEDIUM) //
+        .withLocale(pClientInfo.getLocale()) //
         .format(date);
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/EnumField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/EnumField.java
index b8a1dae..14fab8a 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/EnumField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/EnumField.java
@@ -21,7 +21,8 @@
 @GenericBeanField
 public class EnumField<ENUM extends Enum> extends AbstractField<ENUM> implements ISerializableField<ENUM, String>
 {
-  protected EnumField(Class<ENUM> pType, @NotNull String pName, Collection<Annotation> pAnnotations, boolean pIsOptional, boolean pIsPrivate)
+  protected EnumField(Class<ENUM> pType, @NotNull String pName, Collection<Annotation> pAnnotations, boolean pIsOptional,
+                      boolean pIsPrivate)
   {
     super(pType, pName, pAnnotations, pIsOptional, pIsPrivate);
   }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/GenericField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/GenericField.java
index c99d904..9b95f2c 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/GenericField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/GenericField.java
@@ -36,10 +36,10 @@ protected GenericField(Class<VALUE> pType, @NotNull String pName, Collection<Ann
    */
   private static <TYPE> Class<TYPE> _checkGenericType(Class<TYPE> pGenericType)
   {
-    IField.findFieldTypeFromDataType(pGenericType)
-        .ifPresent(pReplacement ->
-                       LOGGER.warning("A generic field is not required for this data type. Use " + pReplacement.getName() + " instead." +
-                                          " generic type: " + pGenericType.getName()));
+    IField.findFieldTypeFromDataType(pGenericType) //
+        .ifPresent(pReplacement -> LOGGER.warning("A generic field is not required for this data type. Use " + pReplacement
+            .getName() + " instead." + " generic type: " + pGenericType.getName()));
+
     return pGenericType;
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ListField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ListField.java
index b2a7320..297719d 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ListField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/ListField.java
@@ -18,8 +18,8 @@
 @NeverNull
 @TypeDefaultField(types = List.class)
 @GenericBeanField(genericWrapperType = List.class)
-public class ListField<ELEMENT> extends AbstractField<List<ELEMENT>>
-    implements ISerializableFieldJson<List<ELEMENT>>, ISneakyCopyCreatorField<List<ELEMENT>>
+public class ListField<ELEMENT> extends AbstractField<List<ELEMENT>> implements ISerializableFieldJson<List<ELEMENT>>,
+    ISneakyCopyCreatorField<List<ELEMENT>>
 {
   protected ListField(Class<List<ELEMENT>> pType, @NotNull String pName, Collection<Annotation> pAnnotations, boolean pIsOptional,
                       boolean pIsPrivate)
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/MapField.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/MapField.java
index 92520ab..d3e1e0d 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/MapField.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/literals/fields/types/MapField.java
@@ -45,7 +45,7 @@ protected MapField(Class<IMapBean<KEY, VALUE>> pType, @NotNull String pName, Col
   public IMapBean<KEY, VALUE> createBeanFromMap(Map<KEY, VALUE> pMap, Class<VALUE> pValueType)
   {
     return IMapBean.createFromMap(pMap, pValueType, fieldCache::put, pKey -> Optional.ofNullable(fieldCache.get(pKey)),
-                                  hasAnnotation(Detail.class));
+        hasAnnotation(Detail.class));
   }
 
   /**
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/BeanReference.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/BeanReference.java
index d194ab7..1224126 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/BeanReference.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/BeanReference.java
@@ -74,17 +74,16 @@ public Stream<BeanReference> streamParentReferences()
   public String toString()
   {
     _requiresExistingReference();
-    return getClass().getSimpleName() + "{" +
-        "bean=" + getBean() +
-        ", field=" + field +
-        '}';
+    return getClass().getSimpleName() + "{" + "bean=" + getBean() + ", field=" + field + '}';
   }
 
   @Override
   public boolean equals(Object pObject)
   {
-    if (this == pObject) return true;
-    if (pObject == null || getClass() != pObject.getClass()) return false;
+    if (this == pObject)
+      return true;
+    if (pObject == null || getClass() != pObject.getClass())
+      return false;
 
     final BeanReference other = (BeanReference) pObject;
     return _requiresExistingReference() == other.getBean() && field == other.field;
@@ -104,7 +103,6 @@ public int hashCode()
    */
   private IBean _requiresExistingReference()
   {
-    return Optional.ofNullable(get())
-        .orElseThrow(() -> new OJRuntimeException("This bean reference is not existing anymore!"));
+    return Optional.ofNullable(get()).orElseThrow(() -> new OJRuntimeException("This bean reference is not existing anymore!"));
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/IReferenceProvider.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/IReferenceProvider.java
index 48c581a..ecea523 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/IReferenceProvider.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/references/IReferenceProvider.java
@@ -33,12 +33,13 @@ default Set<BeanReference> getAllReferences()
     Set<BeanReference> newNodes = allNodes;
     do
     {
-      newNodes = newNodes.stream()
-          .flatMap(BeanReference::streamParentReferences)
-          .filter(pNode -> allNodes.stream()
-              .map(BeanReference::getBean)
+      newNodes = newNodes.stream() //
+          .flatMap(BeanReference::streamParentReferences) //
+          .filter(pNode -> allNodes.stream() //
+              .map(BeanReference::getBean) //
               .noneMatch(pInnerBean -> pInnerBean == pNode.getBean())) //Avoid cyclic references
           .collect(Collectors.toSet());
+
       allNodes.addAll(newNodes);
     }
     while (!newNodes.isEmpty());
@@ -55,9 +56,9 @@ default Set<BeanReference> getAllReferences()
    */
   default Set<IField<?>> getAllReferencesByBean(IBean pBean)
   {
-    return getAllReferences().stream()
-        .filter(pNode -> pNode.getBean() == pBean)
-        .map(BeanReference::getField)
+    return getAllReferences().stream() //
+        .filter(pNode -> pNode.getBean() == pBean) //
+        .map(BeanReference::getField) //
         .collect(Collectors.toSet());
   }
 
@@ -70,9 +71,9 @@ default Set<IField<?>> getAllReferencesByBean(IBean pBean)
    */
   default Set<IBean> getAllReferencesByField(IField<?> pField)
   {
-    return getAllReferences().stream()
-        .filter(pNode -> pNode.getField() == pField)
-        .map(BeanReference::getBean)
+    return getAllReferences().stream() //
+        .filter(pNode -> pNode.getField() == pField) //
+        .map(BeanReference::getBean) //
         .collect(Collectors.toSet());
   }
 }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IStatisticData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IStatisticData.java
index f17e068..5caa48d 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IStatisticData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IStatisticData.java
@@ -58,8 +58,8 @@ default int size()
   default Observable<Map<Long, ENTRY>> getIntervalStatistics(int pInterval)
   {
     final IntervalStatisticsMap<ENTRY> map = new IntervalStatisticsMap<>(pInterval, getChangedDataStatistics());
-    return observeStatistics()
-        .map(pNewEntry -> map.newEntry(pNewEntry.getTimestamp(), pNewEntry.getValue()))
+    return observeStatistics() //
+        .map(pNewEntry -> map.newEntry(pNewEntry.getTimestamp(), pNewEntry.getValue())) //
         .startWith(map);
   }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IntervalStatisticsMap.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IntervalStatisticsMap.java
index 6410a50..05fb89a 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IntervalStatisticsMap.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/IntervalStatisticsMap.java
@@ -57,10 +57,10 @@ Map<Long, ENTRY> newEntry(Long pTimeStamp, ENTRY pEntry)
       //If there is a overflow the last timestamp lies above the timestamp of the entry
       lastTimestamp = pTimeStamp + (overflow == 0 ? 0 : interval - overflow);
       //Add a entry for each interval between the last timestamp and the new one
-      LongStream.iterate(start, pTime -> pTime + interval)
+      LongStream.iterate(start, pTime -> pTime + interval) //
           //Add two entries, if the last entry surpasses the last entry of the changes
-          .limit(totalDiff / interval + (overflow == 0 ? 1 : 2))
-          .boxed()
+          .limit(totalDiff / interval + (overflow == 0 ? 1 : 2)) //
+          .boxed() //
           .forEach(pTime -> put(pTime, pTime < pTimeStamp ? lastValue : pEntry));
     }
 
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/StatisticData.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/StatisticData.java
index 85fb6df..bf00dee 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/StatisticData.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/statistics/StatisticData.java
@@ -29,6 +29,7 @@ public StatisticData(int pCapacity, @Nullable ENTRY pFirstValue)
   {
     maxEntrySize = pCapacity;
     statistics = Collections.synchronizedMap(maxEntrySize == -1 ? new LinkedHashMap<>() : new _LimitedMap(maxEntrySize));
+
     if (pFirstValue != null)
       addEntry(pFirstValue);
   }
diff --git a/ojcms-beans/src/main/java/de/adito/ojcms/beans/util/BeanReflector.java b/ojcms-beans/src/main/java/de/adito/ojcms/beans/util/BeanReflector.java
index 866712e..cd9c7ac 100644
--- a/ojcms-beans/src/main/java/de/adito/ojcms/beans/util/BeanReflector.java
+++ b/ojcms-beans/src/main/java/de/adito/ojcms/beans/util/BeanReflector.java
@@ -101,8 +101,9 @@ public static <ANNOTATION extends Annotation> void doIfAnnotationPresent(Class<?
    */
   private static List<IField<?>> _createBeanMetadata(Class<? extends IBean> pBeanType)
   {
-    return reflectDeclaredBeanFields(requiresDeclaredBeanType(pBeanType)).stream()
-        .map(pField -> {
+    return reflectDeclaredBeanFields(requiresDeclaredBeanType(pBeanType)).stream() //
+        .map(pField ->
+        {
           try
           {
             return (IField<?>) pField.get(null);
@@ -111,7 +112,7 @@ private static List<IField<?>> _createBeanMetadata(Class<? extends IBean> pBeanT
           {
             throw new OJInternalException(pE);
           }
-        })
+        }) //
         .collect(Collectors.toList());
   }
 
@@ -123,9 +124,9 @@ private static List<IField<?>> _createBeanMetadata(Class<? extends IBean> pBeanT
    */
   private static List<Field> _getDeclaredBeanFields(Class<? extends IBean> pBeanType)
   {
-    return _getDeclaredFields(pBeanType,
-                              pField -> Modifier.isStatic(pField.getModifiers()),
-                              pField -> IField.class.isAssignableFrom(pField.getType()));
+    return _getDeclaredFields(pBeanType,  //
+        pField -> Modifier.isStatic(pField.getModifiers()), //
+        pField -> IField.class.isAssignableFrom(pField.getType()));
   }
 
   /**
@@ -137,9 +138,9 @@ private static List<Field> _getDeclaredBeanFields(Class<? extends IBean> pBeanTy
    */
   private static List<Field> _getDeclaredNonBeanFields(Class<? extends IBean> pBeanType)
   {
-    return _getDeclaredFields(pBeanType,
-                              pField -> !Modifier.isStatic(pField.getModifiers()),
-                              pField -> !IField.class.isAssignableFrom(pField.getType()));
+    return _getDeclaredFields(pBeanType, //
+        pField -> !Modifier.isStatic(pField.getModifiers()), //
+        pField -> !IField.class.isAssignableFrom(pField.getType()));
   }
 
   /**
@@ -154,16 +155,17 @@ private static List<Field> _getDeclaredFields(Class<? extends IBean> pBeanType,
   {
     Class<?> current = requiresDeclaredBeanType(pBeanType);
     final List<Field> declaredFields = new ArrayList<>();
-    final Predicate<Field> combinedPredicate = pField -> Stream.of(pFieldPredicates)
-        .allMatch(pPredicate -> pPredicate.test(pField));
+    final Predicate<Field> combinedPredicate = pField -> Stream.of(pFieldPredicates).allMatch(pPredicate -> pPredicate.test(pField));
+
     do
     {
-      Stream.of(current.getDeclaredFields())
-          .filter(pField -> !pField.isSynthetic())
-          .filter(combinedPredicate)
+      Stream.of(current.getDeclaredFields()) //
+          .filter(pField -> !pField.isSynthetic()) //
+          .filter(combinedPredicate) //
           .forEach(declaredFields::add);
     }
     while ((current = current.getSuperclass()) != null && !current.equals(OJBean.class));
+
     return declaredFields;
   }
 }
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanContainerTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanContainerTest.java
index 7192799..dbf4e7f 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanContainerTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanContainerTest.java
@@ -75,7 +75,8 @@ public void testMultipleAddition()
   @Test
   public void testMerge()
   {
-    final IBeanContainer<SomeBean> container1 = IBeanContainer.ofIterableNotEmpty(Arrays.asList(new SomeBean(), new SomeBean(), new SomeBean()));
+    final IBeanContainer<SomeBean> container1 = IBeanContainer.ofIterableNotEmpty(
+        Arrays.asList(new SomeBean(), new SomeBean(), new SomeBean()));
     final IBeanContainer<SomeBean> container2 = IBeanContainer.ofVariableNotEmpty(new SomeBean(), new SomeBean());
     container1.merge(container2);
     assertEquals(5, container1.size());
@@ -190,12 +191,10 @@ public void testContains()
   @Test
   public void testSort()
   {
-    final Stream<SomeBean> stream = IntStream.range(0, 5)
-        .mapToObj(SomeBean::new);
+    final Stream<SomeBean> stream = IntStream.range(0, 5).mapToObj(SomeBean::new);
     final IBeanContainer<SomeBean> container = IBeanContainer.ofStreamNotEmpty(stream);
     container.sort(Comparator.reverseOrder());
-    IntStream.range(0, 5)
-        .forEach(pIndex -> assertSame(4 - pIndex, container.getBean(pIndex).getValue(SomeBean.SOME_FIELD)));
+    IntStream.range(0, 5).forEach(pIndex -> assertSame(4 - pIndex, container.getBean(pIndex).getValue(SomeBean.SOME_FIELD)));
   }
 
   @Test
@@ -251,10 +250,13 @@ public void testEqualsAndHashCode()
     equalsHashCodeChecker.makeAssertion(false);
     otherContainer.addBean(new SomeBean());
     equalsHashCodeChecker.makeAssertion(true);
-    IntStream.range(0, 5).forEach(pIndex -> {
+
+    IntStream.range(0, 5).forEach(pIndex ->
+    {
       container.addBean(new SomeBean());
       otherContainer.addBean(new SomeBean());
     });
+
     equalsHashCodeChecker.makeAssertion(true);
     container.getBean(3).setValue(SomeBean.SOME_FIELD, 9999);
     equalsHashCodeChecker.makeAssertion(false);
@@ -326,12 +328,13 @@ public void findOneByFieldValues()
     assertFalse(noResult.isPresent());
 
     final Optional<SomeBean> oneResultTwoTuples = container.findOneByFieldValues(new FieldValueTuple<>(SomeBean.SOME_FIELD, 1),
-                                                                                 new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
+        new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
+
     assertTrue(oneResultTwoTuples.isPresent());
     assertSame(container.getBean(1), oneResultTwoTuples.get());
 
-    assertThrows(OJRuntimeException.class, () ->
-        container.findOneByFieldValues(new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue")));
+    assertThrows(OJRuntimeException.class,
+        () -> container.findOneByFieldValues(new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue")));
   }
 
   @Test
@@ -358,19 +361,20 @@ public void testFindByFieldValues()
 
 
     final List<SomeBean> resultTwoTuple = container.findByFieldValues(new FieldValueTuple<>(SomeBean.SOME_FIELD, 2),
-                                                                      new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "testValue"));
+        new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "testValue"));
     assertEquals(1, resultOneTuple.size());
     assertSame(secondBean, resultTwoTuple.get(0));
 
     final List<SomeBean> badResultTwoTuple = container.findByFieldValues(new FieldValueTuple<>(SomeBean.SOME_FIELD, 2),
-                                                                         new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
+        new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
     assertTrue(badResultTwoTuple.isEmpty());
 
     final SomeBean thirdBean = new SomeBean(0);
     container.addBean(thirdBean);
 
     final List<SomeBean> twoResultsTwoTuple = container.findByFieldValues(new FieldValueTuple<>(SomeBean.SOME_FIELD, 0),
-                                                                          new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
+        new FieldValueTuple<>(SomeBean.ANOTHER_FIELD, "anotherValue"));
+
     assertEquals(2, twoResultsTwoTuple.size());
     assertSame(firstBean, twoResultsTwoTuple.get(0));
     assertSame(thirdBean, twoResultsTwoTuple.get(1));
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCopyTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCopyTest.java
index 84749c8..52abb62 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCopyTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCopyTest.java
@@ -61,7 +61,7 @@ public void testAllFieldShallowCopy()
     final Data copy = original.createCopy(ECopyMode.SHALLOW_ALL_FIELDS);
     assertEquals(original.someNormalList, copy.someNormalList);
     assertSame(original.getValue(Data.person1).getValue(Person.address).someNormalField,
-               copy.getValue(Data.person1).getValue(Person.address).someNormalField);
+        copy.getValue(Data.person1).getValue(Person.address).someNormalField);
   }
 
   @Test
@@ -71,7 +71,7 @@ public void testAllFieldDeepCopy()
     final Data copy = original.createCopy(ECopyMode.DEEP_ALL_FIELDS);
     assertEquals(original.someNormalList, copy.someNormalList);
     assertNotSame(original.getValue(Data.person1).getValue(Person.address).someNormalField,
-                  copy.getValue(Data.person1).getValue(Person.address).someNormalField);
+        copy.getValue(Data.person1).getValue(Person.address).someNormalField);
   }
 
   @Test
@@ -141,7 +141,7 @@ public static class House extends OJBean
     public static final BooleanField hasBasement = OJFields.create(House.class);
     @OptionalField
     public static final BooleanField isBasementUnderGround = OJFields.createOptional(House.class,
-                                                                                     ((pHouse, pValue) -> pHouse.getValue(hasBasement)));
+        ((pHouse, pValue) -> pHouse.getValue(hasBasement)));
     @OptionalField
     public static final TextField someBoringInfo = OJFields.createOptional(House.class, ((pHouse, pValue) -> pValue != null));
     @OptionalField
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCreationEventsTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCreationEventsTest.java
index 76d4ba7..960eb58 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCreationEventsTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanCreationEventsTest.java
@@ -21,24 +21,26 @@ public class BeanCreationEventsTest
   @Test
   public void testObserveByBeanType()
   {
-    observe(observeCreationByBeanType(SomeBean.class))
-        .assertCallCount(1)
-        .whenDoing(SomeBean::new);
-    observe(observeCreationByBeanType(AnotherBean.class))
-        .assertCallCount(1)
+    observe(observeCreationByBeanType(SomeBean.class)) //
+        .assertCallCount(1) //
+        .whenDoing(SomeBean::new); //
+
+    observe(observeCreationByBeanType(AnotherBean.class)) //
+        .assertCallCount(1) //
         .whenDoing(AnotherBean::new);
+
     assertThrows(BeanCreationNotObservableException.class, () -> observeCreationByBeanType(BeanWithoutAnnotation.class));
   }
 
   @Test
   public void testObserveByAnnotationType()
   {
-    observe(observeCreationByAnnotationType(ObserveCreation.class))
-        .assertCallCount(1)
+    observe(observeCreationByAnnotationType(ObserveCreation.class)) //
+        .assertCallCount(1) //
         .whenDoing(SomeBean::new);
 
-    observe(observeCreationByAnnotationType(SomeAnnotation.class))
-        .assertCallCount(1)
+    observe(observeCreationByAnnotationType(SomeAnnotation.class)) //
+        .assertCallCount(1) //
         .whenDoing(AnotherBean::new);
 
     assertThrows(BeanCreationNotObservableException.class, () -> observeCreationByAnnotationType(Detail.class));
@@ -55,8 +57,8 @@ public void testHasObservableAnnotation()
   @Test
   public void testObserveCreationIsAfterBeanConstruction()
   {
-    observe(observeCreationByBeanType(SomeBean.class))
-        .assertOnEveryValue(pNewBean -> assertEquals(10, pNewBean.getValue(SomeBean.SOME_FIELD)))
+    observe(observeCreationByBeanType(SomeBean.class)) //
+        .assertOnEveryValue(pNewBean -> assertEquals(10, pNewBean.getValue(SomeBean.SOME_FIELD))) //
         .whenDoing(SomeBean::new);
   }
 
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldConverterTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldConverterTest.java
index 9f59f14..4cb4a30 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldConverterTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldConverterTest.java
@@ -33,8 +33,8 @@ class BeanFieldConverterTest
     final long now = System.currentTimeMillis();
     final Instant expected = Instant.ofEpochMilli(now);
 
-    return Stream.of(
-        new _TypeValueWrapper<>(SomeBean.dateField, Date.class, new Date(now), expected),
+    return Stream.of( //
+        new _TypeValueWrapper<>(SomeBean.dateField, Date.class, new Date(now), expected), //
         new _TypeValueWrapper<>(SomeBean.dateField, Long.class, now, expected));
   }
 
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldCopyTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldCopyTest.java
index 1886713..72724a0 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldCopyTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanFieldCopyTest.java
@@ -35,30 +35,29 @@ private static Stream<_FieldValueWrapper<?>> _fieldsToTest()
     final Map<String, Integer> testMap = new HashMap<>();
     testMap.put("test1", 6);
     testMap.put("test2", 60);
-    final Consumer<IMapBean<String, Integer>> mapTest = pMapBean -> {
+
+    final Consumer<IMapBean<String, Integer>> mapTest = pMapBean ->
+    {
       assertEquals(2, pMapBean.size());
       assertSame(6, pMapBean.get("test1"));
       assertSame(60, pMapBean.get("test2"));
       assertEquals(testMap, pMapBean);
     };
 
-    return Stream.of(
-        new _GenericFieldValueWrapper<>(BeanField.class, new SomeBean()),
-        new _FieldValueWrapper<>(BooleanField.class, true),
+    return Stream.of(new _GenericFieldValueWrapper<>(BeanField.class, new SomeBean()), new _FieldValueWrapper<>(BooleanField.class, true),
         new _FieldValueWrapper<>(CharacterField.class, 'a'),
         new _GenericFieldValueWrapper<>(ContainerField.class, IBeanContainer.empty(SomeBean.class)),
-        new _FieldValueWrapper<>(DateField.class, Instant.now()),
-        new _FieldValueWrapper<>(DecimalField.class, 5.2),
+        new _FieldValueWrapper<>(DateField.class, Instant.now()), new _FieldValueWrapper<>(DecimalField.class, 5.2),
         new _GenericFieldValueWrapper<>(EnumField.class, TestEnum.HELLO),
         new _GenericFieldValueWrapper<>(GenericField.class, new _FieldValueWrapper<>(BooleanField.class, true)),
-        new _FieldValueWrapper<>(IntegerField.class, 1),
-        new _GenericFieldValueWrapper<>(ListField.class, Arrays.asList("1", "2", "3")),
+        new _FieldValueWrapper<>(IntegerField.class, 1), new _GenericFieldValueWrapper<>(ListField.class, Arrays.asList("1", "2", "3")),
         new _FieldValueWrapper<>(LongField.class, 4L),
-        new _GenericFieldValueWrapper<>(MapField.class, IMapBean.createFromMap(testMap, Integer.class, (pName, pField) -> {},
-                                                                               pKey -> Optional.empty(), false), mapTest),
+        new _GenericFieldValueWrapper<>(MapField.class, IMapBean.createFromMap(testMap, Integer.class, (pName, pField) -> //
+            {
+            }, //
+            pKey -> Optional.empty(), false), mapTest),
         new _GenericFieldValueWrapper<>(SetField.class, new HashSet<>(Arrays.asList("1", "2", "3"))),
-        new _FieldValueWrapper<>(ShortField.class, (short) 7),
-        new _FieldValueWrapper<>(TextField.class, "testing"));
+        new _FieldValueWrapper<>(ShortField.class, (short) 7), new _FieldValueWrapper<>(TextField.class, "testing"));
   }
 
   @ParameterizedTest
@@ -66,14 +65,14 @@ private static Stream<_FieldValueWrapper<?>> _fieldsToTest()
   public <VALUE> void testFieldCopyMechanisms(_FieldValueWrapper<VALUE> pFieldValueWrapper)
   {
     assertNotNull(pFieldValueWrapper.value);
-    final IField<VALUE> field = BeanFieldFactory.createField(pFieldValueWrapper.fieldType, pFieldValueWrapper::getGenericFieldType,
-                                                             "test", false, Collections.emptySet(), null);
+    final IField<VALUE> field = BeanFieldFactory.createField(pFieldValueWrapper.fieldType, pFieldValueWrapper::getGenericFieldType, "test",
+        false, Collections.emptySet(), null);
     try
     {
       final VALUE copiedValue = field.copyValue(pFieldValueWrapper.value, ECopyMode.DEEP_ONLY_BEAN_FIELDS);
       final Class<?> valueType = copiedValue.getClass();
-      assertTrue(ClassUtils.isPrimitiveOrWrapper(valueType) || Enum.class.isAssignableFrom(valueType) ||
-                     String.class.isAssignableFrom(valueType) || copiedValue != pFieldValueWrapper.value);
+      assertTrue(ClassUtils.isPrimitiveOrWrapper(valueType) || Enum.class.isAssignableFrom(valueType) || String.class
+          .isAssignableFrom(valueType) || copiedValue != pFieldValueWrapper.value);
       pFieldValueWrapper.getOptionalTest().ifPresent(pTest -> pTest.accept((copiedValue)));
     }
     catch (BeanCopyNotSupportedException pE)
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanObserverTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanObserverTest.java
index f22a88b..4023a7b 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanObserverTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanObserverTest.java
@@ -37,13 +37,14 @@ public void reset()
   public void testSimpleValueChangeObserver()
   {
     final String newValue = "newValue";
-    observe(bean, IBean::observeValues)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> {
+    observe(bean, IBean::observeValues) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange ->
+        {
           assertSame(SomeBean.field1, pChange.getField());
           assertEquals(INITIAL_VALUE, pChange.getOldValue());
           assertEquals(newValue, pChange.getNewValue());
-        })
+        }) //
         .whenDoing(pBean -> pBean.setValue(SomeBean.field1, newValue));
   }
 
@@ -72,13 +73,14 @@ public Class<? extends Annotation> annotationType()
       }
     };
 
-    observe(bean, IBean::observeFieldAdditions)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> {
+    observe(bean, IBean::observeFieldAdditions) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange ->
+        {
           assertEquals(fieldName, pChange.getField().getName());
           assertEquals(String.class, pChange.getField().getDataType());
           assertTrue(pChange.getField().hasAnnotation(Detail.class));
-        })
+        }) //
         .whenDoing(pBean -> pBean.fieldAdder(TextField.class, fieldName, Collections.singleton(annotation)).addAtTheEnd());
   }
 
@@ -103,9 +105,9 @@ public void testRemoveFieldIfMultiple()
   @Test
   public void testMultipleObservers()
   {
-    observe(bean, IBean::observeValues)
-        .assertCallCount(1)
-        .assertMultiple(observe(bean, IBean::observeValues).assertCallCount(1))
+    observe(bean, IBean::observeValues) //
+        .assertCallCount(1) //
+        .assertMultiple(observe(bean, IBean::observeValues).assertCallCount(1)) //
         .whenDoing(pBean -> pBean.setValue(SomeBean.field1, "changed"));
   }
 
@@ -119,26 +121,26 @@ public void testDuplicateFieldFails()
   @Test
   public void testSingleContainerAddition()
   {
-    observe(IBeanContainer.empty(SomeBean.class), IBeanContainer::observeAdditions)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> assertSame(bean, pChange.getBean()))
+    observe(IBeanContainer.empty(SomeBean.class), IBeanContainer::observeAdditions) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange -> assertSame(bean, pChange.getBean())) //
         .whenDoing(pContainer -> pContainer.addBean(bean));
   }
 
   @Test
   public void testSingleContainerRemoval()
   {
-    observe(IBeanContainer.ofSingleBean(bean), IBeanContainer::observeRemovals)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> assertSame(bean, pChange.getBean()))
+    observe(IBeanContainer.ofSingleBean(bean), IBeanContainer::observeRemovals) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange -> assertSame(bean, pChange.getBean())) //
         .whenDoing(pContainer -> pContainer.removeBean(bean));
   }
 
   @Test
   public void testMultipleContainerAddition()
   {
-    observe(IBeanContainer.empty(SomeBean.class), IBeanContainer::observeAdditions)
-        .assertCallCount(10)
+    observe(IBeanContainer.empty(SomeBean.class), IBeanContainer::observeAdditions) //
+        .assertCallCount(10) //
         .whenDoing(pContainer -> IntStream.range(0, 10).forEach(pIndex -> pContainer.addBean(bean)));
   }
 
@@ -146,22 +148,24 @@ public void testMultipleContainerAddition()
   public void testBeanChangeWithinContainer()
   {
     final String newValue = "changed";
-    observe(IBeanContainer.ofSingleBean(bean), IBeanContainer::observeValues)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> {
+    observe(IBeanContainer.ofSingleBean(bean), IBeanContainer::observeValues) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange ->
+        {
           assertSame(SomeBean.field1, pChange.getField());
           assertEquals(INITIAL_VALUE, pChange.getOldValue());
           assertEquals(newValue, pChange.getNewValue());
-        })
+        }) //
         .whenDoing(pContainer -> bean.setValue(SomeBean.field1, newValue));
   }
 
   @Test
   public void testObserversStayWhenDataSourceIsChanged()
   {
-    observe(bean, IBean::observeValues)
-        .assertCallCount(1)
-        .whenDoing(pBean -> {
+    observe(bean, IBean::observeValues) //
+        .assertCallCount(1) //
+        .whenDoing(pBean ->
+        {
           pBean.setEncapsulatedDataSource(new IBeanDataSource()
           {
             @Override
@@ -180,6 +184,7 @@ public <VALUE> void removeField(IField<VALUE> pField)
             {
             }
           });
+
           pBean.setValue(SomeBean.field1, "someValue");
         });
   }
@@ -193,15 +198,16 @@ public <VALUE> void removeField(IField<VALUE> pField)
    */
   private void _testAddition(BiConsumer<IField<?>, SomeBean> pAdder, int pExpectedIndex)
   {
-    final DecimalField fieldToAdd = BeanFieldFactory.createField(DecimalField.class, "fieldX", false,
-                                                                 Collections.emptyList(), null);
+    final DecimalField fieldToAdd = BeanFieldFactory.createField(DecimalField.class, "fieldX", false, //
+        Collections.emptyList(), null);
 
-    observe(bean, IBean::observeFieldAdditions)
-        .assertCallCount(1)
-        .assertOnEveryValue(pChange -> {
+    observe(bean, IBean::observeFieldAdditions) //
+        .assertCallCount(1) //
+        .assertOnEveryValue(pChange ->
+        {
           assertSame(fieldToAdd, pChange.getField());
           assertEquals(pExpectedIndex, pChange.getSource().getFieldIndex(pChange.getField()));
-        })
+        }) //
         .whenDoing(pBean -> pAdder.accept(fieldToAdd, pBean));
   }
 
@@ -214,16 +220,17 @@ private void _testAddition(BiConsumer<IField<?>, SomeBean> pAdder, int pExpected
    */
   private void _testRemoval(Consumer<SomeBean> pRemover, int pExpectedCallCount)
   {
-    observe(bean, IBean::observeFieldRemovals)
-        .assertCallCount(pExpectedCallCount)
-        .assertOnEveryValue(pChange -> {
+    observe(bean, IBean::observeFieldRemovals) //
+        .assertCallCount(pExpectedCallCount) //
+        .assertOnEveryValue(pChange ->
+        {
           if (pChange.getField() == SomeBean.field1)
             assertEquals(INITIAL_VALUE, pChange.getFieldValue());
           else if (pChange.getField() == SomeBean.field2)
             assertEquals(INITIAL_NUMBER, pChange.getFieldValue());
           else
             fail("unknown field");
-        })
+        }) //
         .whenDoing(pRemover);
   }
 
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanOptionalFieldTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanOptionalFieldTest.java
index 9cfa670..360649c 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanOptionalFieldTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanOptionalFieldTest.java
@@ -49,11 +49,12 @@ public void testStream()
   @Test
   public void testFieldObservers()
   {
-    observe(bean, IBean::observeFieldAdditions)
-        .assertCallCount(2)
+    observe(bean, IBean::observeFieldAdditions) //
+        .assertCallCount(2) //
         .whenDoing(pBean -> pBean.setValue(SomeBean.optionalField1, 1));
-    observe(bean, IBean::observeFieldRemovals)
-        .assertCallCount(1)
+
+    observe(bean, IBean::observeFieldRemovals) //
+        .assertCallCount(1) //
         .whenDoing(pBean -> pBean.setValue(SomeBean.normalField, "test"));
   }
 
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanTest.java
index 4469249..82e51fc 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/BeanTest.java
@@ -79,7 +79,8 @@ public void testSetValueNotExistingField()
   public void testSetNullValueForbidden()
   {
     assertThrows(NullValueForbiddenException.class, () -> bean.setValue(SomeBean.specialTextField, null)); //Field type annotated
-    assertThrows(NullValueForbiddenException.class, () -> bean.setValue(SomeBean.numberField, null)); //Number field type annotated naturally
+    assertThrows(NullValueForbiddenException.class,
+        () -> bean.setValue(SomeBean.numberField, null)); //Number field type annotated naturally
     assertThrows(NullValueForbiddenException.class, () -> bean.setValue(SomeBean.someOtherField, null));
     //Should also throw with @FinalNeverNull
     assertThrows(NullValueForbiddenException.class, () -> bean.setValue(SomeBean.someOtherFinalField, null));
@@ -101,11 +102,10 @@ public void testFinalField()
   public void testClear()
   {
     bean.clear();
-
     assertEquals(OTHER_VALUE, bean.getValue(SomeBean.someOtherField)); //Should not have been cleared because of @NeverNull
 
-    bean.stream()
-        .filter(pTuple -> !pTuple.getField().mustNeverBeNull())
+    bean.stream() //
+        .filter(pTuple -> !pTuple.getField().mustNeverBeNull()) //
         .forEach(pTuple -> assertEquals(pTuple.getField().getInitialValue(), pTuple.getValue()));
   }
 
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/literals/fields/types/MapFieldTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/literals/fields/types/MapFieldTest.java
index b308365..752f864 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/literals/fields/types/MapFieldTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/literals/fields/types/MapFieldTest.java
@@ -82,9 +82,11 @@ public void testWithSubTypesOfDefaultFields()
     map.put("key2", new SomeBean());
     map.put("key3", new SomeBean());
     final IMapBean<String, SomeBean> mapBean = SomeBean.mapField2.createBeanFromMap(map, SomeBean.class);
-    final IField<?> firstField = mapBean.streamFields()
-        .findFirst()
+
+    final IField<?> firstField = mapBean.streamFields() //
+        .findFirst() //
         .orElseThrow(AssertionError::new);
+
     assertSame(BeanField.class, firstField.getClass());
   }
 
@@ -97,8 +99,9 @@ private static void _testFieldTuples(IBean pBean)
   {
     final AtomicInteger index = new AtomicInteger();
     //Test in order and proper to bean transformation
-    pBean.stream()
-        .forEach(pTuple -> {
+    pBean.stream() //
+        .forEach(pTuple ->
+        {
           assertEquals(String.valueOf(index.get()), pTuple.getField().getName());
           assertEquals("value" + index.getAndIncrement(), pTuple.getValue());
         });
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/references/BeanReferenceTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/references/BeanReferenceTest.java
index 6ba0862..f3ffd60 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/references/BeanReferenceTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/references/BeanReferenceTest.java
@@ -33,11 +33,14 @@ public void testDirectParentsBean()
   public void testDirectParentsContainer()
   {
     final PersonRegistry registry = new PersonRegistry();
-    final List<BeanReference> directReferences = registry.getValue(PersonRegistry.persons).stream()
-        .flatMap(pPerson -> pPerson.getDirectReferences().stream())
+    final List<BeanReference> directReferences = registry.getValue(PersonRegistry.persons).stream() //
+        .flatMap(pPerson -> pPerson.getDirectReferences().stream()) //
         .collect(Collectors.toList());
+
     assertEquals(3, directReferences.size());
-    directReferences.forEach(pNode -> {
+
+    directReferences.forEach(pNode ->
+    {
       assertSame(pNode.getBean(), registry);
       assertSame(pNode.getField(), PersonRegistry.persons);
     });
diff --git a/ojcms-beans/src/test/java/de/adito/ojcms/beans/statistics/BeanStatisticsTest.java b/ojcms-beans/src/test/java/de/adito/ojcms/beans/statistics/BeanStatisticsTest.java
index ce7698f..bb29ed3 100644
--- a/ojcms-beans/src/test/java/de/adito/ojcms/beans/statistics/BeanStatisticsTest.java
+++ b/ojcms-beans/src/test/java/de/adito/ojcms/beans/statistics/BeanStatisticsTest.java
@@ -30,7 +30,7 @@ class BeanStatisticsTest
   public void resetBean()
   {
     bean = new SomeBean();
-    statisticData = bean.getStatisticData(SomeBean.field)
+    statisticData = bean.getStatisticData(SomeBean.field) //
         .orElseThrow(() -> new OJInternalException("Statistics not available!"));
   }
 
@@ -69,9 +69,9 @@ public void testEntryObserver()
   {
     assertNotNull(statisticData);
     final AtomicInteger index = new AtomicInteger();
-    observe(statisticData, IStatisticData::observeStatistics)
-        .assertCallCount(10)
-        .assertOnEveryValue(pNewEntry -> assertEquals("value" + index.getAndIncrement(), pNewEntry.getValue()))
+    observe(statisticData, IStatisticData::observeStatistics) //
+        .assertCallCount(10) //
+        .assertOnEveryValue(pNewEntry -> assertEquals("value" + index.getAndIncrement(), pNewEntry.getValue())) //
         .whenDoing(pStatistics -> IntStream.range(0, 10).forEach(pIndex -> bean.setValue(SomeBean.field, "value" + pIndex)));
   }
 
@@ -91,13 +91,15 @@ public void testIntervalStatistics() throws InterruptedException
     assertEquals(expectedEntryCount, actualEntrySize);
 
     final String newEntry = "someEntry";
-    observe(statisticData, pData -> pData.getIntervalStatistics(interval))
-        .assertCallCount(2)
-        .assertOnEveryValue(pUpdatedMap -> {
+    observe(statisticData, pData -> pData.getIntervalStatistics(interval)) //
+        .assertCallCount(2) //
+        .assertOnEveryValue(pUpdatedMap ->
+        {
           assertTrue(actualEntrySize < pUpdatedMap.size());
           assertEquals(newEntry, pUpdatedMap.get(new LinkedList<>(pUpdatedMap.keySet()).getLast()));
-        })
-        .whenDoing(pData -> {
+        }) //
+        .whenDoing(pData ->
+        {
           //wait a short time and add an entry
           try
           {
diff --git a/ojcms-cdi-testutils/src/main/java/de/adito/ojcms/cdi/AbstractCdiTest.java b/ojcms-cdi-testutils/src/main/java/de/adito/ojcms/cdi/AbstractCdiTest.java
index 359dbd7..068113b 100644
--- a/ojcms-cdi-testutils/src/main/java/de/adito/ojcms/cdi/AbstractCdiTest.java
+++ b/ojcms-cdi-testutils/src/main/java/de/adito/ojcms/cdi/AbstractCdiTest.java
@@ -29,8 +29,8 @@ public static void initCdiContainer()
   public void setupCdi()
   {
     //Start all custom contexts in classpath
-    customContextList = CdiContainer.getAllCustomScopeAnnotationTypes().stream()
-        .map(pScopeAnnotationType -> cdiControl.startContext(pScopeAnnotationType))
+    customContextList = CdiContainer.getAllCustomScopeAnnotationTypes().stream() //
+        .map(pScopeAnnotationType -> cdiControl.startContext(pScopeAnnotationType)) //
         .collect(Collectors.toList());
 
     cdiControl.injectInstance(this);
diff --git a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java
index 46b8eb7..0cd3836 100644
--- a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java
+++ b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CdiContainer.java
@@ -27,8 +27,8 @@ public final class CdiContainer
 
   static
   {
-    CUSTOM_CONTEXTS = IPicoRegistry.INSTANCE.find(AbstractCustomContext.class, CustomCdiContext.class).keySet().stream()
-        .map(CdiContainer::_createContext)
+    CUSTOM_CONTEXTS = IPicoRegistry.INSTANCE.find(AbstractCustomContext.class, CustomCdiContext.class).keySet().stream() //
+        .map(CdiContainer::_createContext) //
         .collect(Collectors.toMap(Context::getScope, identity()));
   }
 
@@ -49,7 +49,8 @@ private CdiContainer()
    */
   public static ICdiControl boot()
   {
-    return boot(config -> {
+    return boot(config ->
+    {
     });
   }
 
diff --git a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CustomScopesExtension.java b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CustomScopesExtension.java
index 860ad0f..b955556 100644
--- a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CustomScopesExtension.java
+++ b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/CustomScopesExtension.java
@@ -19,7 +19,7 @@ class CustomScopesExtension implements Extension
    */
   void beforeBeanDiscovery(@Observes BeforeBeanDiscovery pBeforeBeanDiscovery)
   {
-    CdiContainer.getAllCustomScopeAnnotationTypes()
+    CdiContainer.getAllCustomScopeAnnotationTypes() //
         .forEach(pAnnotationType -> pBeforeBeanDiscovery.addScope(pAnnotationType, true, false));
   }
 
diff --git a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/context/AbstractCustomContext.java b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/context/AbstractCustomContext.java
index 00d767b..55cb836 100644
--- a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/context/AbstractCustomContext.java
+++ b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/context/AbstractCustomContext.java
@@ -101,8 +101,8 @@ <T> T getOrCreate(Contextual<T> pContextual, CreationalContext<T> pCreationalCon
     <T> T get(Contextual<T> pContextual)
     {
       //noinspection unchecked
-      return Optional.ofNullable(instances.get(pContextual))
-          .map(pContextualInstance -> (T) pContextualInstance.instance)
+      return Optional.ofNullable(instances.get(pContextual)) //
+          .map(pContextualInstance -> (T) pContextualInstance.instance) //
           .orElse(null);
     }
 
diff --git a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/startup/StartupExtension.java b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/startup/StartupExtension.java
index 8acbe4c..3d9c14c 100644
--- a/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/startup/StartupExtension.java
+++ b/ojcms-cdi/src/main/java/de/adito/ojcms/cdi/startup/StartupExtension.java
@@ -31,10 +31,10 @@ void findCallbacks(@Observes ProcessBean<? extends IStartupCallback> pProcessedB
    */
   void afterCdiStartup(@Observes @Initialized(ApplicationScoped.class) Object pObject)
   {
-    startupCallbacks.stream()
-        .map(pCallbackType -> CDI.current().select(pCallbackType).get())
+    startupCallbacks.stream() //
+        .map(pCallbackType -> CDI.current().select(pCallbackType).get()) //
         //Execute them in descending priority order
-        .sorted(Comparator.comparingInt(IStartupCallback::priority).reversed())
+        .sorted(Comparator.comparingInt(IStartupCallback::priority).reversed()) //
         .forEach(IStartupCallback::onCdiStartup);
   }
 }
diff --git a/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/BeanProducerExtension.java b/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/BeanProducerExtension.java
index dc541c4..1b845e0 100644
--- a/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/BeanProducerExtension.java
+++ b/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/BeanProducerExtension.java
@@ -69,8 +69,8 @@ void afterBeanDiscovery(@Observes AfterBeanDiscovery pAfterBeanDiscovery)
    * @param pBeanType      the annotated bean type
    * @param pProcessedBean the processed CDI bean
    */
-  private static void _registerPersistentBeanType(Persist pAnnotation, Class<? extends IBean> pBeanType, ProcessAnnotatedType<?
-      extends IBean> pProcessedBean)
+  private static void _registerPersistentBeanType(Persist pAnnotation, Class<? extends IBean> pBeanType,
+                                                  ProcessAnnotatedType<? extends IBean> pProcessedBean)
   {
     if (Modifier.isAbstract(pBeanType.getModifiers()))
       throw new OJPersistenceException("Abstract bean type " + pBeanType.getName() + " cannot be persisted!");
diff --git a/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/PersistentContainerDatasource.java b/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/PersistentContainerDatasource.java
index 9e31234..c8029fd 100644
--- a/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/PersistentContainerDatasource.java
+++ b/ojcms-persistence/src/main/java/de/adito/ojcms/persistence/datasource/PersistentContainerDatasource.java
@@ -76,8 +76,8 @@ public void sort(Comparator<BEAN> pComparator)
   public Iterator<BEAN> iterator()
   {
     content.requiresFullLoad();
-    return IndexBasedIterator.buildIterator(this::getBean, this::size)
-        .withRemover(this::removeBean)
+    return IndexBasedIterator.buildIterator(this::getBean, this::size) //
+        .withRemover(this::removeBean) //
         .createIterator();
   }
 }
diff --git a/ojcms-representation/src/main/java/de/adito/ojcms/representation/visual/AbstractVisualTransformator.java b/ojcms-representation/src/main/java/de/adito/ojcms/representation/visual/AbstractVisualTransformator.java
index 262af32..3f48ad9 100644
--- a/ojcms-representation/src/main/java/de/adito/ojcms/representation/visual/AbstractVisualTransformator.java
+++ b/ojcms-representation/src/main/java/de/adito/ojcms/representation/visual/AbstractVisualTransformator.java
@@ -6,9 +6,9 @@
  * Abstract base class for a visual transformator.
  * Stores the reference to the original source and provides a queue to store operations to perform after the transformation.
  *
- * @param <LOGIC>        the logic bean type to transform
- * @param <VISUAL>       the visual counter type to which the logic part will be transformed
- * @param <SOURCE>       the type of the source to transform
+ * @param <LOGIC>  the logic bean type to transform
+ * @param <VISUAL> the visual counter type to which the logic part will be transformed
+ * @param <SOURCE> the type of the source to transform
  * @author Simon Danner, 07.02.2017
  */
 abstract class AbstractVisualTransformator<LOGIC, VISUAL, SOURCE extends ILinkable> implements IVisualTransformator<LOGIC, VISUAL, SOURCE>
diff --git a/ojcms-rest/src/main/java/de/adito/ojcms/rest/config/FileBasedDatabaseConfig.java b/ojcms-rest/src/main/java/de/adito/ojcms/rest/config/FileBasedDatabaseConfig.java
index d1e560d..e72211d 100644
--- a/ojcms-rest/src/main/java/de/adito/ojcms/rest/config/FileBasedDatabaseConfig.java
+++ b/ojcms-rest/src/main/java/de/adito/ojcms/rest/config/FileBasedDatabaseConfig.java
@@ -70,8 +70,8 @@ public IDatabaseConnectionSupplier createConnectionSupplier(ConnectionSupplierFa
   private static boolean _resolveEmbedded(Properties pProperties)
   {
     final String embedded = _loadProperty(KEY_EMBEDDED, pProperties, false);
-    return Optional.ofNullable(embedded)
-        .map(pValue -> Boolean.parseBoolean(embedded))
+    return Optional.ofNullable(embedded) //
+        .map(pValue -> Boolean.parseBoolean(embedded)) //
         .orElse(false);
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLBuilder.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLBuilder.java
index 0e1bd16..900ca9a 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLBuilder.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLBuilder.java
@@ -94,10 +94,11 @@ public <RESULT> RESULT doSelect(Function<Select, RESULT> pSelectQuery)
   }
 
   @Override
-  public <VALUE, RESULT> RESULT doSelectOne(IColumnIdentification<VALUE> pColumnToSelect, Function<SingleSelect<VALUE>, RESULT> pSelectQuery)
+  public <VALUE, RESULT> RESULT doSelectOne(IColumnIdentification<VALUE> pColumnToSelect,
+                                            Function<SingleSelect<VALUE>, RESULT> pSelectQuery)
   {
-    final SingleSelect<VALUE> select = new SingleSelect<>(execution.createExecutor(), this, platform, serializer,
-                                                          idColumnName, pColumnToSelect);
+    final SingleSelect<VALUE> select =
+        new SingleSelect<>(execution.createExecutor(), this, platform, serializer, idColumnName, pColumnToSelect);
 
     return execution.query(configureStatementBeforeExecution(select), pSelectQuery);
   }
@@ -106,8 +107,8 @@ public <VALUE, RESULT> RESULT doSelectOne(IColumnIdentification<VALUE> pColumnTo
   public <RESULT> RESULT doSelectId(Function<SingleSelect<Integer>, RESULT> pSelectQuery)
   {
     final IColumnIdentification<Integer> idColumnIdentification = IColumnIdentification.of(idColumnName, Integer.class);
-    final SingleSelect<Integer> select = new SingleSelect<>(execution.createExecutor(), this, platform, serializer, idColumnName,
-                                                            idColumnIdentification);
+    final SingleSelect<Integer> select =
+        new SingleSelect<>(execution.createExecutor(), this, platform, serializer, idColumnName, idColumnIdentification);
 
     return execution.query(configureStatementBeforeExecution(select), pSelectQuery);
   }
@@ -126,7 +127,8 @@ public IDatabaseConnectionSupplier getPlatformConnectionSupplier()
    * @param <RESULT>    the generic type of the result of the statement
    * @param <STATEMENT> the runtime type of the statement
    */
-  protected <RESULT, STATEMENT extends AbstractSQLStatement<RESULT, STATEMENT>> STATEMENT configureStatementBeforeExecution(STATEMENT pStatement)
+  protected <RESULT, STATEMENT extends AbstractSQLStatement<RESULT, STATEMENT>> STATEMENT configureStatementBeforeExecution(
+      STATEMENT pStatement)
   {
     return pStatement; //Nothing happens here, may be overwritten in sub classes
   }
@@ -150,8 +152,7 @@ protected boolean dropTable(String pTableName)
    */
   protected void addColumn(String pTableName, IColumnDefinition pColumnDefinition)
   {
-    execution.executeVoidStatement("ALTER TABLE " + pTableName + " ADD " +
-                                       pColumnDefinition.toStatementFormat(platform, idColumnName));
+    execution.executeVoidStatement("ALTER TABLE " + pTableName + " ADD " + pColumnDefinition.toStatementFormat(platform, idColumnName));
   }
 
   /**
@@ -162,8 +163,7 @@ protected void addColumn(String pTableName, IColumnDefinition pColumnDefinition)
    */
   protected void removeColumn(String pTableName, IColumnIdentification<?> pColumn)
   {
-    execution.executeVoidStatement("ALTER TABLE " + pTableName + " DROP COLUMN " +
-                                       pColumn.toStatementFormat(platform, idColumnName));
+    execution.executeVoidStatement("ALTER TABLE " + pTableName + " DROP COLUMN " + pColumn.toStatementFormat(platform, idColumnName));
   }
 
   /**
@@ -187,10 +187,10 @@ protected void ifTableNotExistingCreate(String pTableName, Consumer<Create> pCre
   {
     if (!hasTable(pTableName))
       doCreate(pCreate ->
-               {
-                 pCreate.tableName(pTableName); //Add table name for convenience
-                 pCreateStatement.accept(pCreate);
-               });
+      {
+        pCreate.tableName(pTableName); //Add table name for convenience
+        pCreateStatement.accept(pCreate);
+      });
   }
 
   /**
@@ -200,7 +200,8 @@ protected void ifTableNotExistingCreate(String pTableName, Consumer<Create> pCre
    */
   protected Set<String> getAllTableNames()
   {
-    return execution.retrieveFromMetaData(pMetaData -> {
+    return execution.retrieveFromMetaData(pMetaData ->
+    {
       final Set<String> names = new HashSet<>();
       final ResultSet tables = pMetaData.getTables(null, null, "%", null);
       while (tables.next())
@@ -233,8 +234,8 @@ protected int getColumnCount(String pTableName)
    */
   protected boolean hasColumn(String pTableName, String pColumnName)
   {
-    return execution.retrieveFromMetaData(pMetaData -> pMetaData.getColumns(null, null, pTableName.toUpperCase(),
-                                                                            pColumnName.toUpperCase()).next());
+    return execution
+        .retrieveFromMetaData(pMetaData -> pMetaData.getColumns(null, null, pTableName.toUpperCase(), pColumnName.toUpperCase()).next());
   }
 
   /**
@@ -245,9 +246,11 @@ protected boolean hasColumn(String pTableName, String pColumnName)
    */
   protected Set<String> getAllColumnNames(String pTableName)
   {
-    return execution.retrieveFromMetaData(pMetaData -> {
+    return execution.retrieveFromMetaData(pMetaData ->
+    {
       final ResultSet resultSet = pMetaData.getColumns(null, null, pTableName.toUpperCase(), null);
       final Set<String> columnNames = new HashSet<>();
+
       while (resultSet.next())
         columnNames.add(resultSet.getString("COLUMN_NAME"));
       return columnNames;
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLStatement.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLStatement.java
index a84fb46..e58b708 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLStatement.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/AbstractSQLStatement.java
@@ -1,6 +1,6 @@
 package de.adito.ojcms.sqlbuilder;
 
-import de.adito.ojcms.sqlbuilder.definition.*;
+import de.adito.ojcms.sqlbuilder.definition.IColumnIdentification;
 import de.adito.ojcms.sqlbuilder.executors.IStatementExecutor;
 import de.adito.ojcms.sqlbuilder.format.StatementFormatter;
 import de.adito.ojcms.sqlbuilder.platform.IDatabasePlatform;
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderFactory.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderFactory.java
index 01a26a0..2897f93 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderFactory.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderFactory.java
@@ -133,7 +133,7 @@ public Builder forMultipleTables()
     public OJSQLBuilderForTable create()
     {
       return new OJSQLBuilderForTableImpl(databasePlatform, connectionSupplier, closeConnectionAfterStatement, serializer, tableName,
-                                          idColumnName);
+          idColumnName);
     }
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderForTableImpl.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderForTableImpl.java
index b668070..007b9f3 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderForTableImpl.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/OJSQLBuilderForTableImpl.java
@@ -88,7 +88,8 @@ public Set<String> getAllColumnNames()
   }
 
   @Override
-  protected <RESULT, STATEMENT extends AbstractSQLStatement<RESULT, STATEMENT>> STATEMENT configureStatementBeforeExecution(STATEMENT pStatement)
+  protected <RESULT, STATEMENT extends AbstractSQLStatement<RESULT, STATEMENT>> STATEMENT configureStatementBeforeExecution(
+      STATEMENT pStatement)
   {
     pStatement.setTableName(tableName);
     return pStatement;
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnIdentification.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnIdentification.java
index f63ad5d..bf0fab3 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnIdentification.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnIdentification.java
@@ -156,10 +156,10 @@ static <SOURCE> IColumnIdentification[] ofMultiple(Stream<SOURCE> pStream, Funct
                                                      @Nullable BiPredicate<String, Class> pNumericDeterminer)
   {
     //noinspection unchecked
-    Function<SOURCE, IColumnIdentification> mapper = pSource -> of(pNameResolver.apply(pSource), pDataTypeResolver.apply(pSource),
-                                                                   (BiPredicate) pNumericDeterminer);
-    return pStream
-        .map(mapper)
+    Function<SOURCE, IColumnIdentification> mapper =
+        pSource -> of(pNameResolver.apply(pSource), pDataTypeResolver.apply(pSource), (BiPredicate) pNumericDeterminer);
+    return pStream //
+        .map(mapper) //
         .toArray(IColumnIdentification[]::new);
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnValueTuple.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnValueTuple.java
index ddcc37f..984e492 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnValueTuple.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/IColumnValueTuple.java
@@ -76,7 +76,8 @@ public VALUE getValue()
    * @param <SOURCE>          the generic type of the source objects
    * @return an array of column value tuples
    */
-  static <SOURCE> IColumnValueTuple[] ofMultiple(Collection<SOURCE> pSourceCollection, Function<SOURCE, IColumnIdentification> pColumnResolver,
+  static <SOURCE> IColumnValueTuple[] ofMultiple(Collection<SOURCE> pSourceCollection,
+                                                 Function<SOURCE, IColumnIdentification> pColumnResolver,
                                                  Function<SOURCE, ?> pValueResolver)
   {
     return ofMultiple(pSourceCollection.stream(), pColumnResolver, pValueResolver);
@@ -95,8 +96,8 @@ static <SOURCE> IColumnValueTuple[] ofMultiple(Stream<SOURCE> pStream, Function<
                                                  Function<SOURCE, ?> pValueResolver)
   {
     //noinspection unchecked
-    return pStream
-        .map(pSource -> of((IColumnIdentification<Object>) pColumnResolver.apply(pSource), pValueResolver.apply(pSource)))
+    return pStream //
+        .map(pSource -> of((IColumnIdentification<Object>) pColumnResolver.apply(pSource), pValueResolver.apply(pSource))) //
         .toArray(IColumnValueTuple[]::new);
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/INumericValueAdaption.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/INumericValueAdaption.java
index ad9d7cb..71b14df 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/INumericValueAdaption.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/INumericValueAdaption.java
@@ -52,7 +52,8 @@ default String toStatementFormat(IDatabasePlatform pPlatform, String pIdColumnNa
    * @param <NUMBER>   the generic type for the number
    * @return a new instance based on given values
    */
-  static <NUMBER extends Number> INumericValueAdaption<NUMBER> of(IColumnIdentification<NUMBER> pColumn, ENumericOperation pOperation, NUMBER pNumber)
+  static <NUMBER extends Number> INumericValueAdaption<NUMBER> of(IColumnIdentification<NUMBER> pColumn, ENumericOperation pOperation,
+                                                                  NUMBER pNumber)
   {
     return new INumericValueAdaption<NUMBER>()
     {
@@ -110,8 +111,9 @@ static <SOURCE> INumericValueAdaption[] ofMultiple(Stream<SOURCE> pStream,
                                                      Function<SOURCE, ? extends Number> pNumberResolver)
   {
     //noinspection unchecked
-    return pStream
-        .map(pSource -> of((IColumnIdentification<Number>) pColumnResolver.apply(pSource), pOperationResolver.apply(pSource), pNumberResolver.apply(pSource)))
+    return pStream //
+        .map(pSource -> of((IColumnIdentification<Number>) pColumnResolver.apply(pSource), pOperationResolver.apply(pSource),
+            pNumberResolver.apply(pSource))) //
         .toArray(INumericValueAdaption[]::new);
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/EColumnType.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/EColumnType.java
index 5e95484..3be4c20 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/EColumnType.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/EColumnType.java
@@ -13,9 +13,9 @@
 public enum EColumnType
 {
   //text
-  CHAR(Character.class), STRING(String.class), BLOB(byte[].class),
+  CHAR(Character.class), STRING(String.class), BLOB(byte[].class), //
   //number
-  SHORT(Short.class), INT(Integer.class), LONG(Long.class), FLOAT(Float.class), DOUBLE(Double.class),
+  SHORT(Short.class), INT(Integer.class), LONG(Long.class), FLOAT(Float.class), DOUBLE(Double.class), //
   //date
   DATE(LocalDate.class), DATETIME(LocalDateTime.class), TIME(LocalTime.class);
 
@@ -49,9 +49,9 @@ public IColumnType create()
    */
   public static Optional<IColumnType> getByDataType(Class pJavaDataType)
   {
-    return Stream.of(values())
-        .filter(pColumnType -> pColumnType.javaDataType == pJavaDataType)
-        .findAny()
+    return Stream.of(values()) //
+        .filter(pColumnType -> pColumnType.javaDataType == pJavaDataType) //
+        .findAny() //
         .map(EColumnType::create);
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnDefinition.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnDefinition.java
index 309aadf..9cef749 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnDefinition.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnDefinition.java
@@ -47,7 +47,7 @@ default String toStatementFormat(IDatabasePlatform pPlatform, String pIdColumnNa
    */
   static IColumnDefinition forType(Class<?> pType, String pColumnName, @Nullable UnaryOperator<IColumnType> pModifier)
   {
-    final IColumnType columnType = EColumnType.getByDataType(pType)
+    final IColumnType columnType = EColumnType.getByDataType(pType) //
         .orElseThrow(() -> new OJDatabaseException("No column type found for data type " + pType.getName()));
     return of(pColumnName, pModifier == null ? columnType : pModifier.apply(columnType));
   }
@@ -104,8 +104,8 @@ static <SOURCE> IColumnDefinition[] ofMultiple(Collection<SOURCE> pSourceCollect
   static <SOURCE> IColumnDefinition[] ofMultiple(Stream<SOURCE> pStream, Function<SOURCE, String> pNameResolver,
                                                  Function<SOURCE, IColumnType> pTypeResolver)
   {
-    return pStream
-        .map(pSource -> of(pNameResolver.apply(pSource), pTypeResolver.apply(pSource)))
+    return pStream //
+        .map(pSource -> of(pNameResolver.apply(pSource), pTypeResolver.apply(pSource))) //
         .toArray(IColumnDefinition[]::new);
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnType.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnType.java
index 1730fb3..a005cdb 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnType.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/column/IColumnType.java
@@ -25,9 +25,10 @@ public interface IColumnType extends IStatementFormat, Iterable<EColumnModifier>
   @Override
   default String toStatementFormat(IDatabasePlatform pPlatform, String pIdColumnName)
   {
-    final String modifiers = streamModifiers()
-        .map(pModifier -> pModifier.toStatementFormat(pPlatform, pIdColumnName))
+    final String modifiers = streamModifiers() //
+        .map(pModifier -> pModifier.toStatementFormat(pPlatform, pIdColumnName)) //
         .collect(Collectors.joining(" "));
+
     return pPlatform.columnTypeToStatementFormat(this) + (modifiers.isEmpty() ? "" : " " + modifiers);
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/AbstractStatementConcatenation.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/AbstractStatementConcatenation.java
index cfb62b5..0b413ff 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/AbstractStatementConcatenation.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/AbstractStatementConcatenation.java
@@ -34,9 +34,9 @@ protected AbstractStatementConcatenation(IPreparedStatementFormat pInitialEntry)
   @Override
   public String toStatementFormat(IDatabasePlatform pPlatform, String pIdColumnName)
   {
-    return stream()
-        .map(pCondition -> StatementFormatter.toFormat(pCondition, pPlatform, pIdColumnName) + " " +
-            (hasConcatenation(pCondition) ? getConcatenationType(pCondition).name() + " " : ""))
+    return stream() //
+        .map(pCondition -> StatementFormatter.toFormat(pCondition, pPlatform, pIdColumnName) + " " + //
+            (hasConcatenation(pCondition) ? getConcatenationType(pCondition).name() + " " : "")) //
         .collect(Collectors.joining());
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IMultipleCondition.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IMultipleCondition.java
index 639633f..dc3b013 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IMultipleCondition.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IMultipleCondition.java
@@ -1,6 +1,6 @@
 package de.adito.ojcms.sqlbuilder.definition.condition;
 
-import de.adito.ojcms.sqlbuilder.definition.*;
+import de.adito.ojcms.sqlbuilder.definition.IColumnValueTuple;
 import de.adito.ojcms.sqlbuilder.format.IPreparedStatementFormat;
 
 import java.util.List;
@@ -19,8 +19,8 @@ interface IMultipleCondition<CONDITION extends IMultipleCondition<CONDITION>>
   @Override
   default List<IColumnValueTuple<?>> getArguments(String pIdColumnName)
   {
-    return stream()
-        .flatMap(pCondition -> pCondition.getArguments(pIdColumnName).stream())
+    return stream() //
+        .flatMap(pCondition -> pCondition.getArguments(pIdColumnName).stream()) //
         .collect(Collectors.toList());
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereCondition.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereCondition.java
index 327d2f1..3664dd2 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereCondition.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereCondition.java
@@ -181,10 +181,8 @@ static <VALUE> IWhereCondition<VALUE> of(IColumnIdentification<VALUE> pColumn, V
    * @param <SOURCE>          the generic type of the source objects
    * @return an array of where conditions
    */
-  static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pSourceCollection,
-                                              Function<SOURCE, IColumnIdentification> pColumnResolver,
-                                              Function<SOURCE, ?> pValueResolver,
-                                              Function<SOURCE, IWhereOperator> pOperatorResolver)
+  static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pSourceCollection, Function<SOURCE, IColumnIdentification> pColumnResolver,
+                                              Function<SOURCE, ?> pValueResolver, Function<SOURCE, IWhereOperator> pOperatorResolver)
   {
     return ofMultiple(pSourceCollection.stream(), pColumnResolver, pValueResolver, pOperatorResolver);
   }
@@ -199,15 +197,14 @@ static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pSourceCollection
    * @param <SOURCE>          the generic type of the source objects
    * @return an array of where conditions
    */
-  static <SOURCE> IWhereConditions ofMultiple(Stream<SOURCE> pStream,
-                                              Function<SOURCE, IColumnIdentification> pColumnResolver,
-                                              Function<SOURCE, ?> pValueResolver,
-                                              Function<SOURCE, IWhereOperator> pOperatorResolver)
+  static <SOURCE> IWhereConditions ofMultiple(Stream<SOURCE> pStream, Function<SOURCE, IColumnIdentification> pColumnResolver,
+                                              Function<SOURCE, ?> pValueResolver, Function<SOURCE, IWhereOperator> pOperatorResolver)
   {
 
     //noinspection unchecked
-    return IWhereConditions.createFromMultiple(pStream.map(pSource -> of(pColumnResolver.apply(pSource), pValueResolver.apply(pSource),
-                                                                         pOperatorResolver.apply(pSource))), EConcatenationType.AND);
+    return IWhereConditions.createFromMultiple(pStream //
+        .map(pSource -> of(pColumnResolver.apply(pSource), pValueResolver.apply(pSource), //
+            pOperatorResolver.apply(pSource))), EConcatenationType.AND);
   }
 
   /**
@@ -220,8 +217,7 @@ static <SOURCE> IWhereConditions ofMultiple(Stream<SOURCE> pStream,
    * @param <SOURCE>           the generic type of the source objects
    * @return an array of where conditions
    */
-  static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pCollection,
-                                              Function<SOURCE, IColumnIdentification> pColumnResolver,
+  static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pCollection, Function<SOURCE, IColumnIdentification> pColumnResolver,
                                               Function<SOURCE, ?> pValueResolver,
                                               BiFunction<IColumnIdentification, Object, IWhereCondition> pConditionResolver)
   {
@@ -238,14 +234,14 @@ static <SOURCE> IWhereConditions ofMultiple(Collection<SOURCE> pCollection,
    * @param <SOURCE>           the generic type of the source objects
    * @return an array of where conditions
    */
-  static <SOURCE> IWhereConditions ofMultiple(Stream<SOURCE> pStream,
-                                              Function<SOURCE, IColumnIdentification> pColumnResolver,
+  static <SOURCE> IWhereConditions ofMultiple(Stream<SOURCE> pStream, Function<SOURCE, IColumnIdentification> pColumnResolver,
                                               Function<SOURCE, ?> pValueResolver,
                                               BiFunction<IColumnIdentification, Object, IWhereCondition> pConditionResolver)
   {
     //noinspection unchecked
-    return IWhereConditions.createFromMultiple(pStream.map(pSource -> pConditionResolver.apply(pColumnResolver.apply(pSource),
-                                                                                               pValueResolver.apply(pSource))), EConcatenationType.AND);
+    return IWhereConditions
+        .createFromMultiple(pStream.map(pSource -> pConditionResolver.apply(pColumnResolver.apply(pSource), pValueResolver.apply(pSource))),
+            EConcatenationType.AND);
   }
 
   /**
@@ -285,7 +281,8 @@ static <VALUE> IWhereCondition<VALUE> in(IColumnIdentification<VALUE> pColumn, S
    * @return the created where condition
    */
   static <VALUE> IWhereCondition<VALUE> in(IColumnIdentification<VALUE> pColumn,
-                                           BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator, Iterable<VALUE> pValues)
+                                           BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator,
+                                           Iterable<VALUE> pValues)
   {
     return in(pColumn, pTupleCreator, StreamSupport.stream(pValues.spliterator(), false));
   }
@@ -301,7 +298,8 @@ static <VALUE> IWhereCondition<VALUE> in(IColumnIdentification<VALUE> pColumn,
    * @return the created where condition
    */
   static <VALUE> IWhereCondition<VALUE> in(IColumnIdentification<VALUE> pColumn,
-                                           BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator, Stream<VALUE> pValues)
+                                           BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator,
+                                           Stream<VALUE> pValues)
   {
     return new InConditionImpl<>(pColumn, pTupleCreator, pValues);
   }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereConditions.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereConditions.java
index c99f121..5e1ee1a 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereConditions.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/IWhereConditions.java
@@ -48,7 +48,9 @@ static IWhereConditions createFromMultiple(Stream<IWhereCondition<?>> pCondition
     final List<IWhereCondition<?>> conditionList = pConditions.collect(Collectors.toList());
     final IWhereConditions conditions = IWhereConditions.create(conditionList.remove(0));
     final boolean and = pConcatenationType == EConcatenationType.AND;
-    conditionList.forEach(pCondition -> {
+
+    conditionList.forEach(pCondition ->
+    {
       if (and)
         conditions.and(pCondition);
       else
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/InConditionImpl.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/InConditionImpl.java
index 41e7adb..d16f0e4 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/InConditionImpl.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/InConditionImpl.java
@@ -27,13 +27,13 @@ class InConditionImpl<VALUE> extends ConditionImpl<VALUE>
    *                      this is mainly used for serialization
    * @param pValues       a stream of values the requested value should be in
    */
-  InConditionImpl(IColumnIdentification<VALUE> pColumn, BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator,
-                  Stream<VALUE> pValues)
+  InConditionImpl(IColumnIdentification<VALUE> pColumn,
+                  BiFunction<IColumnIdentification<VALUE>, VALUE, IColumnValueTuple<VALUE>> pTupleCreator, Stream<VALUE> pValues)
   {
     super(pColumn, null, () -> ""); //value and operator do not matter
 
-    values = pValues
-        .map(pValue -> pTupleCreator.apply(pColumn, pValue))
+    values = pValues //
+        .map(pValue -> pTupleCreator.apply(pColumn, pValue)) //
         .collect(Collectors.toList());
 
     if (values.isEmpty())
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/WhereModifiers.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/WhereModifiers.java
index f8410af..47f23de 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/WhereModifiers.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/definition/condition/WhereModifiers.java
@@ -63,13 +63,16 @@ public Optional<IPreparedStatementFormat> where()
   {
     if (idCondition == null && whereCondition == null)
       return Optional.empty();
+
     final IPreparedStatementFormat condition;
+
     if (idCondition == null)
       condition = whereCondition;
     else if (whereCondition == null)
       condition = idCondition;
     else
       condition = new _Combiner();
+
     return Optional.of(condition);
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/executors/StatementExecution.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/executors/StatementExecution.java
index 099f7bd..eadbc0c 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/executors/StatementExecution.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/executors/StatementExecution.java
@@ -37,7 +37,8 @@ public StatementExecution(Supplier<Connection> pConnectionSupplier, boolean pClo
    * @param pStatementConsumer a consumer of the specific statement to configure it before the execution
    * @param <STATEMENT>        the type of the specific statement to execute
    */
-  public <STATEMENT extends AbstractSQLStatement<Void, STATEMENT>> void execute(STATEMENT pStatement, Consumer<STATEMENT> pStatementConsumer)
+  public <STATEMENT extends AbstractSQLStatement<Void, STATEMENT>> void execute(STATEMENT pStatement,
+                                                                                Consumer<STATEMENT> pStatementConsumer)
   {
     pStatementConsumer.accept(pStatement);
     _tryClose(pStatement);
@@ -53,7 +54,8 @@ public <STATEMENT extends AbstractSQLStatement<Void, STATEMENT>> void execute(ST
    * @param <QUERY>        the type of the specific query
    * @return the result determined by the given query
    */
-  public <RESULT, INNERRESULT, QUERY extends AbstractSQLStatement<INNERRESULT, QUERY>> RESULT query(QUERY pQuery, Function<QUERY, RESULT> pQueryConsumer)
+  public <RESULT, INNERRESULT, QUERY extends AbstractSQLStatement<INNERRESULT, QUERY>> RESULT query(QUERY pQuery,
+                                                                                                    Function<QUERY, RESULT> pQueryConsumer)
   {
     try
     {
@@ -131,7 +133,8 @@ public IStatementExecutor<ResultSet> createExecutor()
    */
   public IStatementExecutor<Void> createVoidExecutor()
   {
-    return new StatementExecutor<>(connectionSupplier, pStatement -> {
+    return new StatementExecutor<>(connectionSupplier, pStatement ->
+    {
       pStatement.execute();
       return null;
     });
@@ -144,7 +147,8 @@ public IStatementExecutor<Void> createVoidExecutor()
    */
   public IStatementExecutor<Boolean> createSuccessExecutor()
   {
-    return new StatementExecutor<>(connectionSupplier, pStatement -> {
+    return new StatementExecutor<>(connectionSupplier, pStatement ->
+    {
       try
       {
         pStatement.execute();
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/ESeparator.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/ESeparator.java
index a90b041..7b0c670 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/ESeparator.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/ESeparator.java
@@ -42,8 +42,8 @@ public String getLiteral()
    */
   public static String merge(ESeparator... pSeparators)
   {
-    return Stream.of(pSeparators)
-        .map(ESeparator::getLiteral)
+    return Stream.of(pSeparators) //
+        .map(ESeparator::getLiteral) //
         .collect(Collectors.joining());
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/StatementFormatter.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/StatementFormatter.java
index ba7d940..7da83f7 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/StatementFormatter.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/format/StatementFormatter.java
@@ -17,7 +17,8 @@
  * For further usage information check the methods below.
  *
  * The result of this formatter can be retrieved via {@link #getStatement()} and {@link #getSerialArguments(IValueSerializer)},
- * which both provide information for a prepared statement. This formatter generally allows normal and prepared statement formats (see methods)
+ * which both provide information for a prepared statement. This formatter generally allows normal and prepared statement formats (see
+ * methods)
  *
  * @author Simon Danner, 19.07.2018
  * @see EFormatter
@@ -75,8 +76,7 @@ public static String toFormat(IStatementFormat pFormat, IDatabasePlatform pPlatf
    */
   public static String join(Stream<String> pMultipleStrings, ESeparator... pSeparators)
   {
-    return pMultipleStrings
-        .collect(Collectors.joining(ESeparator.merge(pSeparators)));
+    return pMultipleStrings.collect(Collectors.joining(ESeparator.merge(pSeparators)));
   }
 
   /**
@@ -208,10 +208,12 @@ public StatementFormatter appendMultiple(Stream<? extends IStatementFormat> pFor
    */
   public StatementFormatter appendMultiplePrepared(Stream<? extends IPreparedStatementFormat> pFormatStream, ESeparator... pSeparators)
   {
-    return _appendMultiple(pFormatStream.map(pFormat -> {
-      arguments.addAll(pFormat.getArguments(idColumnName));
-      return toFormat(pFormat, databasePlatform, idColumnName);
-    }), pSeparators);
+    return _appendMultiple(pFormatStream //
+        .map(pFormat ->
+        {
+          arguments.addAll(pFormat.getArguments(idColumnName));
+          return toFormat(pFormat, databasePlatform, idColumnName);
+        }), pSeparators);
   }
 
   /**
@@ -251,12 +253,12 @@ public StatementFormatter appendEnumeration(Stream<String> pElements, ESeparator
    */
   public StatementFormatter appendWhereCondition(WhereModifiers pModifiers)
   {
-    pModifiers.where()
+    pModifiers.where() //
         .ifPresent(pWhere ->
-                   {
-                     builder.appendWithWhitespace("WHERE");
-                     appendPreparedStatement(pWhere);
-                   });
+        {
+          builder.appendWithWhitespace("WHERE");
+          appendPreparedStatement(pWhere);
+        });
     return this;
   }
 
@@ -300,9 +302,7 @@ public String getStatement()
    */
   public List<ISerialValue> getSerialArguments(IValueSerializer pSerializer)
   {
-    return arguments.stream()
-        .map(pSerializer::toSerial)
-        .collect(Collectors.toList());
+    return arguments.stream().map(pSerializer::toSerial).collect(Collectors.toList());
   }
 
   /**
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/AbstractDatabasePlatform.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/AbstractDatabasePlatform.java
index 1299e41..9dec615 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/AbstractDatabasePlatform.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/AbstractDatabasePlatform.java
@@ -77,7 +77,7 @@ public String columnTypeToStatementFormat(IColumnType pColumnType)
   @Override
   public String columnModifierToStatementFormat(EColumnModifier pModifier)
   {
-    return Optional.ofNullable(getColumnModifierDeviations().get(pModifier))
+    return Optional.ofNullable(getColumnModifierDeviations().get(pModifier)) //
         .orElse(pModifier.getDefaultFormat());
   }
 }
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/connection/ExternalConnectionProvider.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/connection/ExternalConnectionProvider.java
index 3a268e0..5101118 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/connection/ExternalConnectionProvider.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/platform/connection/ExternalConnectionProvider.java
@@ -78,8 +78,8 @@ public Connection createNewConnection()
     }
     catch (SQLException pE)
     {
-      throw new OJDatabaseException(pE, "Unable to connect to external database! platform = " + platform.getPlatformName() +
-          " host = " + host + " port = " + port);
+      throw new OJDatabaseException(pE,
+          "Unable to connect to external database! platform = " + platform.getPlatformName() + " host = " + host + " port = " + port);
     }
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/Result.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/Result.java
index 7d4edc1..927fe0a 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/Result.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/Result.java
@@ -51,8 +51,8 @@ public Optional<ResultRow> getFirst()
     try
     {
       _checkUsage();
-      return resultSet.next() ?
-          Optional.of(new ResultRow(selectedColumns, idColumnIdentification, serializer, resultSet)) :
+      return resultSet.next() ? //
+          Optional.of(new ResultRow(selectedColumns, idColumnIdentification, serializer, resultSet)) : //
           Optional.empty();
     }
     catch (SQLException pE)
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/ResultRow.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/ResultRow.java
index a73abd2..eb31746 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/ResultRow.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/ResultRow.java
@@ -94,8 +94,8 @@ public Map<IColumnIdentification<?>, Object> toMap(Collection<IColumnIdentificat
    * @param pColumnMapper     mapper for the columns
    * @return a map containing values for the requested columns
    */
-  public <KEY, COLUMN extends IColumnIdentification<?>> Map<KEY, Object> toMap(Collection<COLUMN> pColumnsToInclude, Function<COLUMN,
-      KEY> pColumnMapper)
+  public <KEY, COLUMN extends IColumnIdentification<?>> Map<KEY, Object> toMap(Collection<COLUMN> pColumnsToInclude,
+                                                                               Function<COLUMN, KEY> pColumnMapper)
   {
     //noinspection unchecked
     return pColumnsToInclude.stream() //
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/SingleColumnResult.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/SingleColumnResult.java
index fe1679d..f50babb 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/SingleColumnResult.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/result/SingleColumnResult.java
@@ -38,8 +38,8 @@ public SingleColumnResult(IColumnIdentification<VALUE> pColumn, Result pResult)
    */
   public OptionalNullable<VALUE> getFirst()
   {
-    return result.getFirst()
-        .map(pResultRow -> OptionalNullable.of(pResultRow.get(column)))
+    return result.getFirst() //
+        .map(pResultRow -> OptionalNullable.of(pResultRow.get(column))) //
         .orElseGet(OptionalNullable::notPresent);
   }
 
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/serialization/DefaultValueSerializer.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/serialization/DefaultValueSerializer.java
index 917e9d8..ba1a558 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/serialization/DefaultValueSerializer.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/serialization/DefaultValueSerializer.java
@@ -30,7 +30,7 @@ public class DefaultValueSerializer implements IValueSerializer
   static
   {
     _put(Character.class, String::valueOf, (pStatement, pSerial, pIndex) -> pStatement.setString(pIndex, pSerial), ResultSet::getString,
-         pSerial -> pSerial.charAt(0));
+        pSerial -> pSerial.charAt(0));
     _put(String.class, (pStatement, pSerial, pIndex) -> pStatement.setString(pIndex, pSerial), ResultSet::getString);
     _put(Integer.class, (pStatement, pSerial, pIndex) -> pStatement.setInt(pIndex, pSerial), ResultSet::getInt);
     _put(Double.class, (pStatement, pSerial, pIndex) -> pStatement.setDouble(pIndex, pSerial), ResultSet::getDouble);
@@ -40,11 +40,11 @@ public class DefaultValueSerializer implements IValueSerializer
     _put(Boolean.class, (pStatement, pSerial, pIndex) -> pStatement.setBoolean(pIndex, pSerial), ResultSet::getBoolean);
     _put(byte[].class, (pStatement, pSerial, pIndex) -> pStatement.setBytes(pIndex, pSerial), ResultSet::getBytes);
     _put(LocalDate.class, LocalDate::toEpochDay, (pStatement, pSerial, pIndex) -> pStatement.setLong(pIndex, pSerial), ResultSet::getLong,
-         LocalDate::ofEpochDay);
+        LocalDate::ofEpochDay);
     _put(LocalTime.class, LocalTime::toNanoOfDay, (pStatement, pSerial, pIndex) -> pStatement.setLong(pIndex, pSerial), ResultSet::getLong,
-         LocalTime::ofNanoOfDay);
+        LocalTime::ofNanoOfDay);
     _put(Instant.class, Instant::toEpochMilli, (pStatement, pSerial, pIndex) -> pStatement.setLong(pIndex, pSerial), ResultSet::getLong,
-         Instant::ofEpochMilli);
+        Instant::ofEpochMilli);
   }
 
   @Override
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/AbstractConditionStatement.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/AbstractConditionStatement.java
index d3e6fa1..f88742e 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/AbstractConditionStatement.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/AbstractConditionStatement.java
@@ -19,7 +19,8 @@
  * @param <STATEMENT>   the concrete final type of the statement
  */
 public abstract class AbstractConditionStatement<MODIFIERS extends WhereModifiers, RESULT, INNERRESULT,
-    STATEMENT extends AbstractConditionStatement<MODIFIERS, RESULT, INNERRESULT, STATEMENT>> extends AbstractSQLStatement<INNERRESULT, STATEMENT>
+    STATEMENT extends AbstractConditionStatement<MODIFIERS, RESULT, INNERRESULT, STATEMENT>>
+    extends AbstractSQLStatement<INNERRESULT, STATEMENT>
 {
   protected final MODIFIERS modifiers;
 
@@ -33,8 +34,8 @@ public abstract class AbstractConditionStatement<MODIFIERS extends WhereModifier
    * @param pModifiers         the modifiers for this statement
    * @param pIdColumnName      the id column name
    */
-  public AbstractConditionStatement(IStatementExecutor<INNERRESULT> pStatementExecutor, AbstractSQLBuilder pBuilder, IDatabasePlatform pPlatform,
-                                    IValueSerializer pSerializer, MODIFIERS pModifiers, String pIdColumnName)
+  public AbstractConditionStatement(IStatementExecutor<INNERRESULT> pStatementExecutor, AbstractSQLBuilder pBuilder,
+                                    IDatabasePlatform pPlatform, IValueSerializer pSerializer, MODIFIERS pModifiers, String pIdColumnName)
   {
     super(pStatementExecutor, pBuilder, pPlatform, pSerializer, pIdColumnName);
     modifiers = pModifiers;
@@ -73,8 +74,8 @@ public STATEMENT where(List<IWhereCondition<?>> pConditions)
       return (STATEMENT) this;
 
     final IWhereConditions conditions = IWhereConditions.create(pConditions.get(0));
-    pConditions.stream()
-        .skip(1)
+    pConditions.stream() //
+        .skip(1) //
         .forEach(conditions::and);
 
     return where(conditions);
diff --git a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/types/select/AbstractSelect.java b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/types/select/AbstractSelect.java
index 3baa82b..afbe6cb 100644
--- a/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/types/select/AbstractSelect.java
+++ b/ojcms-sqlbuilder/src/main/java/de/adito/ojcms/sqlbuilder/statements/types/select/AbstractSelect.java
@@ -24,8 +24,8 @@
  * @param <SELECT> the runtime type of the final select statement
  * @author Simon Danner, 26.04.2018
  */
-public abstract class AbstractSelect<SELECT extends AbstractSelect<SELECT>> extends AbstractConditionStatement<SelectModifiers, Result,
-    ResultSet, SELECT>
+public abstract class AbstractSelect<SELECT extends AbstractSelect<SELECT>>
+    extends AbstractConditionStatement<SelectModifiers, Result, ResultSet, SELECT>
 {
   private List<IColumnIdentification<?>> columnsToSelect = new ArrayList<>();
 
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/cleanup/SingleBeanRowCleanup.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/cleanup/SingleBeanRowCleanup.java
index 5e089eb..e7fd03c 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/cleanup/SingleBeanRowCleanup.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/cleanup/SingleBeanRowCleanup.java
@@ -37,9 +37,9 @@ public void cleanup(OJSQLBuilder pBuilder)
       pBuilder.doDelete(pDelete -> pDelete.from(BEAN_TABLE_NAME).delete());
     else
       //Else delete all that aren't existing anymore
-      pBuilder.doDelete(pDelete -> pDelete
-          .from(BEAN_TABLE_NAME)
-          .where(not(in(ID_COLUMN, stillExistingIds)))
+      pBuilder.doDelete(pDelete -> pDelete //
+          .from(BEAN_TABLE_NAME) //
+          .where(not(in(ID_COLUMN, stillExistingIds))) //
           .delete());
   }
 }
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/connection/SQLCdiProducers.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/connection/SQLCdiProducers.java
index 5ac5d56..f272050 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/connection/SQLCdiProducers.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/connection/SQLCdiProducers.java
@@ -95,9 +95,9 @@ private static OJSQLBuilder _produceSQLBuilderForInitialization(IDatabaseConfig
   {
     final IDatabaseConnectionSupplier connectionSupplier = pConfig.createConnectionSupplier(new ConnectionSupplierFactory(true));
 
-    return OJSQLBuilderFactory.newSQLBuilder(pDatabasePlatform, pConfig.getDefaultIdColumnName())
-        .withCustomSerializer(pSerializer)
-        .withClosingAndRenewingConnection(connectionSupplier)
+    return OJSQLBuilderFactory.newSQLBuilder(pDatabasePlatform, pConfig.getDefaultIdColumnName()) //
+        .withCustomSerializer(pSerializer) //
+        .withClosingAndRenewingConnection(connectionSupplier) //
         .create();
   }
 
@@ -115,8 +115,8 @@ private static OJSQLBuilder _produceSQLBuilderForInitialization(IDatabaseConfig
   private static OJSQLBuilder _produceTransactionSQLBuilder(IDatabaseConfig pConfig, IDatabasePlatform pDatabasePlatform,
                                                             Connection pConnection, BeanSQLSerializer pSerializer)
   {
-    return OJSQLBuilderFactory.newSQLBuilder(pDatabasePlatform, pConfig.getDefaultIdColumnName())
-        .withCustomSerializer(pSerializer)
+    return OJSQLBuilderFactory.newSQLBuilder(pDatabasePlatform, pConfig.getDefaultIdColumnName()) //
+        .withCustomSerializer(pSerializer) //
         .withPermanentConnection(new IDatabaseConnectionSupplier()
         {
           @Override
@@ -130,7 +130,7 @@ public IDatabasePlatform getPlatform()
           {
             return pDatabasePlatform;
           }
-        })
+        }) //
         .create();
   }
 }
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModel.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModel.java
index 6e8b2d9..106017e 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModel.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModel.java
@@ -38,8 +38,8 @@ public class SingleBeanPersistenceModel implements IPersistenceModel
   private static final IColumnDefinition CONTENT_COLUMN_DEFINITION = IColumnDefinition.of(BEAN_TABLE_CONTENT, EColumnType.BLOB.create());
 
   //Used for JSON serialization
-  private static final Gson GSON = new GsonBuilder()
-      .serializeNulls()
+  private static final Gson GSON = new GsonBuilder() //
+      .serializeNulls() //
       .create();
 
   //Type token for bean data presented as Map<IField, Object>
@@ -57,8 +57,8 @@ public class SingleBeanPersistenceModel implements IPersistenceModel
    */
   public static void createSingleBeanTableIfNecessary(OJSQLBuilder pBuilder)
   {
-    pBuilder.ifTableNotExistingCreate(BEAN_TABLE_NAME, pCreate -> pCreate
-        .columns(ID_COLUMN_DEFINITION, CONTENT_COLUMN_DEFINITION)
+    pBuilder.ifTableNotExistingCreate(BEAN_TABLE_NAME, pCreate -> pCreate //
+        .columns(ID_COLUMN_DEFINITION, CONTENT_COLUMN_DEFINITION) //
         .create());
   }
 
@@ -71,24 +71,23 @@ public static void createSingleBeanTableIfNecessary(OJSQLBuilder pBuilder)
   SingleBeanPersistenceModel(String pBeanId, Class<? extends IBean> pBeanType)
   {
     beanId = StringUtility.requireNotEmpty(pBeanId, "single bean id");
-    fieldNameMapping = BeanReflector.reflectBeanFields(pBeanType).stream()
-        .collect(Collectors.toMap(IField::getName, identity()));
+    fieldNameMapping = BeanReflector.reflectBeanFields(pBeanType).stream().collect(Collectors.toMap(IField::getName, identity()));
   }
 
   @Override
   public void initModelInDatabase(OJSQLBuilder pBuilder)
   {
-    final boolean doesRowExist = pBuilder.doSelectOne(ID_COLUMN, pSelect -> pSelect
-        .from(BEAN_TABLE_NAME)
-        .where(isEqual(ID_COLUMN, beanId))
+    final boolean doesRowExist = pBuilder.doSelectOne(ID_COLUMN, pSelect -> pSelect //
+        .from(BEAN_TABLE_NAME) //
+        .where(isEqual(ID_COLUMN, beanId)) //
         .countRows() > 0);
 
     if (doesRowExist)
       return;
 
-    pBuilder.doInsert(pInsert -> pInsert
-        .into(BEAN_TABLE_NAME)
-        .values(IColumnValueTuple.of(ID_COLUMN, beanId), _contentTuple(_createInitialContent()))
+    pBuilder.doInsert(pInsert -> pInsert //
+        .into(BEAN_TABLE_NAME) //
+        .values(IColumnValueTuple.of(ID_COLUMN, beanId), _contentTuple(_createInitialContent())) //
         .insert());
   }
 
@@ -101,12 +100,12 @@ public void initModelInDatabase(OJSQLBuilder pBuilder)
    */
   public PersistentBeanData loadSingleBeanData(SingleBeanKey pKey, OJSQLBuilder pBuilder)
   {
-    return pBuilder.doSelectOne(CONTENT_COLUMN, pSelect -> pSelect
-        .from(BEAN_TABLE_NAME)
-        .where(isEqual(ID_COLUMN, beanId))
-        .firstResult()
-        .map(this::_fromPersistent)
-        .map(pBeanContent -> new PersistentBeanData(-1, pBeanContent)))
+    return pBuilder.doSelectOne(CONTENT_COLUMN, pSelect -> pSelect //
+        .from(BEAN_TABLE_NAME) //
+        .where(isEqual(ID_COLUMN, beanId)) //
+        .firstResult() //
+        .map(this::_fromPersistent) //
+        .map(pBeanContent -> new PersistentBeanData(-1, pBeanContent))) //
         .orIfNotPresentThrow(() -> new BeanDataNotFoundException(pKey));
   }
 
@@ -121,10 +120,10 @@ public void processChanges(Map<IField<?>, Object> pChangedValues, OJSQLBuilder p
     //This may be improved later to avoid redundant loading by query
     final PersistentBeanData changedData = loadSingleBeanData(new SingleBeanKey(beanId), pBuilder).integrateChanges(pChangedValues);
 
-    pBuilder.doUpdate(pUpdate -> pUpdate
-        .table(BEAN_TABLE_NAME)
-        .set(_contentTuple(changedData.getData()))
-        .where(isEqual(ID_COLUMN, beanId))
+    pBuilder.doUpdate(pUpdate -> pUpdate //
+        .table(BEAN_TABLE_NAME) //
+        .set(_contentTuple(changedData.getData())) //
+        .where(isEqual(ID_COLUMN, beanId)) //
         .update());
   }
 
@@ -146,7 +145,7 @@ private IColumnValueTuple<byte[]> _contentTuple(Map<IField<?>, Object> pBeanCont
    */
   private Map<IField<?>, Object> _createInitialContent()
   {
-    return fieldNameMapping.values().stream()
+    return fieldNameMapping.values().stream() //
         //Allow null values
         .collect(HashMap::new, (pMap, pField) -> pMap.put(pField, pField.getInitialValue()), HashMap::putAll);
   }
@@ -159,7 +158,7 @@ private Map<IField<?>, Object> _createInitialContent()
    */
   private static byte[] _toPersistent(Map<IField<?>, Object> pBeanContent)
   {
-    final Map<String, Object> fieldNameValueMap = pBeanContent.entrySet().stream()
+    final Map<String, Object> fieldNameValueMap = pBeanContent.entrySet().stream() //
         //Allow null values
         .collect(HashMap::new, (pMap, pEntry) -> pMap.put(pEntry.getKey().getName(), pEntry.getValue()), HashMap::putAll);
 
@@ -177,11 +176,11 @@ private Map<IField<?>, Object> _fromPersistent(byte[] pSerialContent)
     final String json = new String(pSerialContent, StandardCharsets.UTF_8);
     final Map<String, Object> fieldNameValueMap = GSON.fromJson(json, CONTENT_TYPE_LITERAL);
 
-    return fieldNameValueMap.entrySet().stream()
+    return fieldNameValueMap.entrySet().stream() //
         //Allow null values
-        .collect(HashMap::new, (pMap, pEntry) -> pMap.put(fieldNameMapping.get(pEntry.getKey()),
-                                                          _assureCorrectFormat(fieldNameMapping.get(pEntry.getKey()), pEntry.getValue())),
-                 HashMap::putAll);
+        .collect(HashMap::new, (pMap, pEntry) -> pMap
+                .put(fieldNameMapping.get(pEntry.getKey()), _assureCorrectFormat(fieldNameMapping.get(pEntry.getKey()), pEntry.getValue())),
+            HashMap::putAll);
   }
 
   /**
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnIdentification.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnIdentification.java
index 4fc2cf7..2909687 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnIdentification.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnIdentification.java
@@ -4,9 +4,6 @@
 import de.adito.ojcms.beans.literals.fields.util.IBeanFieldBased;
 import de.adito.ojcms.sqlbuilder.definition.IColumnIdentification;
 
-import java.util.Collection;
-import java.util.function.Function;
-
 /**
  * A database column identification based on a bean field.
  *
@@ -44,17 +41,4 @@ public Class<VALUE> getDataType()
   {
     return field.getDataType();
   }
-
-  /**
-   * Creates an array of column identifications based on a collection of bean fields.
-   *
-   * @param pFields the bean fields to create the identifications tuples from
-   * @return an array of column identifications
-   */
-  public static BeanColumnIdentification<?>[] ofMultiple(Collection<IField<?>> pFields)
-  {
-    return pFields.stream()
-        .map((Function<IField<?>, BeanColumnIdentification<?>>) BeanColumnIdentification::new)
-        .toArray(BeanColumnIdentification[]::new);
-  }
 }
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnValueTuple.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnValueTuple.java
index ab49ff8..001c848 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnValueTuple.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanColumnValueTuple.java
@@ -57,8 +57,8 @@ public FieldValueTuple<VALUE> getFieldValueTuple()
   public static List<IColumnValueTuple<?>> ofMap(Map<IField<?>, Object> pValueMap)
   {
     //noinspection unchecked
-    return pValueMap.entrySet().stream()
-        .map(pEntry -> (IColumnValueTuple<?>) new BeanColumnValueTuple<>((IField) pEntry.getKey(), pEntry.getValue()))
+    return pValueMap.entrySet().stream() //
+        .map(pEntry -> (IColumnValueTuple<?>) new BeanColumnValueTuple<>((IField) pEntry.getKey(), pEntry.getValue())) //
         .collect(Collectors.toList());
   }
 }
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanWhereCondition.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanWhereCondition.java
index d06950a..3dbe91e 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanWhereCondition.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/model/column/BeanWhereCondition.java
@@ -60,7 +60,7 @@ public boolean isNegated()
   public static List<IWhereCondition<?>> conditionsOfMap(Map<IField<?>, Object> pValueMap)
   {
     //noinspection unchecked
-    return pValueMap.entrySet().stream()
+    return pValueMap.entrySet().stream() //
         .map(pEntry -> (IWhereCondition<?>) new BeanWhereCondition<>((IField) pEntry.getKey(), pEntry.getValue(), IWhereOperator.isEqual()))
         .collect(Collectors.toList());
   }
diff --git a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/util/BeanSQLSerializer.java b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/util/BeanSQLSerializer.java
index f35977c..d89358a 100644
--- a/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/util/BeanSQLSerializer.java
+++ b/ojcms-sqldatasource/src/main/java/de/adito/ojcms/sql/datasource/util/BeanSQLSerializer.java
@@ -97,7 +97,7 @@ private <VALUE, SERIAL extends Serializable> VALUE _fromPersistent(IColumnIdenti
    */
   private static <VALUE> String _notSerializableMessage(IField<VALUE> pField, boolean pToSerial)
   {
-    return "Unable to " + (pToSerial ? "persist" : "read") + " the value of the bean field " + pField.getName() +
-        " with type " + pField.getDataType() + "! The field must either be a reference or serializable field!";
+    return "Unable to " + (pToSerial ? "persist" : "read") + " the value of the bean field " + pField.getName() + " with type " + pField
+        .getDataType() + "! The field must either be a reference or serializable field!";
   }
 }
diff --git a/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/TestDatabaseConfig.java b/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/DatabaseConfigForTest.java
similarity index 91%
rename from ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/TestDatabaseConfig.java
rename to ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/DatabaseConfigForTest.java
index ce41da6..0db5f09 100644
--- a/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/TestDatabaseConfig.java
+++ b/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/DatabaseConfigForTest.java
@@ -13,7 +13,7 @@
  * @author Simon Danner, 04.01.2020
  */
 @ApplicationScoped
-public class TestDatabaseConfig implements IDatabaseConfig
+public class DatabaseConfigForTest implements IDatabaseConfig
 {
   @Override
   public IDatabaseConnectionSupplier createConnectionSupplier(ConnectionSupplierFactory pSupplierFactory)
diff --git a/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModelTest.java b/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModelTest.java
index 210095a..4ed2c1c 100644
--- a/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModelTest.java
+++ b/ojcms-sqldatasource/src/test/java/de/adito/ojcms/sql/datasource/model/SingleBeanPersistenceModelTest.java
@@ -31,10 +31,10 @@ public void testInitModelInDatabase()
 
     final IColumnIdentification<String> idColumn = IColumnIdentification.of(BEAN_TABLE_BEAN_ID, String.class);
 
-    final Optional<ResultRow> result = builder.doSelect(pSelect -> pSelect
-        .select(idColumn)
-        .from(BEAN_TABLE_NAME)
-        .where(IWhereCondition.isEqual(idColumn, BEAN_ID + 2))
+    final Optional<ResultRow> result = builder.doSelect(pSelect -> pSelect //
+        .select(idColumn) //
+        .from(BEAN_TABLE_NAME) //
+        .where(IWhereCondition.isEqual(idColumn, BEAN_ID + 2)) //
         .firstResult());
 
     assertTrue(result.isPresent());
diff --git a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/OverallTransactionalChanges.java b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/OverallTransactionalChanges.java
index 83c8522..63ca383 100644
--- a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/OverallTransactionalChanges.java
+++ b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/OverallTransactionalChanges.java
@@ -82,13 +82,14 @@ void deregister(TransactionalChanges pChanges)
    * @param pPredicate     the predicate to determine if requested data is changed
    * @param pSelfReference a self reference to the asking changes instance (to exclude its changes)
    */
-  private void _throwIfChangedInOtherTransaction(Object pKey, Predicate<TransactionalChanges> pPredicate, TransactionalChanges pSelfReference)
+  private void _throwIfChangedInOtherTransaction(Object pKey, Predicate<TransactionalChanges> pPredicate,
+                                                 TransactionalChanges pSelfReference)
   {
     final TransactionalChanges selfReferences = pSelfReference instanceof WeldClientProxy ?
         (TransactionalChanges) ((WeldClientProxy) pSelfReference).getMetadata().getContextualInstance() : pSelfReference;
 
-    if (activeTransactionalChanges.stream()
-        .filter(pChanges -> pChanges != selfReferences)
+    if (activeTransactionalChanges.stream() //
+        .filter(pChanges -> pChanges != selfReferences) //
         .anyMatch(pPredicate))
       throw new ConcurrentTransactionException(pKey);
   }
diff --git a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/annotations/ETransactionMode.java b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/annotations/ETransactionMode.java
index f4b07ba..3c37f44 100644
--- a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/annotations/ETransactionMode.java
+++ b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/annotations/ETransactionMode.java
@@ -10,7 +10,7 @@ public enum ETransactionMode
   /**
    * The annotated transaction scope requires a transaction, but does not enforce a new one.
    */
-  REQUIRES,
+  REQUIRES, //
 
   /**
    * The annotated transaction scope explicitly requires a new transaction.
diff --git a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/AbstractIndexKey.java b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/AbstractIndexKey.java
index a858b72..ef8c5c1 100644
--- a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/AbstractIndexKey.java
+++ b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/AbstractIndexKey.java
@@ -66,9 +66,9 @@ public int hashCode()
   @Override
   public String toString()
   {
-    return getClass().getSimpleName() + "{" +
-        "containerId='" + containerId + '\'' +
-        ", index=" + index +
+    return getClass().getSimpleName() + "{" + //
+        "containerId='" + containerId + '\'' + //
+        ", index=" + index + //
         '}';
   }
 }
diff --git a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/SingleBeanKey.java b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/SingleBeanKey.java
index a9acfe7..3f6fd88 100644
--- a/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/SingleBeanKey.java
+++ b/ojcms-transactions/src/main/java/de/adito/ojcms/transactions/api/SingleBeanKey.java
@@ -45,8 +45,8 @@ public int hashCode()
   @Override
   public String toString()
   {
-    return getClass().getSimpleName() + "{" +
-        "singleBeanId='" + singleBeanId + '\'' +
+    return getClass().getSimpleName() + "{" + //
+        "singleBeanId='" + singleBeanId + '\'' + //
         '}';
   }
 }
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexBasedIterator.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexBasedIterator.java
index 09eba47..ee013b2 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexBasedIterator.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexBasedIterator.java
@@ -46,8 +46,8 @@ public static <ELEMENT> Builder<ELEMENT> buildIterator(IntFunction<ELEMENT> pEle
    * @param pEndIndexExclusive the end index (exclusive)
    * @param pRemover           an optional action to remove an element at a given index
    */
-  private IndexBasedIterator(IntFunction<ELEMENT> pElementProvider, IntSupplier pSizeSupplier, int pStartIndex,
-                             int pEndIndexExclusive, @Nullable IntConsumer pRemover)
+  private IndexBasedIterator(IntFunction<ELEMENT> pElementProvider, IntSupplier pSizeSupplier, int pStartIndex, int pEndIndexExclusive,
+                             @Nullable IntConsumer pRemover)
   {
     index = pStartIndex;
     endIndexExclusive = pEndIndexExclusive;
@@ -83,6 +83,7 @@ public void remove()
       throw new IllegalStateException();
     if (expectedSize != sizeSupplier.getAsInt())
       throw new ConcurrentModificationException();
+
     remover.accept(lastIndex);
     index = lastIndex;
     lastIndex = -1;
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexChecker.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexChecker.java
index 04cc1e1..da8152d 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexChecker.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/IndexChecker.java
@@ -57,6 +57,7 @@ public int check(int pIndex)
     final int maxIndex = sizeSupplier.getAsInt() - 1;
     if (pIndex < 0 || pIndex > maxIndex)
       throw new IndexOutOfBoundsException("index: " + pIndex + " max index: " + maxIndex);
+
     return pIndex;
   }
 }
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/OptionalNullable.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/OptionalNullable.java
index 5f54985..d84780b 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/OptionalNullable.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/OptionalNullable.java
@@ -163,7 +163,8 @@ public boolean equals(Object pO)
       return true;
     if (pO == null || getClass() != pO.getClass())
       return false;
-    OptionalNullable<?> that = (OptionalNullable<?>) pO;
+
+    final OptionalNullable<?> that = (OptionalNullable<?>) pO;
     return present == that.present && Objects.equals(value, that.value);
   }
 
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/StringUtility.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/StringUtility.java
index 0f1a715..c40d38e 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/StringUtility.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/StringUtility.java
@@ -23,6 +23,7 @@ public static String requireNotEmpty(String pStringToCheck, String pIdentifier)
   {
     if (pStringToCheck == null || pStringToCheck.trim().isEmpty())
       throw new IllegalArgumentException("The " + pIdentifier + " must not be empty!");
+    
     return pStringToCheck;
   }
 }
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/IIndexedCache.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/IIndexedCache.java
index 688e5de..ef1cf75 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/IIndexedCache.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/IIndexedCache.java
@@ -68,13 +68,13 @@ public interface IIndexedCache<T>
    */
   default T computeIfAbsent(int pIndex, Function<Integer, T> pCreator)
   {
-    return getElementAtIndex(pIndex)
+    return getElementAtIndex(pIndex) //
         .orElseGet(() ->
-                   {
-                     final T createdElement = pCreator.apply(pIndex);
-                     addAtIndex(createdElement, pIndex);
-                     return createdElement;
-                   });
+        {
+          final T createdElement = pCreator.apply(pIndex);
+          addAtIndex(createdElement, pIndex);
+          return createdElement;
+        });
   }
 
   /**
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/MapBasedIndexedCache.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/MapBasedIndexedCache.java
index e72e869..8b8e388 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/MapBasedIndexedCache.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/MapBasedIndexedCache.java
@@ -45,8 +45,7 @@ public boolean containsIndex(int pIndex)
   @Override
   public Optional<T> getElementAtIndex(int pIndex)
   {
-    return Optional.ofNullable(idByIndex.get(_checkIndex(pIndex)))
-        .map(contentById::get);
+    return Optional.ofNullable(idByIndex.get(_checkIndex(pIndex))).map(contentById::get);
   }
 
   @Override
@@ -187,19 +186,19 @@ private void _adaptIndexesAfterAddition(int pAffectedIndex)
   {
     final Set<Integer> indexesToRemove = new HashSet<>();
 
-    indexById.entrySet().stream()
+    indexById.entrySet().stream() //
         .filter(pEntry -> pEntry.getValue() >= pAffectedIndex) //Remove entries with index below affected one
         .sorted((pEntry1, pEntry2) -> pEntry2.getValue() - pEntry1.getValue()) //Descending by index
         .forEach(pEntry ->
-                 {
-                   final int oldIndex = pEntry.getValue();
-                   final int newIndex = oldIndex + 1;
+        {
+          final int oldIndex = pEntry.getValue();
+          final int newIndex = oldIndex + 1;
 
-                   pEntry.setValue(newIndex);
-                   idByIndex.put(newIndex, pEntry.getKey());
-                   indexesToRemove.add(oldIndex);
-                   indexesToRemove.remove(newIndex);
-                 });
+          pEntry.setValue(newIndex);
+          idByIndex.put(newIndex, pEntry.getKey());
+          indexesToRemove.add(oldIndex);
+          indexesToRemove.remove(newIndex);
+        });
 
     indexesToRemove.forEach(idByIndex::remove);
   }
@@ -214,19 +213,19 @@ private void _adaptIndexesAfterRemoval(int pAffectedIndex)
   {
     final Set<Integer> indexesToRemove = new HashSet<>();
 
-    indexById.entrySet().stream()
+    indexById.entrySet().stream() //
         .filter(pEntry -> pEntry.getValue() > pAffectedIndex) //Remove entries with index below the affected one
         .sorted((pEntry1, pEntry2) -> pEntry2.getValue() - pEntry1.getValue()) //Descending by index
         .forEach(pEntry ->
-                 {
-                   final int oldIndex = pEntry.getValue();
-                   final int newIndex = oldIndex - 1;
+        {
+          final int oldIndex = pEntry.getValue();
+          final int newIndex = oldIndex - 1;
 
-                   pEntry.setValue(newIndex);
-                   idByIndex.put(newIndex, pEntry.getKey());
-                   indexesToRemove.add(oldIndex);
-                   indexesToRemove.remove(newIndex);
-                 });
+          pEntry.setValue(newIndex);
+          idByIndex.put(newIndex, pEntry.getKey());
+          indexesToRemove.add(oldIndex);
+          indexesToRemove.remove(newIndex);
+        });
 
     indexesToRemove.forEach(idByIndex::remove);
   }
@@ -255,8 +254,8 @@ private int _checkIndex(int pIndex)
    */
   private void _assureConsistency()
   {
-    final boolean isConsistent = IntStream.of(idByContent.size(), contentById.size(), indexById.size(), idByIndex.size())
-        .distinct()
+    final boolean isConsistent = IntStream.of(idByContent.size(), contentById.size(), indexById.size(), idByIndex.size()) //
+        .distinct() //
         .count() == 1;
 
     if (!isConsistent)
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/WeakInputSortedContainer.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/WeakInputSortedContainer.java
index f9348fa..8d61303 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/WeakInputSortedContainer.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/collections/WeakInputSortedContainer.java
@@ -64,9 +64,9 @@ public int size()
   @Override
   public Iterator<ELEMENT> iterator()
   {
-    return content.entrySet().stream()
-        .sorted(Map.Entry.comparingByValue())
-        .map(Map.Entry::getKey)
+    return content.entrySet().stream() //
+        .sorted(Map.Entry.comparingByValue()) //
+        .map(Map.Entry::getKey) //
         .iterator();
   }
 }
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/copy/SneakyCopyUtils.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/copy/SneakyCopyUtils.java
index 1b4cddb..5b2b67a 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/copy/SneakyCopyUtils.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/copy/SneakyCopyUtils.java
@@ -55,8 +55,10 @@ public static <VALUE> VALUE createShallowCopy(VALUE pValueToCopy)
 
     final Class<VALUE> valueType = (Class<VALUE>) pValueToCopy.getClass();
     final VALUE instance = SNEAKY_COPY_CREATOR.newInstance(valueType);
-    reflectDeclaredFields(valueType)
-        .forEach(pField -> {
+
+    reflectDeclaredFields(valueType) //
+        .forEach(pField ->
+        {
           try
           {
             if (!pField.isAccessible())
@@ -68,6 +70,7 @@ public static <VALUE> VALUE createShallowCopy(VALUE pValueToCopy)
             throw new InternalCopyException(pE);
           }
         });
+
     return instance;
   }
 
@@ -85,8 +88,8 @@ public static <VALUE> VALUE createShallowCopy(VALUE pValueToCopy)
   public static <VALUE> VALUE createDeepCopy(VALUE pValueToCopy, Type pBaseType, Type... pGenericTypes) throws CopyUnsupportedException
   {
     if (gson == null)
-      gson = new GsonBuilder()
-          .registerTypeHierarchyAdapter(Class.class, _ClassTypeAdapter.INSTANCE)
+      gson = new GsonBuilder() //
+          .registerTypeHierarchyAdapter(Class.class, _ClassTypeAdapter.INSTANCE) //
           .create();
     try
     {
@@ -108,14 +111,16 @@ public static <VALUE> VALUE createDeepCopy(VALUE pValueToCopy, Type pBaseType, T
    */
   static List<Field> reflectDeclaredFields(Class<?> pType)
   {
-    return DECLARED_FIELDS_CACHE.computeIfAbsent(pType, pTypeToReflect -> {
+    return DECLARED_FIELDS_CACHE.computeIfAbsent(pType, pTypeToReflect ->
+    {
       final List<Field> declaredFields = new ArrayList<>();
       Class<?> current = pTypeToReflect;
       do
       {
-        Stream.of(current.getDeclaredFields())
-            .filter(pField -> !pField.isSynthetic())
-            .forEach(pField -> {
+        Stream.of(current.getDeclaredFields()) //
+            .filter(pField -> !pField.isSynthetic()) //
+            .forEach(pField ->
+            {
               if (!pField.isAccessible())
                 pField.setAccessible(true);
               declaredFields.add(pField);
diff --git a/ojcms-utils/src/main/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationHandler.java b/ojcms-utils/src/main/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationHandler.java
index af479e3..14c9cca 100644
--- a/ojcms-utils/src/main/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationHandler.java
+++ b/ojcms-utils/src/main/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationHandler.java
@@ -26,7 +26,7 @@ public static <INTERFACE> INTERFACE createReadOnlyInstance(Class<INTERFACE> pInt
   {
     //noinspection unchecked
     return (INTERFACE) Proxy.newProxyInstance(pInterfaceType.getClassLoader(), new Class[]{pInterfaceType},
-                                              new ReadOnlyInvocationHandler<>(pInstanceToMakeReadOnly));
+        new ReadOnlyInvocationHandler<>(pInstanceToMakeReadOnly));
   }
 
   /**
@@ -43,8 +43,8 @@ private ReadOnlyInvocationHandler(SOURCE pSource)
   public Object invoke(Object pProxy, Method pMethod, Object[] pArgs) throws Throwable
   {
     if (pMethod.isAnnotationPresent(WriteOperation.class))
-      throw new UnsupportedOperationException("This element of type " + source.getClass().getName() + " is read-only! " +
-                                                  "The content can not be modified!");
+      throw new UnsupportedOperationException(
+          "This element of type " + source.getClass().getName() + " is read-only! " + "The content can not be modified!");
 
     final Object result = pMethod.invoke(source, pArgs);
     if (result instanceof List)
diff --git a/ojcms-utils/src/test/java/de/adito/ojcms/utils/IndexBasedIteratorTest.java b/ojcms-utils/src/test/java/de/adito/ojcms/utils/IndexBasedIteratorTest.java
index 56450a7..cc63175 100644
--- a/ojcms-utils/src/test/java/de/adito/ojcms/utils/IndexBasedIteratorTest.java
+++ b/ojcms-utils/src/test/java/de/adito/ojcms/utils/IndexBasedIteratorTest.java
@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.*;
 
 import java.util.*;
-import java.util.function.*;
+import java.util.function.IntConsumer;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -33,32 +33,38 @@ public void testSuccessfulIteration()
   @Test
   public void testStartIndex()
   {
-    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size)
-        .startAtIndex(1)
+    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .startAtIndex(1) //
         .createIterator();
+
     _checkIterator(it, 1, 2, 3);
   }
 
   @Test
   public void testEndIndex()
   {
-    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size)
-        .endBeforeIndex(3)
+    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .endBeforeIndex(3) //
         .createIterator();
+
     _checkIterator(it, 0, 1, 2);
   }
 
   @Test
   public void testNoSuchElement()
   {
-    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size)
-        .endBeforeIndex(0)
+    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .endBeforeIndex(0) //
         .createIterator();
+
     assertThrows(NoSuchElementException.class, it::next);
-    final Iterator<Integer> it2 = IndexBasedIterator.buildIterator(list::get, list::size)
-        .endBeforeIndex(1)
+
+    final Iterator<Integer> it2 = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .endBeforeIndex(1) //
         .createIterator();
-    assertThrows(NoSuchElementException.class, () -> {
+
+    assertThrows(NoSuchElementException.class, () ->
+    {
       it2.next();
       it2.next();
     });
@@ -67,16 +73,19 @@ public void testNoSuchElement()
   @Test
   public void testRemove()
   {
-    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size)
-        .withRemover(remover)
+    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .withRemover(remover) //
         .createIterator();
+
     it.next(); //= 0
     it.remove(); //removed 0
     assertEquals(Arrays.asList(1, 2, 3), list);
+
     it.next(); //= 1
     it.next(); //= 2
     it.remove(); //removed 2
     assertEquals(Arrays.asList(1, 3), list);
+
     it.next(); //= 3
     assertThrows(NoSuchElementException.class, it::next);
   }
@@ -84,11 +93,13 @@ public void testRemove()
   @Test
   public void testRemoveIllegalState()
   {
-    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size)
-        .withRemover(remover)
+    final Iterator<Integer> it = IndexBasedIterator.buildIterator(list::get, list::size) //
+        .withRemover(remover) //
         .createIterator();
+
     assertThrows(IllegalStateException.class, it::remove);
-    assertThrows(IllegalStateException.class, () -> {
+    assertThrows(IllegalStateException.class, () ->
+    {
       it.next();
       it.remove();
       it.remove();
@@ -120,8 +131,9 @@ public void testConcurrentModificationFail()
    */
   private static void _checkIterator(Iterator<Integer> pIterator, int... pExpectedElements)
   {
-    Arrays.stream(pExpectedElements, 0, pExpectedElements.length)
-        .forEach(pExpectedElement -> {
+    Arrays.stream(pExpectedElements, 0, pExpectedElements.length) //
+        .forEach(pExpectedElement ->
+        {
           assertTrue(pIterator.hasNext());
           assertSame(pExpectedElement, pIterator.next());
         });
diff --git a/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/InputSortedElementsTest.java b/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/InputSortedElementsTest.java
index 4d09629..b22da40 100644
--- a/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/InputSortedElementsTest.java
+++ b/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/InputSortedElementsTest.java
@@ -145,9 +145,9 @@ private _Person _addOne(IInputSortedElements<_Person> pElementContainer)
    */
   private List<_Person> _addMultiple(IInputSortedElements<_Person> pElementContainer, int pAmount)
   {
-    return IntStream.range(0, pAmount)
-        .mapToObj(pIndex -> new _Person(UUID.randomUUID().toString(), "Name"))
-        .peek(pElementContainer::add)
+    return IntStream.range(0, pAmount) //
+        .mapToObj(pIndex -> new _Person(UUID.randomUUID().toString(), "Name")) //
+        .peek(pElementContainer::add) //
         .collect(Collectors.toList());
   }
 
diff --git a/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/WeakInputSortedContainerTest.java b/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/WeakInputSortedContainerTest.java
index d0fb296..f13ceac 100644
--- a/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/WeakInputSortedContainerTest.java
+++ b/ojcms-utils/src/test/java/de/adito/ojcms/utils/collections/WeakInputSortedContainerTest.java
@@ -1,6 +1,6 @@
 package de.adito.ojcms.utils.collections;
 
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/ojcms-utils/src/test/java/de/adito/ojcms/utils/copy/SneakyCopyUtilsTest.java b/ojcms-utils/src/test/java/de/adito/ojcms/utils/copy/SneakyCopyUtilsTest.java
index b8adfd0..a5d4521 100644
--- a/ojcms-utils/src/test/java/de/adito/ojcms/utils/copy/SneakyCopyUtilsTest.java
+++ b/ojcms-utils/src/test/java/de/adito/ojcms/utils/copy/SneakyCopyUtilsTest.java
@@ -126,8 +126,8 @@ else if (pOriginal instanceof Collection)
     else if (pOriginal instanceof Map)
       _assertMapCopySuccessful((Map<?, ?>) pOriginal, (Map<?, ?>) pCopy);
     else
-      assertNotSame(pOriginal, pCopy, "origin: " + pValueOrigin + ", type: " + pOriginal.getClass().getName() + ", original: " +
-          pOriginal + ", copy: " + pCopy);
+      assertNotSame(pOriginal, pCopy,
+          "origin: " + pValueOrigin + ", type: " + pOriginal.getClass().getName() + ", original: " + pOriginal + ", copy: " + pCopy);
   }
 
   /**
@@ -199,8 +199,8 @@ private static void _assertMapCopySuccessful(Map<?, ?> pOriginal, Map<?, ?> pCop
    */
   private static boolean _isPrimitiveOrEnumOrTypeOrString(Class<?> pType)
   {
-    return ClassUtils.isPrimitiveOrWrapper(pType) || Enum.class.isAssignableFrom(pType) || Class.class.isAssignableFrom(pType) ||
-        String.class.isAssignableFrom(pType);
+    return ClassUtils.isPrimitiveOrWrapper(pType) || Enum.class.isAssignableFrom(pType) || Class.class
+        .isAssignableFrom(pType) || String.class.isAssignableFrom(pType);
   }
 
   /**
@@ -216,12 +216,12 @@ private static class _FirstClass
     private final List<Integer> primitiveList = Arrays.asList(1, 2, 3);
     private final List<_SecondClass> complexList = Arrays.asList(new _SecondClass(), new _SecondClass());
     private final Class<_FirstClass> classType = _FirstClass.class;
-    private final Map<String, _SecondClass> someMap = new HashMap<>();
     private final boolean[] primitiveArray = new boolean[]{true, false, false};
     private final _ThirdClass[] complexArray = new _ThirdClass[]{new _ThirdClass(), new _ThirdClass()};
 
     private _FirstClass()
     {
+      Map<String, _SecondClass> someMap = new HashMap<>();
       someMap.put("key1", new _SecondClass());
       someMap.put("key2", new _SecondClass());
       someMap.put("key3", new _SecondClass());
diff --git a/ojcms-utils/src/test/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationTest.java b/ojcms-utils/src/test/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationTest.java
index c61f09c..4e3f7e6 100644
--- a/ojcms-utils/src/test/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationTest.java
+++ b/ojcms-utils/src/test/java/de/adito/ojcms/utils/readonly/ReadOnlyInvocationTest.java
@@ -50,7 +50,7 @@ public interface _TestInterface
   /**
    * Example implementation of the test interface.
    */
-  public class _Impl implements _TestInterface
+  public static class _Impl implements _TestInterface
   {
     private int data = 0;