Skip to content

Commit

Permalink
Revert "use conditional annotation for ioc location manager alfio-eve…
Browse files Browse the repository at this point in the history
…nt#127"

This reverts commit 6a909bd.
  • Loading branch information
bunsenmcdubbs committed Jul 13, 2016
1 parent 6a909bd commit d5d4933
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 58 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package alfio.manager.location;

import alfio.config.Initializer;
import alfio.config.support.ConditionalOnConfigurationPresentProperty;
import alfio.manager.system.ConfigurationManager;
import alfio.model.system.Configuration;
import alfio.model.system.ConfigurationKeys;
Expand All @@ -28,7 +27,6 @@
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;

Expand All @@ -37,7 +35,7 @@
import java.util.concurrent.atomic.AtomicReference;

@Component
@ConditionalOnConfigurationPresentProperty(ConfigurationKeys.MAPS_SERVER_API_KEY)
@Profile(Initializer.PROFILE_LIVE)
public class DefaultLocationManager implements LocationManager {

private static final AtomicReference<GeoApiContext> CTX = new AtomicReference<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@
package alfio.manager.location;

import alfio.config.Initializer;
import alfio.config.support.ConditionalOnConfigurationPresentProperty;
import alfio.model.system.ConfigurationKeys;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;

import java.util.TimeZone;

@Component
@ConditionalOnConfigurationPresentProperty(value = ConfigurationKeys.MAPS_SERVER_API_KEY, exists = false)
@Profile(Initializer.PROFILE_DEV)
public class MockLocationManager implements LocationManager {
@Override
public Pair<String, String> geocode(String address) {
Expand Down

0 comments on commit d5d4933

Please sign in to comment.