Skip to content

Commit 7a177aa

Browse files
keilwkeilw
committed
Working on #353 
1 parent 61668df commit 7a177aa

13 files changed

+78
-80
lines changed

‎moneta-core/src/main/java/org/javamoney/moneta/spi/loader/ResourceCache.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2020, Anatole Tresch, Werner Keil and others by the @author tag.
2+
Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
33
44
Licensed under the Apache License, Version 2.0 (the "License"); you may not
55
use this file except in compliance with the License. You may obtain a copy of
@@ -15,15 +15,13 @@
1515
*/
1616
package org.javamoney.moneta.spi.loader;
1717

18-
import org.javamoney.moneta.spi.loader.urlconnection.DefaultResourceCache;
19-
2018
import java.io.IOException;
2119

2220
/**
23-
* Abstraction of a {@link ResourceCache}. By default a file cache is used:
24-
* {@link DefaultResourceCache}.
21+
* Abstraction of a {@link ResourceCache}.
2522
*
2623
* @author Anatole Tresch
24+
* @author Werner Keil
2725
*/
2826
public interface ResourceCache {
2927
/**

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadDataLoaderService.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadDataService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
2222

23-
public class LoadDataLoaderService {
23+
class LoadDataService {
2424

25-
private static final Logger LOG = Logger.getLogger(LoadDataLoaderService.class.getName());
25+
private static final Logger LOG = Logger.getLogger(LoadDataService.class.getName());
2626

27-
private final DefaultLoaderListener listener;
27+
private final URLConnectionLoaderListener listener;
2828

29-
LoadDataLoaderService(DefaultLoaderListener listener) {
29+
LoadDataService(URLConnectionLoaderListener listener) {
3030
this.listener = listener;
3131
}
3232

3333
public boolean execute(String resourceId,
34-
Map<String, LoadableResource> resources) {
34+
Map<String, LoadableURLResource> resources) {
3535

36-
LoadableResource load = resources.get(resourceId);
36+
LoadableURLResource load = resources.get(resourceId);
3737
if (Objects.nonNull(load)) {
3838
try {
3939
if (load.load()) {
@@ -66,7 +66,7 @@ public boolean execute(String resourceId,
6666

6767
@Override
6868
public String toString() {
69-
return LoadDataLoaderService.class.getName() + '{' + " listener: " + listener + '}';
69+
return LoadDataService.class.getName() + '{' + " listener: " + listener + '}';
7070
}
7171

7272
}

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadDataLocalLoaderService.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadLocaDataService.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
2222

23-
class LoadDataLocalLoaderService {
23+
class LoadLocaDataService {
2424

25-
private static final Logger LOG = Logger.getLogger(LoadDataLocalLoaderService.class.getName());
25+
private static final Logger LOG = Logger.getLogger(LoadLocaDataService.class.getName());
2626

27-
private final Map<String, LoadableResource> resources;
27+
private final Map<String, LoadableURLResource> resources;
2828

29-
private final DefaultLoaderListener listener;
29+
private final URLConnectionLoaderListener listener;
3030

3131

32-
LoadDataLocalLoaderService(Map<String, LoadableResource> resources,
33-
DefaultLoaderListener listener) {
32+
LoadLocaDataService(Map<String, LoadableURLResource> resources,
33+
URLConnectionLoaderListener listener) {
3434
this.resources = resources;
3535
this.listener = listener;
3636
}
3737

3838

3939
public boolean execute(String resourceId) {
40-
LoadableResource load = this.resources.get(resourceId);
40+
LoadableURLResource load = this.resources.get(resourceId);
4141
if (Objects.nonNull(load)) {
4242
try {
4343
if (load.loadFallback()) {
@@ -55,7 +55,7 @@ public boolean execute(String resourceId) {
5555

5656
@Override
5757
public String toString() {
58-
return LoadDataLocalLoaderService.class.getName() + '{' + " resources: "
58+
return LoadLocaDataService.class.getName() + '{' + " resources: "
5959
+ resources + ", defaultLoaderListener: " + listener + '}';
6060
}
6161
}

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadRemoteDataLoaderService.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadRemoteDataService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
2222

23-
class LoadRemoteDataLoaderService {
23+
class LoadRemoteDataService {
2424

25-
private static final Logger LOG = Logger.getLogger(LoadRemoteDataLoaderService.class.getName());
25+
private static final Logger LOG = Logger.getLogger(LoadRemoteDataService.class.getName());
2626

27-
private final DefaultLoaderListener listener;
27+
private final URLConnectionLoaderListener listener;
2828

29-
LoadRemoteDataLoaderService(DefaultLoaderListener listener) {
29+
LoadRemoteDataService(URLConnectionLoaderListener listener) {
3030
this.listener = listener;
3131
}
3232

3333
public boolean execute(String resourceId,
34-
Map<String, LoadableResource> resources) {
34+
Map<String, LoadableURLResource> resources) {
3535

36-
LoadableResource load = resources.get(resourceId);
36+
LoadableURLResource load = resources.get(resourceId);
3737
if (Objects.nonNull(load)) {
3838
try {
3939
load.readCache();
@@ -55,6 +55,6 @@ public boolean execute(String resourceId,
5555

5656
@Override
5757
public String toString() {
58-
return LoadRemoteDataLoaderService.class.getName() + '{' + " listener: " + listener + '}';
58+
return LoadRemoteDataService.class.getName() + '{' + " listener: " + listener + '}';
5959
}
6060
}

‎moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadableResourceBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.Objects;
2222

2323
/**
24-
* Builder for {@link LoadableResource}.
24+
* Builder for {@link LoadableURLResource}.
2525
*/
26-
public class LoadableResourceBuilder {
26+
class LoadableResourceBuilder {
2727

2828
private LoadDataInformation loadDataInformation;
2929

@@ -39,14 +39,14 @@ public LoadableResourceBuilder withCache(ResourceCache cache) {
3939
return this;
4040
}
4141

42-
public LoadableResource build() {
42+
public LoadableURLResource build() {
4343
if(Objects.isNull(cache)) {
4444
throw new IllegalStateException("The cache should be informed");
4545
}
4646
if(Objects.isNull(loadDataInformation)) {
4747
throw new IllegalStateException("The loadDataInformation should be informed");
4848
}
49-
return new LoadableResource(cache, loadDataInformation);
49+
return new LoadableURLResource(cache, loadDataInformation);
5050
}
5151

5252
@Override

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadableResource.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/LoadableURLResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
* To create this instance use: {@link LoadableResourceBuilder}
4242
* @author Anatole Tresch
4343
*/
44-
public class LoadableResource implements DataStreamFactory {
44+
public class LoadableURLResource implements DataStreamFactory {
4545

4646
/**
4747
* The logger used.
4848
*/
49-
private static final Logger LOG = Logger.getLogger(LoadableResource.class.getName());
49+
private static final Logger LOG = Logger.getLogger(LoadableURLResource.class.getName());
5050
/**
5151
* Lock for this instance.
5252
*/
@@ -98,7 +98,7 @@ public class LoadableResource implements DataStreamFactory {
9898
private final Map<String, String> properties;
9999

100100

101-
LoadableResource(ResourceCache cache, LoadDataInformation loadDataInformation) {
101+
LoadableURLResource(ResourceCache cache, LoadDataInformation loadDataInformation) {
102102
Objects.requireNonNull(loadDataInformation.getResourceId(), "resourceId required");
103103
Objects.requireNonNull(loadDataInformation.getProperties(), "properties required");
104104
Objects.requireNonNull(loadDataInformation.getUpdatePolicy(), "updatePolicy required");
@@ -444,7 +444,7 @@ public boolean resetToFallback() {
444444

445445
@Override
446446
public String toString() {
447-
return "LoadableResource [resourceId=" + resourceId + ", fallbackLocation=" +
447+
return "LoadableURLResource [resourceId=" + resourceId + ", fallbackLocation=" +
448448
fallbackLocation + ", remoteResources=" + remoteResources +
449449
", loadCount=" + loadCount + ", accessCount=" + accessCount + ", lastLoaded=" + lastLoaded + ']';
450450
}

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/ScheduledDataLoaderService.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/ScheduledDataService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
import java.util.logging.Level;
2626
import java.util.logging.Logger;
2727

28-
class ScheduledDataLoaderService {
28+
class ScheduledDataService {
2929

30-
private static final Logger LOG = Logger.getLogger(ScheduledDataLoaderService.class.getName());
30+
private static final Logger LOG = Logger.getLogger(ScheduledDataService.class.getName());
3131

3232
private final Timer timer;
33-
private final DefaultLoaderListener listener;
33+
private final URLConnectionLoaderListener listener;
3434

35-
ScheduledDataLoaderService(Timer timer, DefaultLoaderListener listener) {
35+
ScheduledDataService(Timer timer, URLConnectionLoaderListener listener) {
3636
this.timer = timer;
3737
this.listener = listener;
3838
}
3939

40-
public void execute(final LoadableResource load) {
40+
public void execute(final LoadableURLResource load) {
4141
Objects.requireNonNull(load);
4242
Map<String, String> props = load.getProperties();
4343
if (Objects.nonNull(props)) {
@@ -127,7 +127,7 @@ private long parseDuration(String value) {
127127
return periodMS;
128128
}
129129

130-
private TimerTask createTimerTask(final LoadableResource load)
130+
private TimerTask createTimerTask(final LoadableURLResource load)
131131
{
132132
return new TimerTask() {
133133
@Override
@@ -145,7 +145,7 @@ public void run() {
145145

146146
@Override
147147
public String toString() {
148-
return ScheduledDataLoaderService.class.getName() + '{' + " timer: "
148+
return ScheduledDataService.class.getName() + '{' + " timer: "
149149
+ timer + '}';
150150
}
151151
}

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/DefaultLoaderListener.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/URLConnectionLoaderListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.javamoney.moneta.spi.loader.DataStreamFactory;
2828
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
2929

30-
class DefaultLoaderListener {
30+
class URLConnectionLoaderListener {
3131

32-
private static final Logger LOG = Logger.getLogger(DefaultLoaderListener.class.getName());
32+
private static final Logger LOG = Logger.getLogger(URLConnectionLoaderListener.class.getName());
3333

3434
private final Map<String, List<LoaderListener>> listenersMap = new ConcurrentHashMap<>();
3535

@@ -91,7 +91,7 @@ public void trigger(String dataId, DataStreamFactory dataStreamFactory) {
9191

9292
@Override
9393
public String toString() {
94-
return DefaultLoaderListener.class.getName() + '{' +
94+
return URLConnectionLoaderListener.class.getName() + '{' +
9595
"listenersMap: " + listenersMap + '}';
9696
}
9797
}

‎moneta-core/src/main/java/org/javamoney/moneta/spi/loader/urlconnection/URLConnectionLoaderService.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public class URLConnectionLoaderService implements LoaderService {
5454
/**
5555
* The data resources managed by this instance.
5656
*/
57-
private final Map<String, LoadableResource> resources = new ConcurrentHashMap<>();
57+
private final Map<String, LoadableURLResource> resources = new ConcurrentHashMap<>();
5858
/**
5959
* The registered {@link LoaderListener} instances.
6060
*/
61-
private final DefaultLoaderListener listener = new DefaultLoaderListener();
61+
private final URLConnectionLoaderListener listener = new URLConnectionLoaderListener();
6262

6363
/**
6464
* The local resource cache, to allow keeping current data on the local
@@ -70,7 +70,7 @@ public class URLConnectionLoaderService implements LoaderService {
7070
*/
7171
private final ExecutorService executors = Executors.newCachedThreadPool(DaemonThreadFactory.INSTANCE);
7272

73-
private DefaultLoaderServiceFacade defaultLoaderServiceFacade;
73+
private URLConnectionLoaderServiceFacade defaultLoaderServiceFacade;
7474

7575
/**
7676
* The timer used for schedules.
@@ -96,7 +96,7 @@ void initialize() {
9696
}
9797
// (re)initialize
9898
LoaderConfigurator configurator = LoaderConfigurator.of(this);
99-
defaultLoaderServiceFacade = new DefaultLoaderServiceFacade(timer, listener, resources);
99+
defaultLoaderServiceFacade = new URLConnectionLoaderServiceFacade(timer, listener, resources);
100100
configurator.load();
101101
}
102102

@@ -108,10 +108,10 @@ void initialize() {
108108
private static ResourceCache loadResourceCache() {
109109
try {
110110
return Optional.ofNullable(Bootstrap.getService(ResourceCache.class)).orElseGet(
111-
DefaultResourceCache::new);
111+
URLConnectionResourceCache::new);
112112
} catch (Exception e) {
113113
LOG.log(Level.SEVERE, "Error loading ResourceCache instance.", e);
114-
return new DefaultResourceCache();
114+
return new URLConnectionResourceCache();
115115
}
116116
}
117117

@@ -130,7 +130,7 @@ static ResourceCache getResourceCache() {
130130
* @param resourceId the resource id.
131131
*/
132132
public void unload(String resourceId) {
133-
LoadableResource res = this.resources.get(resourceId);
133+
LoadableURLResource res = this.resources.get(resourceId);
134134
if (Objects.nonNull(res)) {
135135
res.unload();
136136
}
@@ -151,7 +151,7 @@ public void registerData(LoadDataInformation loadDataInformation) {
151151
throw new IllegalArgumentException("Resource : " + loadDataInformation.getResourceId() + " already registered.");
152152
}
153153

154-
LoadableResource resource = new LoadableResourceBuilder()
154+
LoadableURLResource resource = new LoadableResourceBuilder()
155155
.withCache(CACHE).withLoadDataInformation(loadDataInformation)
156156
.build();
157157
this.resources.put(loadDataInformation.getResourceId(), resource);
@@ -211,7 +211,7 @@ public void registerData(String resourceId, UpdatePolicy updatePolicy, Map<Strin
211211
.withResourceLocations(resourceLocations)
212212
.build();
213213

214-
LoadableResource resource = new LoadableResourceBuilder()
214+
LoadableURLResource resource = new LoadableResourceBuilder()
215215
.withCache(CACHE).withLoadDataInformation(loadInfo)
216216
.build();
217217
this.resources.put(loadInfo.getResourceId(), resource);
@@ -232,7 +232,7 @@ public void registerData(String resourceId, UpdatePolicy updatePolicy, Map<Strin
232232

233233
@Override
234234
public Map<String, String> getUpdateConfiguration(String resourceId) {
235-
LoadableResource load = this.resources.get(resourceId);
235+
LoadableURLResource load = this.resources.get(resourceId);
236236
if (Objects.nonNull(load)) {
237237
return load.getProperties();
238238
}
@@ -251,7 +251,7 @@ public Set<String> getResourceIds() {
251251

252252
@Override
253253
public InputStream getData(String resourceId) throws IOException {
254-
LoadableResource load = this.resources.get(resourceId);
254+
LoadableURLResource load = this.resources.get(resourceId);
255255
if (Objects.nonNull(load)) {
256256
return load.getDataStream();
257257
}
@@ -276,7 +276,7 @@ public boolean loadDataLocal(String resourceId) {
276276

277277
@Override
278278
public void resetData(String resourceId) throws IOException {
279-
LoadableResource load = Optional.ofNullable(this.resources.get(resourceId))
279+
LoadableURLResource load = Optional.ofNullable(this.resources.get(resourceId))
280280
.orElseThrow(() -> new IllegalArgumentException("No such resource: " + resourceId));
281281
if (load.resetToFallback()) {
282282
listener.trigger(resourceId, load);
@@ -319,7 +319,7 @@ public void removeLoaderListener(LoaderListener loadListener, String... resource
319319

320320
@Override
321321
public UpdatePolicy getUpdatePolicy(String resourceId) {
322-
LoadableResource load = Optional.of(this.resources.get(resourceId))
322+
LoadableURLResource load = Optional.of(this.resources.get(resourceId))
323323
.orElseThrow(() -> new IllegalArgumentException("No such resource: " + resourceId));
324324
return load.getUpdatePolicy();
325325
}

0 commit comments

Comments
 (0)