Skip to content

Commit

Permalink
DPO-2301 remove unused Transactional-annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
teijosol committed Jun 19, 2024
1 parent 91ce25a commit 0ffa294
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
package fi.livi.digitraffic.tie.service.waze;

import static fi.livi.digitraffic.tie.conf.RoadCacheConfiguration.CACHE_REVERSE_GEOCODE;

import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Stream;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import fi.livi.digitraffic.tie.dto.wazefeed.ReverseGeocode;
import fi.livi.digitraffic.tie.helper.WazeReverseGeocodingApi;
import fi.livi.digitraffic.tie.metadata.geojson.Geometry;
import fi.livi.digitraffic.tie.metadata.geojson.MultiLineString;
import fi.livi.digitraffic.tie.metadata.geojson.Point;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Optional;

import fi.livi.digitraffic.tie.dto.wazefeed.ReverseGeocode;
import fi.livi.digitraffic.tie.helper.WazeReverseGeocodingApi;
import fi.livi.digitraffic.tie.metadata.geojson.Geometry;
import fi.livi.digitraffic.tie.metadata.geojson.MultiLineString;
import fi.livi.digitraffic.tie.metadata.geojson.Point;
import static fi.livi.digitraffic.tie.conf.RoadCacheConfiguration.CACHE_REVERSE_GEOCODE;

@ConditionalOnWebApplication
@Service
Expand All @@ -45,15 +38,13 @@ public WazeReverseGeocodingService(final ObjectMapper objectMapper, final WazeRe
}

@Cacheable(value = CACHE_REVERSE_GEOCODE)
@Transactional(readOnly = true)
public Optional<String> getStreetName(final Geometry<?> geometry) {
return getPoint(geometry)
.flatMap(this::fetch)
.flatMap(this::closestStreetName);
}

@CacheEvict(value = CACHE_REVERSE_GEOCODE, allEntries = true)
@Transactional(readOnly = true)
public void evictCache () { }

private Optional<Point> getPoint(final Geometry<?> geometry) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

Expand Down

0 comments on commit 0ffa294

Please sign in to comment.