Skip to content

[BI-2927] Remove trait cache and rest of CRUD operations #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jloux-brapi wants to merge 1 commit into
base: feature/BI-2925
Choose a base branch
from
Open

[BI-2927] Remove trait cache and rest of CRUD operations #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions src/main/java/org/breedinginsight/daos/impl/TraitDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.google.gson.JsonDeserializer;
import io.micronaut.context.annotation.Property;
import io.micronaut.http.server.exceptions.InternalServerException;
import io.micronaut.scheduling.annotation.Scheduled;
import lombok.extern.slf4j.Slf4j;
import org.brapi.client.v2.ApiResponse;
import org.brapi.client.v2.BrAPIClient;
Expand All @@ -34,7 +33,6 @@
import org.brapi.v2.model.pheno.*;
import org.brapi.v2.model.pheno.request.BrAPIObservationVariableSearchRequest;
import org.brapi.v2.model.pheno.response.BrAPIObservationVariableListResponse;
import org.brapi.v2.model.pheno.response.BrAPIObservationVariableListResponseResult;
import org.brapi.v2.model.pheno.response.BrAPIObservationVariableSingleResponse;
import org.breedinginsight.brapps.importer.services.ExternalReferenceSource;
import org.breedinginsight.dao.db.tables.BiUserTable;
Expand All @@ -43,8 +41,6 @@
import org.breedinginsight.daos.ObservationDAO;
import org.breedinginsight.daos.ProgramDAO;
import org.breedinginsight.daos.TraitDAO;
import org.breedinginsight.daos.cache.ProgramCache;
import org.breedinginsight.daos.cache.ProgramCacheProvider;
import org.breedinginsight.model.*;
import org.breedinginsight.model.User;
import org.breedinginsight.services.brapi.BrAPIEndpointProvider;
Expand Down Expand Up @@ -74,7 +70,6 @@ public class TraitDAOImpl extends TraitDao implements TraitDAO {
private final Boolean runScheduledTasks;
private final ObservationDAO observationDao;
private final BrAPIDAOUtil brAPIDAOUtil;
private final ProgramCache<Trait> cache;
private final ProgramDAO programDAO;
private final BrAPIEndpointProvider brAPIEndpointProvider;
private final Gson gson;
Expand All @@ -89,7 +84,6 @@ public TraitDAOImpl(Configuration config,
ObservationDAO observationDao,
BrAPIDAOUtil brAPIDAOUtil,
ProgramDAO programDAO,
ProgramCacheProvider programCacheProvider,
BrAPIEndpointProvider brAPIEndpointProvider,
@Property(name = "brapi.server.reference-source") String referenceSource,
@Property(name = "micronaut.bi.api.run-scheduled-tasks") Boolean runScheduledTasks) {
Expand All @@ -98,7 +92,6 @@ public TraitDAOImpl(Configuration config,
this.brAPIProvider = brAPIProvider;
this.observationDao = observationDao;
this.brAPIDAOUtil = brAPIDAOUtil;
this.cache = programCacheProvider.getProgramCache(this::populateCache, Trait.class);
this.programDAO = programDAO;
this.brAPIEndpointProvider = brAPIEndpointProvider;
this.gson = new GsonBuilder().registerTypeAdapter(OffsetDateTime.class, (JsonDeserializer<OffsetDateTime>)
Expand All @@ -110,29 +103,6 @@ public TraitDAOImpl(Configuration config,
this.runScheduledTasks = runScheduledTasks;
}

@Scheduled(initialDelay = "${startup.delay.trait}")
public void setup() {
if(!runScheduledTasks) {
return;
}
// Populate trait cache for all programs on startup
log.debug("Populate traits cache");
List<Program> programs = programDAO.getActive();
if(programs != null) {
cache.populate(programs.stream().map(Program::getId).collect(Collectors.toList()));
}
}

private Map<String, Trait> populateCache(UUID programId) {
List<Trait> programTraits = fetchTraitsFullByProgramId(programId);
Map<String, Trait> traits = new HashMap<>();
if (!programTraits.isEmpty()) {
programTraits.forEach(trait -> traits.put(trait.getId().toString(), trait));
}

return traits;
}

@Override
public List<Trait> getTraitsFullByProgramId(UUID programId) {
List<UUID> programIds = new ArrayList<>();
Expand Down Expand Up @@ -504,8 +474,6 @@ public List<Trait> createTraitsBrAPI(List<Trait> traits, User actingUser, Progra
if (brApiExternalReference.getReferenceSource().equals(referenceSource) &&
brApiExternalReference.getReferenceID().equals(trait.getId().toString())){
saturateTrait(trait, variable);

cache.set(program.getId(), trait.getId().toString(), trait);
}
}
}
Expand Down Expand Up @@ -568,9 +536,6 @@ public Trait updateTraitBrAPI(Trait trait, Program program) {
// Retrieve our update trait from the db
updatedTrait = getTrait(program.getId(), trait.getId()).get();
saturateTrait(updatedTrait, updatedVariable);

//update cache
cache.set(program.getId(), updatedTrait.getId().toString(), updatedTrait);
}

return updatedTrait;
Expand Down
Loading