7.2.10553

ITHit · Sep 4, 2024 · 6c911f1 · 6c911f1
1 parent fa944b9
commit 6c911f1
Show file tree

Hide file tree

Showing 48 changed files with 467 additions and 175 deletions.
diff --git a/Java/android/androidfsstorage/app/build.gradle b/Java/android/androidfsstorage/app/build.gradle
@@ -34,7 +34,7 @@ android {
 jarJar {
     rules = [
             'stax-api-1.0.1.jar'        : 'javax.xml.** com.ithit.webdav.xml.@1',
-            'webdav-server-7.2.10512.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-7.2.10553.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
     ]
 }
 
@@ -75,11 +75,11 @@ dependencies {
     implementation 'commons-io:commons-io:2.7'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation('com.ithit.webdav.integration:android-integration:7.2.10512', {
+    implementation('com.ithit.webdav.integration:android-integration:7.2.10553', {
         exclude group: 'org.nanohttpd', module: 'nanohttpd'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     jarJar 'stax:stax-api:1.0.1'
-    jarJar 'com.ithit.webdav:webdav-server:7.2.10512'
+    jarJar 'com.ithit.webdav:webdav-server:7.2.10553'
     testImplementation 'junit:junit:4.12'
 }
diff --git a/Java/jakarta/collectionsync/pom.xml b/Java/jakarta/collectionsync/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>collectionsync-jakarta</artifactId>
-    <version>7.2.10512</version>
+    <version>7.2.10553</version>
     <packaging>war</packaging>
 
     <properties>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>jakarta-integration</artifactId>
-            <version>7.2.10512</version>
+            <version>7.2.10553</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>7.2.10512</version>
+            <version>7.2.10553</version>
         </dependency>
     </dependencies>
 
@@ -132,7 +132,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/collectionsync-jakarta-7.2.10512</warSourceDirectory>
+                    <warSourceDirectory>target/collectionsync-jakarta-7.2.10553</warSourceDirectory>
                 </configuration>
             </plugin>
 			<plugin>

diff --git a/...akarta/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FileImpl.java b/...akarta/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FileImpl.java
@@ -221,7 +221,6 @@ public String getEtag() throws ServerException {
      * @param count      Number of bytes to be written to the output stream.
      * @throws ServerException In case of an error.
      */
-    // <<<< readFileImpl
     @Override
     public void read(OutputStream out, long startIndex, long count) throws ServerException {
         Path fullPath = this.getFullPath();
@@ -242,7 +241,6 @@ public void read(OutputStream out, long startIndex, long count) throws ServerExc
             throw new ServerException(x);
         }
     }
-    // readFileImpl >>>>
 
     /**
      * Saves the content of the file from the specified stream to the File System repository.
@@ -256,7 +254,6 @@ public void read(OutputStream out, long startIndex, long count) throws ServerExc
      * @throws ServerException In case of an error.
      * @throws IOException     I/O error.
      */
-    // <<<< writeFileImpl
     @Override
     public long write(InputStream content, String contentType, long startIndex, long totalFileLength)
             throws LockedException, ServerException, IOException {
@@ -295,7 +292,6 @@ public long write(InputStream content, String contentType, long startIndex, long
         getEngine().getWebSocketServer().notifyUpdated(getPath(), getWebSocketID());
         return totalWrittenBytes;
     }
-    // writeFileImpl >>>>
 
     private void incrementSerialNumber() {
         try {
@@ -413,6 +409,8 @@ public void moveTo(Folder folder, String destName) throws LockedException,
         if (ExtendedAttributesExtension.hasExtendedAttribute(newPath.toString(), activeLocksAttribute)) {
             ExtendedAttributesExtension.deleteExtendedAttribute(newPath.toString(), activeLocksAttribute);
         }
+        this.newPath = newPath;
+        incrementMetadataEtag();
         try {
             String currentPath = folder.getPath() + encode(destName);
             getEngine().getWebSocketServer().notifyMoved(getPath(), currentPath, getWebSocketID());

diff --git a/...arta/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FolderImpl.java b/...arta/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FolderImpl.java
@@ -97,7 +97,6 @@ private static String fixPath(String path) {
      * @throws LockedException This folder was locked. Client did not provide the lock token.
      * @throws ServerException In case of an error.
      */
-    // <<<< createFileImpl
     @Override
     public FileImpl createFile(String name) throws LockedException, ServerException {
         ensureHasToken();
@@ -115,7 +114,6 @@ public FileImpl createFile(String name) throws LockedException, ServerException
         }
         return null;
     }
-    // createFileImpl >>>>
 
     /**
      * Creates new {@link FolderImpl} folder with the specified name in this folder.
@@ -125,7 +123,6 @@ public FileImpl createFile(String name) throws LockedException, ServerException
      * @throws LockedException This folder was locked. Client did not provide the lock token.
      * @throws ServerException In case of an error.
      */
-    // <<<< createFolderImpl
     @Override
     public Folder createFolder(String name) throws LockedException,
             ServerException {
@@ -147,7 +144,6 @@ private void createFolderInternal(String name) throws LockedException,
             }
         }
     }
-    // createFolderImpl >>>>
 
     private Path deleteIfHidden(String name) throws ServerException {
         Path fullPath = Paths.get(this.getFullPath().toString(), name);
@@ -171,7 +167,6 @@ private Path deleteIfHidden(String name) throws ServerException {
      * @return Instance of {@link PageResults} class that contains items on a requested page and total number of items in a folder.
      * @throws ServerException In case of an error.
      */
-    // <<<< getChildren
     @Override
     public PageResults getChildren(List<Property> propNames, Long offset, Long nResults, List<OrderProperty> orderProps) throws ServerException {
         String decodedPath = HierarchyItemImpl.decodeAndConvertToPath(getPath());
@@ -197,9 +192,7 @@ public PageResults getChildren(List<Property> propNames, Long offset, Long nResu
         }
         return new PageResults(children, total);
     }
-    // getChildren >>>>
 
-    // <<<< deleteFolderImpl
     @Override
     public void delete() throws LockedException, MultistatusException,
             ServerException {
@@ -214,9 +207,7 @@ public void delete() throws LockedException, MultistatusException,
         }
         getEngine().getWebSocketServer().notifyDeleted(getPath(), getWebSocketID());
     }
-    // deleteFolderImpl >>>>
 
-    // <<<< copyToFolderImpl
     @Override
     public void copyTo(Folder folder, String destName, boolean deep)
             throws LockedException, MultistatusException, ServerException {
@@ -241,7 +232,6 @@ public void copyTo(Folder folder, String destName, boolean deep)
         setName(destName);
         getEngine().getWebSocketServer().notifyCreated(folder.getPath() + encode(destName), getWebSocketID());
     }
-    // copyToFolderImpl >>>>
 
     /**
      * Check whether current folder is the parent to the destination.
@@ -316,7 +306,6 @@ private String getExtension(String name) {
 
     }
 
-    // <<<< moveToFolderImpl
     @Override
     public void moveTo(Folder folder, String destName) throws LockedException,
             ConflictException, MultistatusException, ServerException {
@@ -329,15 +318,17 @@ public void moveTo(Folder folder, String destName) throws LockedException,
         Path destinationFullPath = Paths.get(destinationFolder, destName);
         try {
             removeIndex(getFullPath(), this);
-            Files.move(sourcePath, destinationFullPath, StandardCopyOption.REPLACE_EXISTING);
+            Files.deleteIfExists(destinationFullPath);
+            Files.move(sourcePath, destinationFullPath);
             addIndex(destinationFullPath, folder.getPath() + destName, destName);
         } catch (IOException e) {
             throw new ServerException(e);
         }
         setName(destName);
+        this.newPath = destinationFullPath;
+        incrementMetadataEtag();
         getEngine().getWebSocketServer().notifyMoved(getPath(), folder.getPath() + encode(destName), getWebSocketID());
     }
-    // moveToFolderImpl >>>>
 
     /**
      * Returns list of items that correspond to search request.
@@ -349,7 +340,6 @@ public void moveTo(Folder folder, String destName) throws LockedException,
      * @param nResults The number of items to return.
      * @return Instance of {@link PageResults} class that contains items on a requested page and total number of items in search results.
      */
-    // <<<< searchImpl
     @Override
     public PageResults search(String searchString, SearchOptions options, List<Property> propNames, Long offset, Long nResults) {
         List<HierarchyItem> results = new LinkedList<>();
@@ -380,7 +370,6 @@ public PageResults search(String searchString, SearchOptions options, List<Prope
         }
         return new PageResults((offset != null && nResults != null) ? results.stream().skip(offset).limit(nResults).collect(Collectors.toList()) : results, (long) results.size());
     }
-    // searchImpl >>>>
 
     /**
      * Returns free bytes available to current user.