Ensure attributes set in transfer status response have set custom attributes.

dkocher · dkocher · commit 22bcad3e0cad · 2025-07-15T00:25:46.000+02:00
diff --git a/nextcloud/src/main/java/ch/cyberduck/core/nextcloud/NextcloudTimestampFeature.java b/nextcloud/src/main/java/ch/cyberduck/core/nextcloud/NextcloudTimestampFeature.java
@@ -15,31 +15,11 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Path;
 import ch.cyberduck.core.dav.DAVTimestampFeature;
-import ch.cyberduck.core.exception.BackgroundException;
-import ch.cyberduck.core.exception.NotfoundException;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import com.github.sardine.DavResource;
 
 public class NextcloudTimestampFeature extends DAVTimestampFeature {
 
-    private final NextcloudSession session;
-
     public NextcloudTimestampFeature(final NextcloudSession session) {
-        super(session);
-        this.session = session;
-    }
-
-    @Override
-    protected DavResource getResource(final Path file) throws BackgroundException, IOException {
-        final Optional<DavResource> optional = new NextcloudAttributesFinderFeature(session).list(file).stream().findFirst();
-        if(!optional.isPresent()) {
-            throw new NotfoundException(file.getAbsolute());
-        }
-        return optional.get();
+        super(session, new NextcloudAttributesFinderFeature(session));
     }
 }
diff --git a/owncloud/src/main/java/ch/cyberduck/core/owncloud/OwncloudTimestampFeature.java b/owncloud/src/main/java/ch/cyberduck/core/owncloud/OwncloudTimestampFeature.java
@@ -15,31 +15,11 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Path;
 import ch.cyberduck.core.dav.DAVTimestampFeature;
-import ch.cyberduck.core.exception.BackgroundException;
-import ch.cyberduck.core.exception.NotfoundException;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import com.github.sardine.DavResource;
 
 public class OwncloudTimestampFeature extends DAVTimestampFeature {
 
-    private final OwncloudSession session;
-
     public OwncloudTimestampFeature(final OwncloudSession session) {
-        super(session);
-        this.session = session;
-    }
-
-    @Override
-    protected DavResource getResource(final Path file) throws BackgroundException, IOException {
-        final Optional<DavResource> optional = new OwncloudAttributesFinderFeature(session).list(file).stream().findFirst();
-        if(!optional.isPresent()) {
-            throw new NotfoundException(file.getAbsolute());
-        }
-        return optional.get();
+        super(session, new OwncloudAttributesFinderFeature(session));
     }
 }
diff --git a/webdav/src/main/java/ch/cyberduck/core/dav/DAVTimestampFeature.java b/webdav/src/main/java/ch/cyberduck/core/dav/DAVTimestampFeature.java
@@ -44,6 +44,7 @@
 public class DAVTimestampFeature implements Timestamp {
 
     private final DAVSession session;
+    private final DAVAttributesFinderFeature attributes;
 
     public static final QName LAST_MODIFIED_DEFAULT_NAMESPACE =
             SardineUtil.createQNameWithDefaultNamespace("lastmodified");
@@ -62,7 +63,12 @@ public class DAVTimestampFeature implements Timestamp {
             SardineUtil.createQNameWithCustomNamespace("lastmodified_server");
 
     public DAVTimestampFeature(final DAVSession session) {
+        this(session, new DAVAttributesFinderFeature(session));
+    }
+
+    public DAVTimestampFeature(final DAVSession session, final DAVAttributesFinderFeature attributes) {
         this.session = session;
+        this.attributes = attributes;
     }
 
     @Override
@@ -73,7 +79,7 @@ public void setTimestamp(final Path file, final TransferStatus status) throws Ba
                 final DavResource resource = this.getResource(file);
                 session.getClient().patch(new DAVPathEncoder().encode(file), this.getCustomProperties(resource, status.getModified()), Collections.emptyList(),
                         this.getCustomHeaders(file, status));
-                status.setResponse(new DAVAttributesFinderFeature(session).toAttributes(resource).setModificationDate(
+                status.setResponse(attributes.toAttributes(resource).setModificationDate(
                         Timestamp.toSeconds(status.getModified())));
             }
         }
@@ -92,7 +98,7 @@ public void setTimestamp(final Path file, final TransferStatus status) throws Ba
      * @return Latest properties
      */
     protected DavResource getResource(final Path file) throws BackgroundException, IOException {
-        final Optional<DavResource> optional = new DAVAttributesFinderFeature(session).list(file).stream().findFirst();
+        final Optional<DavResource> optional = attributes.list(file).stream().findFirst();
         if(!optional.isPresent()) {
             throw new NotfoundException(file.getAbsolute());
         }
diff --git a/webdav/src/main/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeature.java b/webdav/src/main/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeature.java
@@ -15,19 +15,15 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Path;
 import ch.cyberduck.core.date.RFC1123DateFormatter;
 import ch.cyberduck.core.dav.DAVSession;
 import ch.cyberduck.core.dav.DAVTimestampFeature;
-import ch.cyberduck.core.exception.NotfoundException;
 
 import org.w3c.dom.Element;
 
 import javax.xml.namespace.QName;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.TimeZone;
 
 import com.github.sardine.DavResource;
@@ -41,20 +37,8 @@ public class MicrosoftIISDAVTimestampFeature extends DAVTimestampFeature {
 
     public static final QName LAST_MODIFIED_WIN32_CUSTOM_NAMESPACE = new QName(MS_NAMESPACE_URI, MS_NAMESPACE_LASTMODIFIED, MS_NAMESPACE_PREFIX);
 
-    private final DAVSession session;
-
     public MicrosoftIISDAVTimestampFeature(final DAVSession session) {
-        super(session);
-        this.session = session;
-    }
-
-    @Override
-    protected DavResource getResource(final Path file) throws NotfoundException, IOException {
-        final Optional<DavResource> optional = new MicrosoftIISDAVAttributesFinderFeature(session).list(file).stream().findFirst();
-        if(!optional.isPresent()) {
-            throw new NotfoundException(file.getAbsolute());
-        }
-        return optional.get();
+        super(session, new MicrosoftIISDAVAttributesFinderFeature(session));
     }
 
     protected List<Element> getCustomProperties(final DavResource resource, final Long modified) {
