From d9d30bebd9e6c0e5d2c85924aeec72c7ad0be5c3 Mon Sep 17 00:00:00 2001 From: IT Hit Date: Wed, 10 Mar 2021 19:24:26 +0200 Subject: [PATCH] 4.7.4603 --- Java/androidfsstorage/app/build.gradle | 6 +++--- .../samples/androidfsstorage/FileImpl.java | 4 ---- .../samples/androidfsstorage/FolderImpl.java | 12 ------------ .../androidfsstorage/HierarchyItemImpl.java | 14 -------------- .../androidfsstorage/WebDavEngine.java | 2 -- Java/deltav/pom.xml | 10 +++++----- Java/filesystemstorage/pom.xml | 8 ++++---- .../samples/fsstorageservlet/FileImpl.java | 16 ++++++++++++++-- Java/oraclestorage/pom.xml | 10 +++++----- Java/springbootfsstorage/pom.xml | 6 +++--- .../samples/springbootfs/impl/FileImpl.java | 19 +++++++++++++------ .../samples/springbootfs/impl/FolderImpl.java | 1 - .../springbootfs/impl/HierarchyItemImpl.java | 14 -------------- .../springbootfs/impl/WebDavEngine.java | 2 -- Java/springbootoraclestorage/pom.xml | 6 +++--- Kotlin/filesystemstorage/pom.xml | 10 +++++----- 16 files changed, 55 insertions(+), 85 deletions(-) diff --git a/Java/androidfsstorage/app/build.gradle b/Java/androidfsstorage/app/build.gradle index a03f724..80fd263 100644 --- a/Java/androidfsstorage/app/build.gradle +++ b/Java/androidfsstorage/app/build.gradle @@ -30,7 +30,7 @@ android { jarJar { rules = [ 'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1', - 'webdav-server-4.7.4551.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1' + 'webdav-server-4.7.4603.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1' ] } @@ -71,11 +71,11 @@ dependencies { implementation 'commons-io:commons-io:2.4' implementation 'com.google.code.gson:gson:2.7' implementation 'com.android.support:appcompat-v7:27.1.1' - implementation('com.ithit.webdav.integration:android-integration:4.7.4551', { + implementation('com.ithit.webdav.integration:android-integration:4.7.4603', { 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:4.7.4551' + jarJar 'com.ithit.webdav:webdav-server:4.7.4603' testImplementation 'junit:junit:4.12' } \ No newline at end of file diff --git a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FileImpl.java b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FileImpl.java index c689d81..bdf055f 100644 --- a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FileImpl.java +++ b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FileImpl.java @@ -197,7 +197,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 { java.io.File fullPath = FileUtils.getFile(this.getFullPath()); @@ -222,7 +221,6 @@ public void read(OutputStream out, long startIndex, long count) throws ServerExc IOUtils.closeQuietly(in); } } - // readFileImpl >>>> /** * Saves the content of the file from the specified stream to the File System repository. @@ -236,7 +234,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 { @@ -257,7 +254,6 @@ public long write(InputStream content, String contentType, long startIndex, long IOUtils.closeQuietly(fos); } } - // writeFileImpl >>>> private void incrementSerialNumber() { try { diff --git a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FolderImpl.java b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FolderImpl.java index 50dd404..bb79321 100644 --- a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FolderImpl.java +++ b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/FolderImpl.java @@ -83,7 +83,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(); @@ -99,7 +98,6 @@ public FileImpl createFile(String name) throws LockedException, ServerException } return null; } - // createFileImpl >>>> /** * Creates new {@link FolderImpl} folder with the specified name in this folder. @@ -108,7 +106,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 void createFolder(String name) throws LockedException, ServerException { @@ -119,7 +116,6 @@ public void createFolder(String name) throws LockedException, fullPath.mkdir(); } } - // createFolderImpl >>>> /** * Gets the array of this folder's children. @@ -131,7 +127,6 @@ public void createFolder(String name) throws LockedException, * @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 propNames, Long offset, Long nResults, List orderProps) throws ServerException { String decodedPath = HierarchyItemImpl.decodeAndConvertToPath(getPath()); @@ -148,9 +143,7 @@ public PageResults getChildren(List propNames, Long offset, Long nResu } return new PageResults(children, null); } - // getChildren >>>> - // <<<< deleteFolderImpl @Override public void delete() throws LockedException, MultistatusException, ServerException { @@ -161,9 +154,7 @@ public void delete() throws LockedException, MultistatusException, throw new ServerException(e); } } - // deleteFolderImpl >>>> - // <<<< copyToFolderImpl @Override public void copyTo(Folder folder, String destName, boolean deep) throws LockedException, MultistatusException, ServerException { @@ -185,7 +176,6 @@ public void copyTo(Folder folder, String destName, boolean deep) } setName(destName); } - // copyToFolderImpl >>>> /** * Check whether current folder is the parent to the destination. @@ -198,7 +188,6 @@ private boolean isRecursive(String destFolder) throws ServerException { return destFolder.startsWith(getPath().replace("/", java.io.File.separator)); } - // <<<< moveToFolderImpl @Override public void moveTo(Folder folder, String destName) throws LockedException, ConflictException, MultistatusException, ServerException { @@ -217,7 +206,6 @@ public void moveTo(Folder folder, String destName) throws LockedException, } setName(destName); } - // moveToFolderImpl >>>> /** * Returns free bytes available to current user. diff --git a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java index 805af05..ea46509 100644 --- a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java +++ b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java @@ -208,7 +208,6 @@ public String getPath() throws ServerException { * @return List of properties with values set. If property cannot be found it shall be omitted from the result. * @throws ServerException In case of an error. */ - // <<<< getPropertiesImpl @Override public List getProperties(Property[] props) throws ServerException { List l = getPropertyNames(); @@ -228,7 +227,6 @@ public List getProperties(Property[] props) throws ServerException { } return result; } - // getPropertiesImpl >>>> private List getProperties() throws ServerException { @@ -245,7 +243,6 @@ private List getProperties() throws ServerException { * @return List of all property names for this item. * @throws ServerException In case of an error. */ - // <<<< getPropertyNamesImpl @Override public List getPropertyNames() throws ServerException { if (ExtendedAttributesExtension.hasExtendedAttribute(getFullPath(), propertiesAttribute)) { @@ -254,7 +251,6 @@ public List getPropertyNames() throws ServerException { } return new LinkedList<>(); } - // getPropertyNamesImpl >>>> /** * Check whether client is the lock owner. @@ -299,7 +295,6 @@ private boolean clientHasToken() throws ServerException { * result of the operation for each property. * @throws ServerException In case of other error. */ - // <<<< updatePropertiesImpl @Override public void updateProperties(Property[] setProps, Property[] delProps) throws LockedException, MultistatusException, ServerException { @@ -345,7 +340,6 @@ public void updateProperties(Property[] setProps, Property[] delProps) } ExtendedAttributesExtension.setExtendedAttribute(getFullPath(), propertiesAttribute, SerializationUtils.serialize(propToLeft)); } - // updatePropertiesImpl >>>> /** * Updates basic file times in the following format - Thu, 28 Mar 2013 20:15:34 GMT. @@ -392,7 +386,6 @@ String getFullPath() { * @throws MultistatusException Errors have occurred during processing of the subtree. * @throws ServerException In case of an error. */ - // <<<< lockImpl @Override public LockResult lock(boolean shared, boolean deep, long timeout, String owner) throws LockedException, MultistatusException, ServerException { @@ -411,7 +404,6 @@ public LockResult lock(boolean shared, boolean deep, long timeout, String owner) ExtendedAttributesExtension.setExtendedAttribute(getFullPath(), activeLocksAttribute, SerializationUtils.serialize(activeLocks)); return new LockResult(token, timeout); } - // lockImpl >>>> /** * Checks whether {@link HierarchyItemImpl} has a lock and whether it is shared. @@ -431,7 +423,6 @@ private boolean hasLock(boolean skipShared) throws ServerException { * @return Array of locks. * @throws ServerException In case of an error. */ - // <<<< getActiveLocksImpl @Override public List getActiveLocks() throws ServerException { if (activeLocks == null) { @@ -448,7 +439,6 @@ public List getActiveLocks() throws ServerException { } return activeLocks; } - // getActiveLocksImpl >>>> /** * Removes lock with the specified token from this item. @@ -457,7 +447,6 @@ public List getActiveLocks() throws ServerException { * @throws PreconditionFailedException Included lock token was not enforceable on this item. * @throws ServerException In case of an error. */ - // <<<< unlockImpl @Override public void unlock(String lockToken) throws PreconditionFailedException, ServerException { @@ -480,7 +469,6 @@ public void unlock(String lockToken) throws PreconditionFailedException, throw new PreconditionFailedException(); } } - // unlockImpl >>>> /** * Updates lock timeout information on this item. @@ -491,7 +479,6 @@ public void unlock(String lockToken) throws PreconditionFailedException, * @throws PreconditionFailedException Included lock token was not enforceable on this item. * @throws ServerException In case of an error. */ - // <<<< refreshLockImpl @Override public RefreshLockResult refreshLock(String token, long timeout) throws PreconditionFailedException, ServerException { @@ -517,6 +504,5 @@ public RefreshLockResult refreshLock(String token, long timeout) return new RefreshLockResult(lockInfo.isShared(), lockInfo.isDeep(), timeout, lockInfo.getOwner()); } - // refreshLockImpl >>>> } diff --git a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/WebDavEngine.java b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/WebDavEngine.java index e787574..9af6b8c 100644 --- a/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/WebDavEngine.java +++ b/Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/WebDavEngine.java @@ -33,7 +33,6 @@ public class WebDavEngine extends Engine { * @return Instance of corresponding {@link HierarchyItem} or null if item is not found. * @throws ServerException in case if cannot read file attributes. */ - // <<<< getHierarchyItemEngine @Override public HierarchyItem getHierarchyItem(String contextPath) throws ServerException { int i = contextPath.indexOf("?"); @@ -52,7 +51,6 @@ public HierarchyItem getHierarchyItem(String contextPath) throws ServerException getLogger().logDebug("Could not find item that corresponds to path: " + contextPath); return null; // no hierarchy item that corresponds to path parameter was found in the repository } - // getHierarchyItemEngine >>>> /** * Returns logger that will be used by engine. diff --git a/Java/deltav/pom.xml b/Java/deltav/pom.xml index 3e9c3d5..899540b 100644 --- a/Java/deltav/pom.xml +++ b/Java/deltav/pom.xml @@ -6,7 +6,7 @@ com.ithit.webdav.samples deltav - 4.7.4551 + 4.7.4603 war @@ -23,7 +23,7 @@ com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 commons-dbcp @@ -125,7 +125,7 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 @@ -165,7 +165,7 @@ copy-resources - ${project.build.directory}/deltav-4.7.4551/META-INF + ${project.build.directory}/deltav-4.7.4603/META-INF true @@ -244,7 +244,7 @@ filesystem 11021 / - target/deltav-4.7.4551 + target/deltav-4.7.4603 diff --git a/Java/filesystemstorage/pom.xml b/Java/filesystemstorage/pom.xml index 6db40aa..ae76153 100644 --- a/Java/filesystemstorage/pom.xml +++ b/Java/filesystemstorage/pom.xml @@ -6,7 +6,7 @@ com.ithit.webdav.samples filesystemstorage - 4.7.4551 + 4.7.4603 war @@ -34,7 +34,7 @@ com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 commons-io @@ -142,7 +142,7 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 net.java.dev.jna @@ -228,7 +228,7 @@ filesystem 11021 / - target/filesystemstorage-4.7.4551 + target/filesystemstorage-4.7.4603 diff --git a/Java/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/FileImpl.java b/Java/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/FileImpl.java index 8301618..fdf6274 100644 --- a/Java/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/FileImpl.java +++ b/Java/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/FileImpl.java @@ -8,7 +8,6 @@ import com.ithit.webdav.server.exceptions.ServerException; import com.ithit.webdav.server.resumableupload.ResumableUpload; import com.ithit.webdav.server.resumableupload.UploadProgress; -import com.sun.nio.file.ExtendedOpenOption; import java.io.IOException; import java.io.InputStream; @@ -51,7 +50,20 @@ private FileImpl(String name, String path, long created, long modified, WebDavEn this.allowedOpenFileOptions = (systemName.contains("mac") || systemName.contains("linux")) ? (new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ}) : (new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ, - ExtendedOpenOption.NOSHARE_DELETE}); + noShareDeleteOption()}); + } + + /** + * Load ExtendedOpenOption with reflection without direct reference - because most of Linux/MacOS jdks don't have it and not required. + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + private OpenOption noShareDeleteOption() { + try { + Class enumClass = Class.forName("com.sun.nio.file.ExtendedOpenOption"); + return (OpenOption) Enum.valueOf(enumClass, "NOSHARE_DELETE"); + } catch (ClassNotFoundException e) { + return StandardOpenOption.READ; + } } /** diff --git a/Java/oraclestorage/pom.xml b/Java/oraclestorage/pom.xml index 54a54e1..b616e22 100644 --- a/Java/oraclestorage/pom.xml +++ b/Java/oraclestorage/pom.xml @@ -6,7 +6,7 @@ com.ithit.webdav.samples oraclestorage - 4.7.4551 + 4.7.4603 war @@ -23,7 +23,7 @@ com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 commons-dbcp @@ -125,7 +125,7 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 @@ -165,7 +165,7 @@ copy-resources - ${project.build.directory}/oraclestorage-4.7.4551/META-INF + ${project.build.directory}/oraclestorage-4.7.4603/META-INF true @@ -244,7 +244,7 @@ filesystem 11021 / - target/oraclestorage-4.7.4551 + target/oraclestorage-4.7.4603 diff --git a/Java/springbootfsstorage/pom.xml b/Java/springbootfsstorage/pom.xml index 886e8d6..6d4470c 100644 --- a/Java/springbootfsstorage/pom.xml +++ b/Java/springbootfsstorage/pom.xml @@ -9,7 +9,7 @@ com.ithit.webdav.samples springbootfsstorage - 4.7.4551 + 4.7.4603 springbootfsstorage Demo project for Spring Boot @@ -52,12 +52,12 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 diff --git a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FileImpl.java b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FileImpl.java index 286838b..a95f46c 100644 --- a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FileImpl.java +++ b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FileImpl.java @@ -8,7 +8,6 @@ import com.ithit.webdav.server.exceptions.ServerException; import com.ithit.webdav.server.resumableupload.ResumableUpload; import com.ithit.webdav.server.resumableupload.UploadProgress; -import com.sun.nio.file.ExtendedOpenOption; import java.io.IOException; import java.io.InputStream; @@ -51,9 +50,21 @@ private FileImpl(String name, String path, long created, long modified, WebDavEn this.allowedOpenFileOptions = (systemName.contains("mac") || systemName.contains("linux")) ? (new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ}) : (new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ, - ExtendedOpenOption.NOSHARE_DELETE}); + noShareDeleteOption()}); } + /** + * Load ExtendedOpenOption with reflection without direct reference - because most of Linux/MacOS jdks don't have it and not required. + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + private OpenOption noShareDeleteOption() { + try { + Class enumClass = Class.forName("com.sun.nio.file.ExtendedOpenOption"); + return (OpenOption) Enum.valueOf(enumClass, "NOSHARE_DELETE"); + } catch (ClassNotFoundException e) { + return StandardOpenOption.READ; + } + } /** * Returns file that corresponds to path. * @@ -216,7 +227,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(); @@ -237,7 +247,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. @@ -251,7 +260,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 { @@ -289,7 +297,6 @@ public long write(InputStream content, String contentType, long startIndex, long getEngine().getWebSocketServer().notifyRefresh(getParent(getPath())); return totalWrittenBytes; } - // writeFileImpl >>>> private void incrementSerialNumber() { try { diff --git a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FolderImpl.java b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FolderImpl.java index e536595..6ba5f1c 100644 --- a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FolderImpl.java +++ b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/FolderImpl.java @@ -313,7 +313,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 propNames, Long offset, Long nResults) { List results = new LinkedList<>(); diff --git a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/HierarchyItemImpl.java b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/HierarchyItemImpl.java index d3c7432..46e506b 100644 --- a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/HierarchyItemImpl.java +++ b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/HierarchyItemImpl.java @@ -213,7 +213,6 @@ public String getPath() throws ServerException { * @return List of properties with values set. If property cannot be found it shall be omitted from the result. * @throws ServerException In case of an error. */ - // <<<< getPropertiesImpl @Override public List getProperties(Property[] props) throws ServerException { List l = getPropertyNames(); @@ -229,7 +228,6 @@ public List getProperties(Property[] props) throws ServerException { } return result; } - // getPropertiesImpl >>>> private List getProperties() throws ServerException { @@ -246,7 +244,6 @@ private List getProperties() throws ServerException { * @return List of all property names for this item. * @throws ServerException In case of an error. */ - // <<<< getPropertyNamesImpl @Override public List getPropertyNames() throws ServerException { if (ExtendedAttributesExtension.hasExtendedAttribute(getFullPath().toString(), propertiesAttribute)) { @@ -255,7 +252,6 @@ public List getPropertyNames() throws ServerException { } return new LinkedList<>(); } - // getPropertyNamesImpl >>>> /** * Check whether client is the lock owner. @@ -292,7 +288,6 @@ private boolean clientHasToken() throws ServerException { * @throws LockedException this item was locked and client did not provide lock token. * @throws ServerException In case of other error. */ - // <<<< updatePropertiesImpl @Override public void updateProperties(Property[] setProps, Property[] delProps) throws LockedException, ServerException { @@ -327,7 +322,6 @@ public void updateProperties(Property[] setProps, Property[] delProps) ExtendedAttributesExtension.setExtendedAttribute(getFullPath().toString(), propertiesAttribute, SerializationUtils.serialize(properties)); getEngine().getWebSocketServer().notifyRefresh(getParent(getPath())); } - // updatePropertiesImpl >>>> /** * Updates basic file times in the following format - Thu, 28 Mar 2013 20:15:34 GMT. @@ -393,7 +387,6 @@ Path getFullPath() { * @throws LockedException The item is locked, so the method has been rejected. * @throws ServerException In case of an error. */ - // <<<< lockImpl @Override public LockResult lock(boolean shared, boolean deep, long timeout, String owner) throws LockedException, ServerException { @@ -413,7 +406,6 @@ public LockResult lock(boolean shared, boolean deep, long timeout, String owner) getEngine().getWebSocketServer().notifyRefresh(getParent(getPath())); return new LockResult(token, timeout); } - // lockImpl >>>> /** * Checks whether {@link HierarchyItemImpl} has a lock and whether it is shared. @@ -433,7 +425,6 @@ private boolean hasLock(boolean skipShared) throws ServerException { * @return Array of locks. * @throws ServerException In case of an error. */ - // <<<< getActiveLocksImpl @Override public List getActiveLocks() throws ServerException { if (activeLocks == null) { @@ -445,7 +436,6 @@ public List getActiveLocks() throws ServerException { } return activeLocks; } - // getActiveLocksImpl >>>> /** * Removes lock with the specified token from this item. @@ -454,7 +444,6 @@ public List getActiveLocks() throws ServerException { * @throws PreconditionFailedException Included lock token was not enforceable on this item. * @throws ServerException In case of an error. */ - // <<<< unlockImpl @Override public void unlock(String lockToken) throws PreconditionFailedException, ServerException { @@ -472,7 +461,6 @@ public void unlock(String lockToken) throws PreconditionFailedException, throw new PreconditionFailedException(); } } - // unlockImpl >>>> /** * Updates lock timeout information on this item. @@ -483,7 +471,6 @@ public void unlock(String lockToken) throws PreconditionFailedException, * @throws PreconditionFailedException Included lock token was not enforceable on this item. * @throws ServerException In case of an error. */ - // <<<< refreshLockImpl @Override public RefreshLockResult refreshLock(String token, long timeout) throws PreconditionFailedException, ServerException { @@ -504,7 +491,6 @@ public RefreshLockResult refreshLock(String token, long timeout) return new RefreshLockResult(lockInfo.isShared(), lockInfo.isDeep(), timeout, lockInfo.getOwner()); } - // refreshLockImpl >>>> String getParent(String path) { String parentPath = StringUtil.trimEnd(StringUtil.trimStart(path, "/"), "/"); diff --git a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/WebDavEngine.java b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/WebDavEngine.java index 7014bcb..592248e 100644 --- a/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/WebDavEngine.java +++ b/Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/WebDavEngine.java @@ -42,7 +42,6 @@ public WebDavEngine(String license, String dataFolder, boolean showExceptions) { * @return Instance of corresponding {@link HierarchyItem} or null if item is not found. * @throws ServerException in case if cannot read file attributes. */ - // <<<< getHierarchyItemEngine @Override public HierarchyItem getHierarchyItem(String contextPath) throws ServerException { int i = contextPath.indexOf("?"); @@ -61,7 +60,6 @@ public HierarchyItem getHierarchyItem(String contextPath) throws ServerException getLogger().logDebug("Could not find item that corresponds to path: " + contextPath); return null; // no hierarchy item that corresponds to path parameter was found in the repository } - // getHierarchyItemEngine >>>> /** * Returns logger that will be used by engine. diff --git a/Java/springbootoraclestorage/pom.xml b/Java/springbootoraclestorage/pom.xml index d138558..a6db556 100644 --- a/Java/springbootoraclestorage/pom.xml +++ b/Java/springbootoraclestorage/pom.xml @@ -9,7 +9,7 @@ com.ithit.webdav.samples springbootoraclestorage - 4.7.4551 + 4.7.4603 springbootoraclestorage Demo project for Spring Boot @@ -53,12 +53,12 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 diff --git a/Kotlin/filesystemstorage/pom.xml b/Kotlin/filesystemstorage/pom.xml index 544d6bc..831ccae 100644 --- a/Kotlin/filesystemstorage/pom.xml +++ b/Kotlin/filesystemstorage/pom.xml @@ -6,7 +6,7 @@ com.ithit.webdav.samples kotlinfs - 4.7.4551 + 4.7.4603 war @@ -34,7 +34,7 @@ com.ithit.webdav.integration servlet-integration - 4.7.4551 + 4.7.4603 commons-io @@ -142,7 +142,7 @@ com.ithit.webdav webdav-server - 4.7.4551 + 4.7.4603 net.java.dev.jna @@ -170,7 +170,7 @@ - C:\Java\Release\WebdavJavaRepo\DeltaV\samples\kotlinfs/src/main/kotlin + D:\myproj\Java\ithit\webdav-server-for-java\DeltaV\samples\kotlinfs/src/main/kotlin org.apache.maven.plugins @@ -240,7 +240,7 @@ filesystem 11021 / - target/kotlinfs-4.7.4551 + target/kotlinfs-4.7.4603