[BI-1909] suggested changes

Author: timparsons

src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationUnitService.java

@@ -57,17 +57,11 @@
 import io.swagger.model.pheno.ObservationVariable;
 import io.swagger.model.pheno.ObservationVariableSearchRequest;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
 @Service
 public class ObservationUnitService {
 
 	private static final Logger log = LoggerFactory.getLogger(ObservationUnitService.class);
 	private final ObservationUnitRepository observationUnitRepository;
-
-	private final EntityManager entityManager;
-
 	private final GermplasmService germplasmService;
 	private final CrossService crossService;
 	private final ObservationService observationService;
@@ -81,9 +75,8 @@ public class ObservationUnitService {
 	public ObservationUnitService(ObservationUnitRepository observationUnitRepository, StudyService studyService,
 			TrialService trialService, ProgramService programService, ObservationService observationService,
 			GermplasmService germplasmService, SeedLotService seedLotService, CrossService crossService,
-			ObservationVariableService observationVariableService, EntityManager entityManager) {
+			ObservationVariableService observationVariableService) {
 		this.observationUnitRepository = observationUnitRepository;
-		this.entityManager = entityManager;
 
 		this.studyService = studyService;
 		this.trialService = trialService;

src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationVariableService.java

@@ -141,9 +141,9 @@ public List<ObservationVariable> findObservationVariables(ObservationVariableSea
 				.appendList(request.getTraitDbIds(), "trait.id")
 				.appendEnumList(request.getDataTypes(), "scale.dataType");
 
-		log.debug("Starting variable search: " + new Date());
+		log.debug("Starting variable search");
 		Page<ObservationVariableEntity> page = observationVariableRepository.findAllBySearch(searchQuery, pageReq);
-		log.debug("Search variable complete: " + new Date());
+		log.debug("Variable search complete");
 		if(!page.isEmpty()) {
 			observationVariableRepository.fetchXrefs(page, ObservationVariableEntity.class);
 			observationVariableRepository.fetchAdditionalInfo(page, ObservationVariableEntity.class);
@@ -157,9 +157,9 @@ public List<ObservationVariable> findObservationVariables(ObservationVariableSea
 			fetchTraitAdditionalInfo(page);
 		}
 
-		log.debug(new Date() + ": converting "+page.getSize()+" entities");
+		log.debug("converting "+page.getSize()+" entities");
 		List<ObservationVariable> observationVariables = page.map(this::convertFromEntity).getContent();
-		log.debug(new Date() + ": done converting entities");
+		log.debug("done converting entities");
 		PagingUtility.calculateMetaData(metadata, page);
 		return observationVariables;
 	}
@@ -320,7 +320,7 @@ public ObservationVariableEntity getObservationVariableEntity(String observation
 	}
 
 	private ObservationVariable convertFromEntity(ObservationVariableEntity entity) {
-		log.trace(new Date() + ": converting variable: " + entity.getId());
+		log.trace("converting variable: " + entity.getId());
 		ObservationVariable var = new ObservationVariable();
 		convertFromBaseEntity(entity, var);
 		var.setObservationVariableName(entity.getName());

src/main/resources/logback.xml

@@ -1,20 +1,3 @@
-<!--
-  ~ See the NOTICE file distributed with this work for additional information
-  ~ regarding copyright ownership.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <configuration>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">