Skip to content

Commit bc5c1b3

Browse files
committed
nfs4: turn StateDisposeListener into DisposeListener
Motivation: We might need to have listeners for other object too, thus, reuse the interface. Acked-by: Paul Millar Target: master
1 parent e042266 commit bc5c1b3

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

core/src/main/java/org/dcache/nfs/v4/StateDisposeListener.java renamed to core/src/main/java/org/dcache/nfs/v4/DisposeListener.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009 - 2016 Deutsches Elektronen-Synchroton,
2+
* Copyright (c) 2009 - 2025 Deutsches Elektronen-Synchroton,
33
* Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
44
*
55
* This library is free software; you can redistribute it and/or modify
@@ -22,14 +22,14 @@
2222
import org.dcache.nfs.ChimeraNFSException;
2323

2424
/**
25-
* Should be implemented by an object that wants to receive state dispose notifications.
25+
* Should be implemented by an object that wants to receive dispose notifications.
2626
*/
27-
public interface StateDisposeListener {
27+
public interface DisposeListener<T> {
2828

2929
/**
30-
* Called when specified {@link NFS4State} is disposed.
31-
* @param state disposed state
30+
* Called when attached object is disposed.
31+
* @param attachement disposed object
3232
* @throws ChimeraNFSException on errors.
3333
*/
34-
void notifyDisposed(NFS4State state) throws ChimeraNFSException;
34+
void notifyDisposed(T attachement) throws ChimeraNFSException;
3535
}

core/src/main/java/org/dcache/nfs/v4/NFS4State.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
2+
* Copyright (c) 2009 - 2025 Deutsches Elektronen-Synchroton,
33
* Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
44
*
55
* This library is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ public class NFS4State {
6161
*/
6262
private final NFS4State _openState;
6363

64-
private final List<StateDisposeListener> _disposeListeners;
64+
private final List<DisposeListener<NFS4State>> _disposeListeners;
6565

6666
public NFS4State(StateOwner owner, stateid4 stateid) {
6767
this(null, owner, stateid);
@@ -95,9 +95,9 @@ public boolean isConfimed() {
9595
*/
9696
synchronized public final void tryDispose() throws ChimeraNFSException {
9797
if (!_disposed) {
98-
Iterator<StateDisposeListener> i = _disposeListeners.iterator();
98+
Iterator<DisposeListener<NFS4State>> i = _disposeListeners.iterator();
9999
while(i.hasNext()) {
100-
StateDisposeListener listener = i.next();
100+
DisposeListener listener = i.next();
101101
listener.notifyDisposed(this);
102102
i.remove();
103103
}
@@ -112,9 +112,9 @@ synchronized public final void tryDispose() throws ChimeraNFSException {
112112
*/
113113
synchronized public final void disposeIgnoreFailures() {
114114
if (!_disposed) {
115-
Iterator<StateDisposeListener> i = _disposeListeners.iterator();
115+
Iterator<DisposeListener<NFS4State>> i = _disposeListeners.iterator();
116116
while (i.hasNext()) {
117-
StateDisposeListener listener = i.next();
117+
DisposeListener<NFS4State> listener = i.next();
118118
try {
119119
listener.notifyDisposed(this);
120120
} catch (ChimeraNFSException e) {
@@ -142,7 +142,7 @@ public StateOwner getStateOwner() {
142142
return _owner;
143143
}
144144

145-
synchronized public void addDisposeListener(StateDisposeListener disposeListener) {
145+
synchronized public void addDisposeListener(DisposeListener<NFS4State> disposeListener) {
146146
_disposeListeners.add(disposeListener);
147147
}
148148

0 commit comments

Comments
 (0)