Skip to content

Commit a957861

Browse files
committed
core: Opaque: remove deprecated methods
This make Opaque completely immutable. Related: #149 Signed-off-by: Christian Kohlschütter <[email protected]>
1 parent 52f8de7 commit a957861

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

core/src/main/java/org/dcache/nfs/util/Opaque.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,10 @@ public static Opaque forBytes(byte[] bytes) {
3939
return new Opaque(bytes.clone());
4040
}
4141

42-
@Deprecated(forRemoval = true)
43-
public Opaque(byte[] opaque) {
42+
private Opaque(byte[] opaque) {
4443
_opaque = opaque;
4544
}
4645

47-
@Deprecated(forRemoval = true)
48-
public byte[] getOpaque() {
49-
return _opaque;
50-
}
51-
5246
public byte[] asBytes() {
5347
return _opaque.clone();
5448
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ void removeOpen(Inode inode, stateid4 stateid) {
565565
public Map<Inode, Collection<NFS4Client>> getOpenFiles() {
566566
return files.entrySet().stream()
567567
.collect(Collectors.toMap(
568-
e -> Inode.forFile(e.getKey().getOpaque()),
568+
e -> Inode.forFile(e.getKey().asBytes()),
569569
e -> e.getValue().stream().map(OpenState::getClient).collect(Collectors.toSet())));
570570
}
571571

@@ -578,7 +578,7 @@ public Map<Inode, Collection<NFS4Client>> getOpenFiles() {
578578
public Map<Inode, Collection<NFS4Client>> getDelegations() {
579579
return delegations.entrySet().stream()
580580
.collect(Collectors.toMap(
581-
e -> Inode.forFile(e.getKey().getOpaque()),
581+
e -> Inode.forFile(e.getKey().asBytes()),
582582
e -> e.getValue().stream().map(DelegationState::client).collect(Collectors.toSet())));
583583
}
584584
}

0 commit comments

Comments
 (0)