78fee348a8873305253f6d39dc351d9ead62561a
java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java
| ... | ... | @@ -131,13 +131,24 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra |
| 131 | 131 | new URL("file:///" + new File("resources/event_20110609_KielerWoch-505_Race_2.txt").getCanonicalPath()), |
| 132 | 132 | /* liveUri */ null, /* storedUri */ storedUri, |
| 133 | 133 | new ReceiverType[] { ReceiverType.MARKPASSINGS, ReceiverType.RACECOURSE, ReceiverType.RAWPOSITIONS, ReceiverType.MARKPOSITIONS }); |
| 134 | - final Optional<String> polardataBearerToken = Optional.ofNullable(Optional.ofNullable(System.getProperty("polardata.source.bearertoken")).orElse(System.getenv("POLAR_DATA_BEARER_TOKEN"))); |
|
| 135 | - if (polardataBearerToken.isPresent()) { |
|
| 134 | + String polarDataBearerToken = System.getProperty("polardata.source.bearertoken"); |
|
| 135 | + if (polarDataBearerToken == null) { |
|
| 136 | + logger.info("Couldn't find polardata.source.bearertoken system property, trying environment variable POLAR_DATA_BEARER_TOKEN"); |
|
| 137 | + polarDataBearerToken = System.getenv("POLAR_DATA_BEARER_TOKEN"); |
|
| 138 | + if (polarDataBearerToken == null) { |
|
| 139 | + logger.warning("Couldn't find POLAR_DATA_BEARER_TOKEN environment variable either, polar data service will not be available"); |
|
| 140 | + } |
|
| 141 | + } else { |
|
| 142 | + logger.info("Found polardata.source.bearertoken system property, polar data service will be available"); |
|
| 143 | + } |
|
| 144 | + final Optional<String> polardataBearerTokenOptional = Optional.ofNullable(polarDataBearerToken); |
|
| 145 | + if (polardataBearerTokenOptional.isPresent()) { |
|
| 136 | 146 | polarDataService = new PolarDataServiceImpl(); |
| 137 | 147 | final com.sap.sailing.domain.tractracadapter.DomainFactory domainFactoryImpl = getDomainFactory(); |
| 138 | 148 | final DomainFactory baseDomainFactory = domainFactoryImpl.getBaseDomainFactory(); |
| 139 | 149 | polarDataService.registerDomainFactory(baseDomainFactory); |
| 140 | - new PolarDataClient(Optional.ofNullable(System.getenv("POLAR_DATA_BASE_URL")).orElse("https://sapsailing.com"), polarDataService, polardataBearerToken).updatePolarDataRegressions(); |
|
| 150 | + new PolarDataClient(Optional.ofNullable(System.getenv("POLAR_DATA_BASE_URL")).orElse("https://sapsailing.com"), polarDataService, polardataBearerTokenOptional) |
|
| 151 | + .updatePolarDataRegressions(); |
|
| 141 | 152 | } else { |
| 142 | 153 | polarDataService = null; |
| 143 | 154 | } |