Skip to content

Commit 5dbeb4f

Browse files
keilwkeilw
committed
Fixing #353 
1 parent 27bc952 commit 5dbeb4f

23 files changed

Lines changed: 118 additions & 119 deletions

‎moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBAbstractRateProvider.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.javamoney.moneta.spi.DefaultNumberValue;
2121
import org.javamoney.moneta.spi.loader.LoadDataInformation;
2222
import org.javamoney.moneta.spi.loader.LoaderService;
23-
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
2423
import org.xml.sax.InputSource;
2524

2625
import javax.money.CurrencyUnit;
@@ -56,7 +55,7 @@
5655
* @author Werner Keil
5756
*/
5857
abstract class ECBAbstractRateProvider extends AbstractRateProvider implements
59-
LoaderListener {
58+
LoaderService.Listener {
6059

6160
private static final Logger LOG = Logger.getLogger(ECBAbstractRateProvider.class.getName());
6261

‎moneta-convert/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFAbstractRateProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
import org.javamoney.moneta.convert.ExchangeRateBuilder;
4848
import org.javamoney.moneta.convert.imf.IMFRateReadingHandler.RateIMFResult;
4949
import org.javamoney.moneta.spi.AbstractRateProvider;
50-
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
50+
import org.javamoney.moneta.spi.loader.LoaderService.Listener;
5151

52-
abstract class IMFAbstractRateProvider extends AbstractRateProvider implements LoaderListener {
52+
abstract class IMFAbstractRateProvider extends AbstractRateProvider implements Listener {
5353

5454
private static final Logger LOG = Logger.getLogger(IMFAbstractRateProvider.class.getName());
5555

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2015, Credit Suisse (Anatole Tresch), Werner Keil and others by the @author tag.
2+
Copyright (c) 2012, 2024, 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
@@ -20,7 +20,7 @@
2020
import java.util.Map;
2121
import java.util.Objects;
2222

23-
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
23+
import org.javamoney.moneta.spi.loader.LoaderService.Listener;
2424
import org.javamoney.moneta.spi.loader.LoaderService.UpdatePolicy;
2525

2626
/**
@@ -36,7 +36,7 @@ public class LoadDataInformation {
3636

3737
private final Map<String, String> properties;
3838

39-
private final LoaderListener loaderListener;
39+
private final Listener listener;
4040

4141
private final URI backupResource;
4242

@@ -45,12 +45,12 @@ public class LoadDataInformation {
4545
private final boolean startRemote;
4646

4747
LoadDataInformation(String resourceId, UpdatePolicy updatePolicy,
48-
Map<String, String> properties, LoaderListener loaderListener,
48+
Map<String, String> properties, LoaderService.Listener listener,
4949
URI backupResource, URI[] resourceLocations, boolean startRemote) {
5050
this.resourceId = resourceId;
5151
this.updatePolicy = updatePolicy;
5252
this.properties = properties;
53-
this.loaderListener = loaderListener;
53+
this.listener = listener;
5454
this.backupResource = backupResource;
5555
this.resourceLocations = resourceLocations;
5656
this.startRemote = startRemote;
@@ -68,8 +68,8 @@ public Map<String, String> getProperties() {
6868
return properties;
6969
}
7070

71-
public LoaderListener getLoaderListener() {
72-
return loaderListener;
71+
public LoaderService.Listener getLoaderListener() {
72+
return listener;
7373
}
7474

7575
public URI getBackupResource() {
@@ -107,7 +107,7 @@ public String toString() {
107107
" resourceId: " + resourceId + ',' +
108108
" updatePolicy: " + updatePolicy + ',' +
109109
" properties: " + properties + ',' +
110-
" LoaderListener: " + loaderListener + ',' +
110+
" Listener: " + listener + ',' +
111111
" backupResource: " + backupResource + ',' +
112112
" resourceLocations: " + Arrays.toString(resourceLocations) + '}';
113113
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2012, 2015, Credit Suisse (Anatole Tresch), Werner Keil and others by the @author tag.
2+
Copyright (c) 2012, 2024, 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
@@ -19,7 +19,7 @@
1919
import java.util.Map;
2020
import java.util.Objects;
2121

22-
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
22+
import org.javamoney.moneta.spi.loader.LoaderService.Listener;
2323
import org.javamoney.moneta.spi.loader.LoaderService.UpdatePolicy;
2424

2525
/**
@@ -36,8 +36,8 @@ public class LoadDataInformationBuilder {
3636
private UpdatePolicy updatePolicy;
3737

3838
private Map<String, String> properties;
39-
/** An (optional) LoaderListener to be registered. */
40-
private LoaderListener loaderListener;
39+
/** An (optional) Listener to be registered. */
40+
private Listener listener;
4141
/**
4242
* The backup resource location in the classpath, not
4343
* {@code null}.
@@ -64,8 +64,8 @@ public LoadDataInformationBuilder withProperties(Map<String, String> properties)
6464
return this;
6565
}
6666

67-
public LoadDataInformationBuilder withLoaderListener(LoaderListener loaderListener) {
68-
this.loaderListener = loaderListener;
67+
public LoadDataInformationBuilder withLoaderListener(Listener listener) {
68+
this.listener = listener;
6969
return this;
7070
}
7171

@@ -98,7 +98,7 @@ else if (Objects.isNull(resourceLocations)) {
9898
throw new IllegalStateException("The properties should be informed");
9999
}
100100
return new LoadDataInformation(resourceId, updatePolicy, properties,
101-
loaderListener, backupResource, resourceLocations, startRemote);
101+
listener, backupResource, resourceLocations, startRemote);
102102
}
103103

104104

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/ConnectionLoaderListener.java renamed to moneta-core/src/main/java/org/javamoney/moneta/spi/loader/LoaderListener.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2015, Credit Suisse (Anatole Tresch), Werner Keil and others by the @author tag.
2+
* Copyright (c) 2012, 2024, 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
@@ -24,26 +24,26 @@
2424
import java.util.logging.Level;
2525
import java.util.logging.Logger;
2626

27-
import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
27+
import org.javamoney.moneta.spi.loader.LoaderService.Listener;
2828

29-
public class ConnectionLoaderListener { // TODO rename to LoaderListener
29+
public class LoaderListener {
3030

31-
private static final Logger LOG = Logger.getLogger(ConnectionLoaderListener.class.getName());
31+
private static final Logger LOG = Logger.getLogger(LoaderListener.class.getName());
3232

33-
private final Map<String, List<LoaderListener>> listenersMap = new ConcurrentHashMap<>();
33+
private final Map<String, List<Listener>> listenersMap = new ConcurrentHashMap<>();
3434

3535
/**
36-
* Evaluate the {@link LoaderListener} instances, listening fo a dataId
36+
* Evaluate the {@link Listener} instances, listening fo a dataId
3737
* given.
3838
*
3939
* @param dataId The dataId, not null
4040
* @return the according listeners
4141
*/
42-
public List<LoaderListener> getListeners(String dataId) {
42+
public List<Listener> getListeners(String dataId) {
4343
if (Objects.isNull(dataId)) {
4444
dataId = "";
4545
}
46-
List<LoaderListener> listeners = this.listenersMap.get(dataId);
46+
List<Listener> listeners = this.listenersMap.get(dataId);
4747
if (Objects.isNull(listeners)) {
4848
synchronized (listenersMap) {
4949
listeners = this.listenersMap.get(dataId);
@@ -64,9 +64,9 @@ public List<LoaderListener> getListeners(String dataId) {
6464
*/
6565
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
6666
public void trigger(String dataId, DataStreamFactory dataStreamFactory) {
67-
List<LoaderListener> listeners = getListeners("");
67+
List<Listener> listeners = getListeners("");
6868
synchronized (listeners) {
69-
for (LoaderListener ll : listeners) {
69+
for (Listener ll : listeners) {
7070
try {
7171
ll.newDataLoaded(dataId, dataStreamFactory.getDataStream());
7272
} catch (Exception e) {
@@ -77,7 +77,7 @@ public void trigger(String dataId, DataStreamFactory dataStreamFactory) {
7777
if (!(Objects.isNull(dataId) || dataId.isEmpty())) {
7878
listeners = getListeners(dataId);
7979
synchronized (listeners) {
80-
for (LoaderListener ll : listeners) {
80+
for (Listener ll : listeners) {
8181
try {
8282
ll.newDataLoaded(dataId, dataStreamFactory.getDataStream());
8383
} catch (Exception e) {
@@ -90,7 +90,7 @@ public void trigger(String dataId, DataStreamFactory dataStreamFactory) {
9090

9191
@Override
9292
public String toString() {
93-
return ConnectionLoaderListener.class.getName() + '{' +
93+
return LoaderListener.class.getName() + '{' +
9494
"listenersMap: " + listenersMap + '}';
9595
}
9696
}

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

Lines changed: 13 additions & 12 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, 2024, 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
@@ -35,6 +35,7 @@
3535
* JSR's API.
3636
*
3737
* @author Anatole Tresch
38+
* @author Werner Keil
3839
*/
3940
public interface LoaderService {
4041

@@ -77,7 +78,7 @@ enum UpdatePolicy {
7778
* @see #resetData(String)
7879
* @see #loadData(String)
7980
*/
80-
interface LoaderListener { // TODO rename to Listener
81+
interface Listener {
8182
/**
8283
* Callback called from the {@link LoaderService}, when new data was
8384
* read for a given data item.
@@ -98,7 +99,7 @@ interface LoaderListener { // TODO rename to Listener
9899
*resourceLocations The remote resource locations, not {@code null}.
99100
*backupResource The backup resource location in the classpath, not
100101
* {@code null}.
101-
*loaderListener An (optional) LoaderListener to be registered.
102+
*loaderListener An (optional) Listener to be registered.
102103
*/
103104
void registerData(LoadDataInformation loadDataInformation);
104105

@@ -112,19 +113,19 @@ interface LoaderListener { // TODO rename to Listener
112113
* resourceLocations The remote resource locations, not {@code null}.
113114
* backupResource The backup resource location in the classpath, not
114115
* {@code null}.
115-
* loaderListener An (optional) LoaderListener to be registered.
116+
* loaderListener An (optional) Listener to be registered.
116117
*/
117118
void registerAndLoadData(LoadDataInformation loadDataInformation);
118119

119120
@Deprecated
120121
void registerAndLoadData(String resourceId, UpdatePolicy updatePolicy,
121-
Map<String, String> properties, LoaderListener loaderListener,
122+
Map<String, String> properties, Listener listener,
122123
URI backupResource,
123124
URI... resourceLocations);
124125

125126
@Deprecated
126127
void registerData(String resourceId, UpdatePolicy updatePolicy,
127-
Map<String, String> properties, LoaderListener loaderListener,
128+
Map<String, String> properties, Listener listener,
128129
URI backupResource,
129130
URI... resourceLocations);
130131

@@ -147,26 +148,26 @@ void registerData(String resourceId, UpdatePolicy updatePolicy,
147148
Map<String, String> getUpdateConfiguration(String resourceId);
148149

149150
/**
150-
* Add a {@link LoaderListener} callback that is informed when a data
151+
* Add a {@link Listener} callback that is informed when a data
151152
* resource was update from remote, or resetToFallback. Passing an empty String or
152153
* {@code null} sa {@code dataId} allows to register a listener for all data
153154
* resources registered. {@link #loadData(String)}
154155
* {@link #resetData(String)}
155156
*
156157
* @param resourceIds The unique identifiers of the resource, not {@code null}.
157158
* @param l The listener to be added
158-
* @see #removeLoaderListener(LoaderListener, String...)
159+
* @see #removeLoaderListener(Listener, String...)
159160
*/
160-
void addLoaderListener(LoaderListener l, String... resourceIds);
161+
void addLoaderListener(Listener l, String... resourceIds);
161162

162163
/**
163-
* Remove a registered {@link LoaderListener} callback.
164+
* Remove a registered {@link Listener} callback.
164165
*
165166
* @param resourceIds The unique identifier of the resource, not {@code null}.
166167
* @param l The listener to be removed
167-
* @see #addLoaderListener(LoaderListener, String...)
168+
* @see #addLoaderListener(Listener, String...)
168169
*/
169-
void removeLoaderListener(LoaderListener l, String... resourceIds);
170+
void removeLoaderListener(Listener l, String... resourceIds);
170171

171172
/**
172173
* Allows to check if a data resource with the given dataId is registered.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.javamoney.moneta.spi.loader.okhttp;
1717

18-
import org.javamoney.moneta.spi.loader.ConnectionLoaderListener;
18+
import org.javamoney.moneta.spi.loader.LoaderListener;
1919

2020
import java.util.Map;
2121
import java.util.Objects;
@@ -26,9 +26,9 @@ class HttpLoadDataService {
2626

2727
private static final Logger LOG = Logger.getLogger(HttpLoadDataService.class.getName());
2828

29-
private final ConnectionLoaderListener listener;
29+
private final LoaderListener listener;
3030

31-
HttpLoadDataService(ConnectionLoaderListener listener) {
31+
HttpLoadDataService(LoaderListener listener) {
3232
this.listener = listener;
3333
}
3434

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.javamoney.moneta.spi.loader.okhttp;
1717

18-
import org.javamoney.moneta.spi.loader.ConnectionLoaderListener;
18+
import org.javamoney.moneta.spi.loader.LoaderListener;
1919

2020
import java.util.Map;
2121
import java.util.Objects;
@@ -28,11 +28,11 @@ class HttpLoadLocalDataService {
2828

2929
private final Map<String, LoadableHttpResource> resources;
3030

31-
private final ConnectionLoaderListener listener;
31+
private final LoaderListener listener;
3232

3333

3434
HttpLoadLocalDataService(Map<String, LoadableHttpResource> resources,
35-
ConnectionLoaderListener listener) {
35+
LoaderListener listener) {
3636
this.resources = resources;
3737
this.listener = listener;
3838
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.javamoney.moneta.spi.loader.okhttp;
1717

18-
import org.javamoney.moneta.spi.loader.ConnectionLoaderListener;
18+
import org.javamoney.moneta.spi.loader.LoaderListener;
1919
import org.javamoney.moneta.spi.loader.DataStreamFactory;
2020

2121
import java.util.Map;
@@ -27,9 +27,9 @@ class HttpLoadRemoteDataService {
2727

2828
private static final Logger LOG = Logger.getLogger(HttpLoadRemoteDataService.class.getName());
2929

30-
private final ConnectionLoaderListener listener;
30+
private final LoaderListener listener;
3131

32-
HttpLoadRemoteDataService(ConnectionLoaderListener listener) {
32+
HttpLoadRemoteDataService(LoaderListener listener) {
3333
this.listener = listener;
3434
}
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* To create this instance use: {@link LoadableHttpResourceBuilder}
4343
* @author Werner Keil
4444
*/
45-
public class LoadableHttpResource implements DataStreamFactory {
45+
class LoadableHttpResource implements DataStreamFactory {
4646

4747
/**
4848
* The logger used.

0 commit comments

Comments
 (0)