varnitgoyal95/litmus-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Litmus variant null check fix

Browse Source
This commit is contained in:
chandresh pancholi
2022-04-26 22:26:50 +05:30
parent cf3187781c
commit e28eb85a38
15 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.core
View File

@@ -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/

4
Dockerfile.proxy
View File

@@ -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/

4
litmus-cache/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-cache</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-cache</name>

6
litmus-client/pom.xml
View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-client</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-client</name>
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>

2
litmus-client/src/main/java/com/navi/medici/client/OkHttpClientContainer.java
View File

@@ -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();

12
litmus-core/pom.xml
View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-core</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-core</name>
@@ -31,25 +31,25 @@
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-db</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-cache</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-util</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>

18
litmus-core/src/main/java/com/navi/medici/config/SwaggerConfig.java
View File

@@ -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();
// }
}

12
litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
View File

@@ -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<VariantDefinition> variants = StringUtils.isBlank(experimentEntity.getVariants()) ? Collections.emptyList() :
jacksonUtils.stringToListObject(experimentEntity.getVariants(), VariantDefinition.class);
List<ActivationStrategy> 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())

6
litmus-db/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-db</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-db</name>
@@ -27,7 +27,7 @@
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
</dependencies>

4
litmus-liquibase/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-liquibase</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-liquibase</name>

8
litmus-mock/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-mock</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-mock</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-client</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>

4
litmus-model/pom.xml
View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-model</name>

8
litmus-proxy/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-proxy</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>litmus-proxy</name>
@@ -17,13 +17,13 @@
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-model</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.navi.medici</groupId>
<artifactId>litmus-client</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>

4
litmus-util/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<artifactId>litmus</artifactId>
<groupId>com.navi.medici</groupId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>litmus-util</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<name>litmus-util</name>

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.navi.medici</groupId>
<artifactId>litmus</artifactId>
<version>2.0.1-RELEASE</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>litmus</name>