diff --git a/Dockerfile.core b/Dockerfile.core
index 0aa42d3..751318b 100644
--- a/Dockerfile.core
+++ b/Dockerfile.core
@@ -1,5 +1,5 @@
FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/maven:3.8.3-openjdk-17-slim as builder
-ARG ARTIFACT_VERSION=2.0.1-RELEASE
+ARG ARTIFACT_VERSION=2.0.2-SNAPSHOT
RUN mkdir -p /build
WORKDIR /build
COPY . /build
@@ -7,7 +7,7 @@ RUN mvn clean install -DskipTests
RUN mvn clean verify -DskipTests -Dartifact.version=${ARTIFACT_VERSION}
FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/openjdk:17-slim-bullseye
-ARG ARTIFACT_VERSION=2.0.1-RELEASE
+ARG ARTIFACT_VERSION=2.0.2-SNAPSHOT
RUN mkdir -p /usr/local
RUN apt-get update -y && apt-get -y install fontconfig libpng-dev
WORKDIR /usr/local/
diff --git a/Dockerfile.proxy b/Dockerfile.proxy
index 7f7cb95..1c2b24c 100644
--- a/Dockerfile.proxy
+++ b/Dockerfile.proxy
@@ -1,5 +1,5 @@
FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/maven:3.8.3-openjdk-17-slim as builder
-ARG ARTIFACT_VERSION=2.0.1-RELEASE
+ARG ARTIFACT_VERSION=2.0.2-SNAPSHOT
RUN mkdir -p /build
WORKDIR /build
COPY . /build
@@ -7,7 +7,7 @@ RUN mvn clean install -DskipTests
RUN mvn clean verify -DskipTests -Dartifact.version=${ARTIFACT_VERSION}
FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/openjdk:17-slim-bullseye
-ARG ARTIFACT_VERSION=2.0.1-RELEASE
+ARG ARTIFACT_VERSION=2.0.2-SNAPSHOT
RUN mkdir -p /usr/local
RUN apt-get update -y && apt-get -y install fontconfig libpng-dev
WORKDIR /usr/local/
diff --git a/litmus-cache/pom.xml b/litmus-cache/pom.xml
index 878741f..a2678d3 100644
--- a/litmus-cache/pom.xml
+++ b/litmus-cache/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-cache
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-cache
diff --git a/litmus-client/pom.xml b/litmus-client/pom.xml
index 7772cbd..90e498d 100644
--- a/litmus-client/pom.xml
+++ b/litmus-client/pom.xml
@@ -5,11 +5,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-client
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-client
@@ -43,7 +43,7 @@
com.navi.medici
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
diff --git a/litmus-client/src/main/java/com/navi/medici/client/OkHttpClientContainer.java b/litmus-client/src/main/java/com/navi/medici/client/OkHttpClientContainer.java
index 7f4ba94..3ca58c2 100644
--- a/litmus-client/src/main/java/com/navi/medici/client/OkHttpClientContainer.java
+++ b/litmus-client/src/main/java/com/navi/medici/client/OkHttpClientContainer.java
@@ -15,7 +15,7 @@ public class OkHttpClientContainer {
synchronized (OkHttpClientContainer.class) {
if (okHttpClient == null) {
okHttpClient = new OkHttpClient.Builder()
- .readTimeout(10, TimeUnit.MILLISECONDS)
+ .readTimeout(1, TimeUnit.SECONDS)
.callTimeout(1, TimeUnit.SECONDS)
.connectTimeout(1, TimeUnit.SECONDS)
.build();
diff --git a/litmus-core/pom.xml b/litmus-core/pom.xml
index 1e8209a..c391c73 100644
--- a/litmus-core/pom.xml
+++ b/litmus-core/pom.xml
@@ -5,11 +5,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-core
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-core
@@ -31,25 +31,25 @@
com.navi.medici
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
com.navi.medici
litmus-db
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
com.navi.medici
litmus-cache
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
com.navi.medici
litmus-util
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
diff --git a/litmus-core/src/main/java/com/navi/medici/config/SwaggerConfig.java b/litmus-core/src/main/java/com/navi/medici/config/SwaggerConfig.java
deleted file mode 100644
index 05181d8..0000000
--- a/litmus-core/src/main/java/com/navi/medici/config/SwaggerConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.navi.medici.config;
-
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class SwaggerConfig {
-
-// @Bean
-// public Docket api() {
-// return new Docket(DocumentationType.SWAGGER_2)
-// .select()
-// .apis(RequestHandlerSelectors.any())
-// .paths(regex("/litmus-core/.*"))
-// .build();
-// }
-
-}
diff --git a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
index 3033b33..d597840 100644
--- a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
+++ b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
@@ -11,11 +11,14 @@ import com.navi.medici.response.LitmusExperimentCollection;
import com.navi.medici.strategy.ActivationStrategy;
import com.navi.medici.util.JacksonUtils;
import com.navi.medici.variants.VariantDefinition;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;
import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@Service
@@ -94,14 +97,19 @@ public record ExperimentServiceImpl(IExperimentQuery experimentQuery,
}
private LitmusExperiment build(ExperimentEntity experimentEntity) {
+ List variants = StringUtils.isBlank(experimentEntity.getVariants()) ? Collections.emptyList() :
+ jacksonUtils.stringToListObject(experimentEntity.getVariants(), VariantDefinition.class);
+ List strategies = StringUtils.isBlank(experimentEntity.getStrategies()) ? Collections.emptyList() :
+ jacksonUtils.stringToListObject(experimentEntity.getStrategies(), ActivationStrategy.class);
+
return LitmusExperiment.builder()
.experimentId(experimentEntity.getExperimentId())
.name(experimentEntity.getName())
.description(experimentEntity.getDescription())
.enabled(experimentEntity.getEnabled())
.archived(experimentEntity.getArchived())
- .strategies(jacksonUtils.stringToListObject(experimentEntity.getStrategies(), ActivationStrategy.class))
- .variants(jacksonUtils.stringToListObject(experimentEntity.getVariants(), VariantDefinition.class))
+ .strategies(strategies)
+ .variants(variants)
.type(experimentEntity.getType())
.startTime(experimentEntity.getStartTime())
.endTime(experimentEntity.getEndTime())
diff --git a/litmus-db/pom.xml b/litmus-db/pom.xml
index 06a042f..fddf879 100644
--- a/litmus-db/pom.xml
+++ b/litmus-db/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-db
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-db
@@ -27,7 +27,7 @@
com.navi.medici
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
diff --git a/litmus-liquibase/pom.xml b/litmus-liquibase/pom.xml
index 2d919a6..6b9a955 100644
--- a/litmus-liquibase/pom.xml
+++ b/litmus-liquibase/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-liquibase
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-liquibase
diff --git a/litmus-mock/pom.xml b/litmus-mock/pom.xml
index 50a1864..621fd8c 100644
--- a/litmus-mock/pom.xml
+++ b/litmus-mock/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-mock
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-mock
@@ -16,13 +16,13 @@
com.navi.medici
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
com.navi.medici
litmus-client
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
diff --git a/litmus-model/pom.xml b/litmus-model/pom.xml
index c05a2cd..8da069a 100644
--- a/litmus-model/pom.xml
+++ b/litmus-model/pom.xml
@@ -5,11 +5,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-model
diff --git a/litmus-proxy/pom.xml b/litmus-proxy/pom.xml
index 4de3d3b..8247c26 100644
--- a/litmus-proxy/pom.xml
+++ b/litmus-proxy/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-proxy
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
jar
litmus-proxy
@@ -17,13 +17,13 @@
com.navi.medici
litmus-model
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
com.navi.medici
litmus-client
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
diff --git a/litmus-util/pom.xml b/litmus-util/pom.xml
index 7903351..07de400 100644
--- a/litmus-util/pom.xml
+++ b/litmus-util/pom.xml
@@ -4,11 +4,11 @@
litmus
com.navi.medici
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-util
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
litmus-util
diff --git a/pom.xml b/pom.xml
index ee16b76..c68199e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.navi.medici
litmus
- 2.0.1-RELEASE
+ 2.0.2-SNAPSHOT
pom
litmus