release: 1.2.2

- logback version upgrade
- enhancement in execution context

Author: javaquery

README.md

@@ -49,12 +49,12 @@ framework and objects.
 <dependency>
   <groupId>com.javaquery</groupId>
   <artifactId>util</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
 </dependency>
 ``` 
 
 # Gradle
 
 ```
-implementation 'com.javaquery:util:1.2.1'
+implementation 'com.javaquery:util:1.2.2'
 ```

build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 sourceCompatibility = 1.8
 group 'com.javaquery'
-version '1.2.1'
+version '1.2.2'
 
 repositories {
     mavenCentral()
@@ -17,8 +17,8 @@ dependencies {
     implementation('org.json:json:+')
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.13.2'
 
-    testImplementation 'net.logstash.logback:logstash-logback-encoder:6.6'
-    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '+'
+    testImplementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.7'
     testImplementation('org.junit.jupiter:junit-jupiter:5.7.0')
 }
 

src/main/java/com/javaquery/util/ExecutionContext.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.javaquery.util.logging.Action;
+import com.javaquery.util.logging.ActivityStatus;
 import com.javaquery.util.time.Dates;
 
 import java.util.Date;
@@ -12,14 +13,22 @@
  * @author vicky.thakor
  * @since 1.2.0
  */
-public class ExecutionContext<T> {
+public class ExecutionContext<T, V> {
 
     @JsonProperty("request_id")
-    private final String requestId;
+    private String requestId;
 
     @JsonProperty("reference_id")
     private T referenceId;
-    private final Action action;
+
+    @JsonProperty("user")
+    private V userContext;
+
+    private Action action;
+
+    @JsonProperty("activity_status")
+    private ActivityStatus activityStatus;
+
     private Map<String, Object> meta;
 
     @JsonProperty("max_retries")
@@ -31,6 +40,15 @@ public class ExecutionContext<T> {
     @JsonProperty("created_at")
     private final Date createdAt;
 
+    public ExecutionContext() {
+        this.createdAt = Dates.current();
+    }
+
+    public ExecutionContext(String requestId){
+        this.requestId = requestId;
+        this.createdAt = Dates.current();
+    }
+
     public ExecutionContext(String requestId, T referenceId, Action action) {
         this.requestId = requestId;
         this.referenceId = referenceId;
@@ -75,6 +93,18 @@ public String getRequestId() {
         return requestId;
     }
 
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public V getUserContext() {
+        return userContext;
+    }
+
+    public void setUserContext(V userContext) {
+        this.userContext = userContext;
+    }
+
     public T getReferenceId() {
         return referenceId;
     }
@@ -83,6 +113,18 @@ public Action getAction() {
         return action;
     }
 
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    public ActivityStatus getActivityStatus() {
+        return activityStatus;
+    }
+
+    public void setActivityStatus(ActivityStatus activityStatus) {
+        this.activityStatus = activityStatus;
+    }
+
     public Map<String, Object> getMeta() {
         return meta;
     }

src/main/java/com/javaquery/util/logging/ActivityStatus.java

@@ -0,0 +1,12 @@
+package com.javaquery.util.logging;
+
+/**
+ * @author vicky.thakor
+ * @since 1.2.2
+ *
+ * Represents current activity status
+ */
+public enum ActivityStatus {
+	STARTED, PROCESSING, COMPLETED, FAILED, PROCESSING_WITH_ERROR, COMPLETED_WITH_ERROR;
+}
+

src/test/java/com/javaquery/util/TestExecutionContext.java

@@ -1,6 +1,7 @@
 package com.javaquery.util;
 
 import com.javaquery.util.logging.Action;
+import com.javaquery.util.logging.ActivityStatus;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -16,19 +17,63 @@ public enum ExecutionContextAction implements Action{
         ONE
     }
 
+    public class UserContext{
+
+        private Long userId;
+
+        private Long tenantId;
+
+        public UserContext(Long userId, Long tenantId) {
+            this.userId = userId;
+            this.tenantId = tenantId;
+        }
+
+        public Long getUserId() {
+            return userId;
+        }
+
+        public Long getTenantId() {
+            return tenantId;
+        }
+    }
+
+    @Test
+    public void defaultConstructor(){
+        ExecutionContext<Object, Object> executionContext = new ExecutionContext<>();
+        executionContext.setUserContext(new UserContext(50L, 20L));
+        executionContext.setRequestId(UniqueIdGenerator.generate());
+
+        UserContext userContext = (UserContext) executionContext.getUserContext();
+        Assertions.assertEquals(50L, userContext.getUserId());
+        Assertions.assertNotNull(executionContext.getCreatedAt());
+        Assertions.assertNotNull(executionContext.getRequestId());
+    }
+
+    @Test
+    public void constructorWithRequestId(){
+        ExecutionContext<Long, Long> executionContext = new ExecutionContext<>(UniqueIdGenerator.generate());
+        Assertions.assertNotNull(executionContext.getRequestId());
+    }
+
     @Test
     public void constructorWithRequestIdReferenceIdAction(){
-        ExecutionContext<Long> executionContext = new ExecutionContext<>(UniqueIdGenerator.generate(), 1L, ExecutionContextAction.ONE);
+        ExecutionContext<Long, Long> executionContext = new ExecutionContext<>(UniqueIdGenerator.generate(), 1L, ExecutionContextAction.ONE);
+        executionContext.setUserContext(50L);
+        executionContext.setActivityStatus(ActivityStatus.STARTED);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
         Assertions.assertEquals(1L, executionContext.getReferenceId());
         Assertions.assertNotNull(executionContext.getMeta());
         Assertions.assertNotNull(executionContext.getCreatedAt());
+
+        Assertions.assertEquals(50L, executionContext.getUserContext());
+        Assertions.assertEquals(ActivityStatus.STARTED, executionContext.getActivityStatus());
+        Assertions.assertNotNull(executionContext.getCreatedAt());
     }
 
     @Test
     public void constructorWithReferenceIdAction(){
-        ExecutionContext<String> executionContext = new ExecutionContext<>("test", ExecutionContextAction.ONE);
+        ExecutionContext<String, Void> executionContext = new ExecutionContext<>("test", ExecutionContextAction.ONE);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
         Assertions.assertEquals("test", executionContext.getReferenceId());
@@ -38,7 +83,7 @@ public void constructorWithReferenceIdAction(){
 
     @Test
     public void constructorWithAction(){
-        ExecutionContext<String> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
+        ExecutionContext<String, Void> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
         Assertions.assertNull(executionContext.getReferenceId());
@@ -48,7 +93,7 @@ public void constructorWithAction(){
 
     @Test
     public void constructorWithActionAndMeta(){
-        ExecutionContext<String> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
+        ExecutionContext<String, Void> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
         executionContext.addMeta("key", "value");
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
@@ -63,7 +108,7 @@ public void constructorWithActionAndMeta(){
 
     @Test
     public void constructorWithActionAndRetriesAttempted(){
-        ExecutionContext<String> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
+        ExecutionContext<String, Void> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE);
         executionContext.addRetriesAttempted(1);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
@@ -75,7 +120,7 @@ public void constructorWithActionAndRetriesAttempted(){
 
     @Test
     public void constructorWithReferenceIdActionMaxRetries(){
-        ExecutionContext<Long> executionContext = new ExecutionContext<>(1L, ExecutionContextAction.ONE, 3);
+        ExecutionContext<Long, Void> executionContext = new ExecutionContext<>(1L, ExecutionContextAction.ONE, 3);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
         Assertions.assertEquals(1L, executionContext.getReferenceId());
@@ -86,7 +131,7 @@ public void constructorWithReferenceIdActionMaxRetries(){
 
     @Test
     public void constructorWithActionMaxRetries(){
-        ExecutionContext<Long> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE, 3);
+        ExecutionContext<Long, Void> executionContext = new ExecutionContext<>(ExecutionContextAction.ONE, 3);
         Assertions.assertNotNull(executionContext.getRequestId());
         Assertions.assertEquals(ExecutionContextAction.ONE, executionContext.getAction());
         Assertions.assertNull(executionContext.getReferenceId());