fix codestyle

6 files changed, 20 insertions, 8 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/utils/IJsonMapper.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/utils/IJsonMapper.java
index a7e4f6fe..b3e0c88f 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/utils/IJsonMapper.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/utils/IJsonMapper.java
@@ -3,6 +3,8 @@ package at.gv.egiz.eaaf.core.api.utils;
 import java.io.IOException;
 import java.io.InputStream;
 
+import com.google.gson.JsonParseException;
+
 import at.gv.egiz.eaaf.core.exceptions.EaafJsonMapperException;
 
 public interface IJsonMapper {
@@ -23,6 +25,7 @@ public interface IJsonMapper {
    * @param value the JSON string to deserialize
    * @param clazz optional parameter that determines the type of the returned
    *              object. If not set, an {@link Object} is returned.
+   * @param <T> Response class type
    * @return the deserialized JSON string as an object of type {@code clazz} or
    *         {@link Object}
    * @throws JsonParseException   if the JSON string contains invalid content.
@@ -39,6 +42,7 @@ public interface IJsonMapper {
    * @param is    the JSON to deserialize as {@link InputStream}
    * @param clazz optional parameter that determines the type of the returned
    *              object. If not set, an {@link Object} is returned.
+   * @param <T> Response class type
    * @return the deserialized JSON string as an object of type {@code clazz} or
    *         {@link Object}
    * @throws JsonParseException   if the JSON string contains invalid content.
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ExecutionContextImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ExecutionContextImpl.java
index 27bc829d..3eff8a7b 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ExecutionContextImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/ExecutionContextImpl.java
@@ -52,6 +52,8 @@ public class ExecutionContextImpl implements ExecutionContext {
 
   /**
    * Creates a new instance and associated it with a certain process instance.
+   * 
+   * @param processInstanceId ProcessInstanceId for this execution context.
    */
   public ExecutionContextImpl(final String processInstanceId) {
     this.processInstanceId = processInstanceId;
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/springweb/SpringWebExpressionEvaluator.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/springweb/SpringWebExpressionEvaluator.java
index afcc0a58..9ef88679 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/springweb/SpringWebExpressionEvaluator.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/process/springweb/SpringWebExpressionEvaluator.java
@@ -95,7 +95,7 @@ public class SpringWebExpressionEvaluator implements ExpressionEvaluator {
      * @param delegate The original {@link ExpressionEvaluationContext} to be
      *                 delegated to for {@code ctx['foo']} expressions.
      */
-    public SpringWebExpressionEvaluationContext(final ExpressionEvaluationContext delegate) {
+    SpringWebExpressionEvaluationContext(final ExpressionEvaluationContext delegate) {
       this.delegate = delegate;
     }
 
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DomUtils.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DomUtils.java
index e1a02c64..01b063aa 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DomUtils.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DomUtils.java
@@ -239,6 +239,7 @@ public class DomUtils {
    *                                          the same way it is accepted by the
    *                                          <code>xsi:noNamespaceSchemaLocation</code>
    *                                          attribute.
+   * @param parserFeatures {@link Map} of features for XML parser
    * @return The parsed XML document as a DOM tree.
    * @throws SAXException                 An error occurred parsing the document.
    * @throws IOException                  An error occurred reading the document.
@@ -350,6 +351,7 @@ public class DomUtils {
    *                                          decide what to do with parsing
    *                                          errors. If <code>null</code>, it
    *                                          will not be set.
+   * @param parserFeatures {@link Map} of features for XML parser
    * @return The parsed XML document as a DOM tree.
    * @throws SAXException                 An error occurred parsing the document.
    * @throws IOException                  An error occurred reading the document.
@@ -622,6 +624,7 @@ public class DomUtils {
    *                                          the same way it is accepted by the
    *                                          <code>xsi:noNamespaceSchemaLocation</code>
    *                                          attribute.
+   * @param entityResolver external entity resolver implemention
    * @return <code>true</code>, if the <code>element</code> validates against the
    *         schemas declared in it.
    * @throws SAXException                 An error occurred parsing the document.
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/EaafCoreMessageSourceTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/EaafCoreMessageSourceTest.java
index a354b873..2fd25478 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/EaafCoreMessageSourceTest.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/EaafCoreMessageSourceTest.java
@@ -2,8 +2,6 @@ package at.gv.egiz.eaaf.core.impl.idp.auth;
 
 import java.util.List;
 
-import at.gv.egiz.eaaf.core.api.logging.IMessageSourceLocation;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,10 +11,12 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import at.gv.egiz.eaaf.core.api.logging.IMessageSourceLocation;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({ "/eaaf_core.beans.xml",
-  "/SpringTest-context_eaaf_core.xml",
-  "/SpringTest-context_authManager.xml"})
+    "/SpringTest-context_eaaf_core.xml",
+    "/SpringTest-context_authManager.xml"})
 public class EaafCoreMessageSourceTest {
 
   @Autowired
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java
index 7559fe85..4aa32360 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/process/spring/test/SpringExpressionEvaluatorTest.java
@@ -70,9 +70,12 @@ public class SpringExpressionEvaluatorTest {
     assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.integerValue == 42"));
     assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10"));
     
-    assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10 and @simplePojo.booleanValue"));
-    assertFalse(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10 and !@simplePojo.booleanValue"));
-    assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10 or !@simplePojo.booleanValue"));
+    assertTrue(expressionEvaluator.evaluate(ctx, 
+        "@simplePojo.stringValue.length() == 10 and @simplePojo.booleanValue"));
+    assertFalse(expressionEvaluator.evaluate(ctx, 
+        "@simplePojo.stringValue.length() == 10 and !@simplePojo.booleanValue"));
+    assertTrue(expressionEvaluator.evaluate(ctx, 
+        "@simplePojo.stringValue.length() == 10 or !@simplePojo.booleanValue"));
   }
 
 }