From 4b011d500ad83c6134b75e9725c868738e2ef751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rickard=20N=C3=A4rstr=C3=B6m?= Date: Tue, 14 Mar 2023 15:47:26 +0100 Subject: [PATCH 01/15] Upgrade to Jakarta EE 10 / Jakarta XML Bind 4.0 --- pom.xml | 8 +- src/main/java/com/github/sardine/DavAce.java | 7 +- src/main/java/com/github/sardine/DavAcl.java | 6 +- .../java/com/github/sardine/DavPrincipal.java | 4 +- .../java/com/github/sardine/DavQuota.java | 4 +- .../java/com/github/sardine/DavResource.java | 32 +++-- src/main/java/com/github/sardine/Sardine.java | 10 +- .../com/github/sardine/SardineFactory.java | 4 +- .../com/github/sardine/ant/SardineTask.java | 12 +- .../com/github/sardine/impl/SardineImpl.java | 132 +++++++++--------- .../sardine/impl/SardineRedirectStrategy.java | 5 +- .../impl/handler/ETagResponseHandler.java | 4 +- .../impl/handler/HeadersResponseHandler.java | 6 +- .../impl/handler/LockResponseHandler.java | 11 +- .../handler/MultiStatusResponseHandler.java | 11 +- .../handler/ValidatingResponseHandler.java | 3 +- .../impl/handler/VoidResponseHandler.java | 4 +- .../sardine/impl/io/ConsumingInputStream.java | 6 +- .../impl/io/ContentLengthInputStream.java | 4 +- .../impl/io/HttpMethodReleaseInputStream.java | 8 +- .../github/sardine/impl/methods/HttpAcl.java | 4 +- .../github/sardine/impl/methods/HttpCopy.java | 4 +- .../github/sardine/impl/methods/HttpLock.java | 3 +- .../github/sardine/impl/methods/HttpMove.java | 4 +- .../sardine/impl/methods/HttpPropFind.java | 4 +- .../sardine/impl/methods/HttpReport.java | 4 +- .../java/com/github/sardine/model/Ace.java | 10 +- .../java/com/github/sardine/model/Acl.java | 9 +- .../com/github/sardine/model/Activelock.java | 10 +- .../java/com/github/sardine/model/All.java | 8 +- .../com/github/sardine/model/Allprop.java | 8 +- .../github/sardine/model/Authenticated.java | 8 +- .../java/com/github/sardine/model/Bind.java | 8 +- .../com/github/sardine/model/Collection.java | 8 +- .../github/sardine/model/Creationdate.java | 11 +- .../java/com/github/sardine/model/Deny.java | 13 +- .../com/github/sardine/model/Displayname.java | 11 +- .../java/com/github/sardine/model/Error.java | 10 +- .../com/github/sardine/model/Exclusive.java | 8 +- .../sardine/model/Getcontentlanguage.java | 11 +- .../sardine/model/Getcontentlength.java | 11 +- .../github/sardine/model/Getcontenttype.java | 11 +- .../com/github/sardine/model/Getetag.java | 11 +- .../github/sardine/model/Getlastmodified.java | 11 +- .../java/com/github/sardine/model/Grant.java | 13 +- .../java/com/github/sardine/model/Group.java | 13 +- .../com/github/sardine/model/Inherited.java | 8 +- .../com/github/sardine/model/Keepalive.java | 15 +- .../java/com/github/sardine/model/Limit.java | 11 +- .../java/com/github/sardine/model/Link.java | 11 +- .../com/github/sardine/model/Location.java | 10 +- .../github/sardine/model/Lockdiscovery.java | 9 +- .../com/github/sardine/model/Lockentry.java | 10 +- .../com/github/sardine/model/Lockinfo.java | 10 +- .../com/github/sardine/model/Lockscope.java | 8 +- .../com/github/sardine/model/Locktoken.java | 11 +- .../com/github/sardine/model/Locktype.java | 10 +- .../com/github/sardine/model/Multistatus.java | 13 +- .../github/sardine/model/ObjectFactory.java | 10 +- .../java/com/github/sardine/model/Omit.java | 8 +- .../java/com/github/sardine/model/Owner.java | 13 +- .../com/github/sardine/model/Principal.java | 8 +- .../sardine/model/PrincipalCollectionSet.java | 9 +- .../github/sardine/model/PrincipalURL.java | 8 +- .../com/github/sardine/model/Privilege.java | 13 +- .../java/com/github/sardine/model/Prop.java | 16 ++- .../com/github/sardine/model/Property.java | 10 +- .../sardine/model/Propertybehavior.java | 8 +- .../github/sardine/model/Propertyupdate.java | 13 +- .../com/github/sardine/model/Propfind.java | 8 +- .../com/github/sardine/model/Propname.java | 8 +- .../com/github/sardine/model/Propstat.java | 10 +- .../com/github/sardine/model/Protected.java | 8 +- .../sardine/model/QuotaAvailableBytes.java | 11 +- .../github/sardine/model/QuotaUsedBytes.java | 11 +- .../java/com/github/sardine/model/Read.java | 8 +- .../com/github/sardine/model/ReadAcl.java | 8 +- .../model/ReadCurrentUserPrivilegeSet.java | 8 +- .../java/com/github/sardine/model/Remove.java | 10 +- .../java/com/github/sardine/model/Report.java | 10 +- .../github/sardine/model/Resourcetype.java | 15 +- .../com/github/sardine/model/Response.java | 11 +- .../github/sardine/model/SearchRequest.java | 11 +- .../java/com/github/sardine/model/Self.java | 8 +- .../java/com/github/sardine/model/Set.java | 10 +- .../java/com/github/sardine/model/Shared.java | 8 +- .../java/com/github/sardine/model/Source.java | 9 +- .../github/sardine/model/SupportedReport.java | 10 +- .../sardine/model/SupportedReportSet.java | 11 +- .../github/sardine/model/Supportedlock.java | 9 +- .../github/sardine/model/SyncCollection.java | 12 +- .../java/com/github/sardine/model/UnBind.java | 8 +- .../github/sardine/model/Unauthenticated.java | 8 +- .../java/com/github/sardine/model/Unlock.java | 8 +- .../java/com/github/sardine/model/Write.java | 8 +- .../github/sardine/model/WriteContent.java | 8 +- .../github/sardine/model/WriteProperties.java | 8 +- .../github/sardine/model/package-info.java | 2 +- .../github/sardine/report/SardineReport.java | 4 +- .../sardine/report/SyncCollectionReport.java | 20 +-- .../com/github/sardine/util/SardineUtil.java | 43 +++--- .../github/sardine/AuthenticationTest.java | 20 +-- .../com/github/sardine/DavResourceTest.java | 9 +- .../github/sardine/FunctionalSardineTest.java | 46 +++--- .../java/com/github/sardine/LockTest.java | 14 +- .../com/github/sardine/ProppatchTest.java | 18 ++- .../com/github/sardine/SardineUtilTest.java | 2 +- .../sardine/impl/SardineExceptionTest.java | 4 +- .../MultiStatusResponseHandlerTest.java | 21 ++- .../impl/io/ByteCountInputStreamTest.java | 4 +- 110 files changed, 652 insertions(+), 566 deletions(-) diff --git a/pom.xml b/pom.xml index 75cbfd5e..00dd09f6 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,13 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.2 + 4.0.0 + + + org.glassfish.jaxb + jaxb-runtime + 4.0.2 + runtime diff --git a/src/main/java/com/github/sardine/DavAce.java b/src/main/java/com/github/sardine/DavAce.java index d9d5f7bf..ecaefc28 100644 --- a/src/main/java/com/github/sardine/DavAce.java +++ b/src/main/java/com/github/sardine/DavAce.java @@ -1,5 +1,8 @@ package com.github.sardine; +import java.util.ArrayList; +import java.util.List; + import com.github.sardine.model.Ace; import com.github.sardine.model.All; import com.github.sardine.model.Authenticated; @@ -22,9 +25,7 @@ import com.github.sardine.model.WriteProperties; import com.github.sardine.util.SardineUtil; -import javax.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; +import jakarta.xml.bind.annotation.XmlRootElement; /** * An Access control element (ACE) either grants or denies a particular set of (non- diff --git a/src/main/java/com/github/sardine/DavAcl.java b/src/main/java/com/github/sardine/DavAcl.java index f214995c..afacfc9f 100644 --- a/src/main/java/com/github/sardine/DavAcl.java +++ b/src/main/java/com/github/sardine/DavAcl.java @@ -1,5 +1,8 @@ package com.github.sardine; +import java.util.ArrayList; +import java.util.List; + import com.github.sardine.model.Ace; import com.github.sardine.model.Acl; import com.github.sardine.model.Group; @@ -7,9 +10,6 @@ import com.github.sardine.model.Propstat; import com.github.sardine.model.Response; -import java.util.ArrayList; -import java.util.List; - /** * Describe access rights on a remote server. An access control list (ACL) * is a list of access control elements that define access diff --git a/src/main/java/com/github/sardine/DavPrincipal.java b/src/main/java/com/github/sardine/DavPrincipal.java index fb1cd8d7..f4cfb884 100644 --- a/src/main/java/com/github/sardine/DavPrincipal.java +++ b/src/main/java/com/github/sardine/DavPrincipal.java @@ -1,9 +1,9 @@ package com.github.sardine; -import com.github.sardine.model.Principal; - import javax.xml.namespace.QName; +import com.github.sardine.model.Principal; + public class DavPrincipal { public static final String KEY_SELF = "self"; diff --git a/src/main/java/com/github/sardine/DavQuota.java b/src/main/java/com/github/sardine/DavQuota.java index d769c313..c6e09761 100644 --- a/src/main/java/com/github/sardine/DavQuota.java +++ b/src/main/java/com/github/sardine/DavQuota.java @@ -1,11 +1,11 @@ package com.github.sardine; +import java.util.List; + import com.github.sardine.model.Prop; import com.github.sardine.model.Propstat; import com.github.sardine.model.Response; -import java.util.List; - /** * Quota and Size Properties * diff --git a/src/main/java/com/github/sardine/DavResource.java b/src/main/java/com/github/sardine/DavResource.java index 4552103b..248579ca 100644 --- a/src/main/java/com/github/sardine/DavResource.java +++ b/src/main/java/com/github/sardine/DavResource.java @@ -7,6 +7,23 @@ package com.github.sardine; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; + +import org.apache.http.HttpStatus; +import org.apache.http.ParseException; +import org.apache.http.message.BasicLineParser; +import org.w3c.dom.Element; + import com.github.sardine.model.Creationdate; import com.github.sardine.model.Displayname; import com.github.sardine.model.Getcontentlanguage; @@ -21,21 +38,6 @@ import com.github.sardine.model.SupportedReport; import com.github.sardine.model.SupportedReportSet; import com.github.sardine.util.SardineUtil; -import org.apache.http.HttpStatus; -import org.apache.http.ParseException; -import org.apache.http.message.BasicLineParser; -import org.w3c.dom.Element; - -import javax.xml.namespace.QName; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; /** * Describes a resource on a remote server. This could be a directory or an actual file. diff --git a/src/main/java/com/github/sardine/Sardine.java b/src/main/java/com/github/sardine/Sardine.java index 50faa84d..7506576b 100644 --- a/src/main/java/com/github/sardine/Sardine.java +++ b/src/main/java/com/github/sardine/Sardine.java @@ -1,9 +1,5 @@ package com.github.sardine; -import com.github.sardine.report.SardineReport; -import org.w3c.dom.Element; - -import javax.xml.namespace.QName; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -12,6 +8,12 @@ import java.util.Map; import java.util.Set; +import javax.xml.namespace.QName; + +import org.w3c.dom.Element; + +import com.github.sardine.report.SardineReport; + /** * The main interface for Sardine operations. * diff --git a/src/main/java/com/github/sardine/SardineFactory.java b/src/main/java/com/github/sardine/SardineFactory.java index b9984c75..1e3de83f 100644 --- a/src/main/java/com/github/sardine/SardineFactory.java +++ b/src/main/java/com/github/sardine/SardineFactory.java @@ -1,9 +1,9 @@ package com.github.sardine; -import com.github.sardine.impl.SardineImpl; - import java.net.ProxySelector; +import com.github.sardine.impl.SardineImpl; + /** * The perfect name for a class. Provides the static methods for working with the Sardine interface. * diff --git a/src/main/java/com/github/sardine/ant/SardineTask.java b/src/main/java/com/github/sardine/ant/SardineTask.java index 3929d3c4..fb3b578d 100644 --- a/src/main/java/com/github/sardine/ant/SardineTask.java +++ b/src/main/java/com/github/sardine/ant/SardineTask.java @@ -1,18 +1,20 @@ package com.github.sardine.ant; +import java.util.ArrayList; +import java.util.List; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + import com.github.sardine.Sardine; import com.github.sardine.SardineFactory; import com.github.sardine.ant.command.Copy; import com.github.sardine.ant.command.CreateDirectory; import com.github.sardine.ant.command.Delete; import com.github.sardine.ant.command.Exists; -import com.github.sardine.ant.command.RecursiveGet; import com.github.sardine.ant.command.Move; import com.github.sardine.ant.command.Put; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import java.util.ArrayList; -import java.util.List; +import com.github.sardine.ant.command.RecursiveGet; /** * Controller for the Sardine ant Task diff --git a/src/main/java/com/github/sardine/impl/SardineImpl.java b/src/main/java/com/github/sardine/impl/SardineImpl.java index ab41496e..8fedf091 100644 --- a/src/main/java/com/github/sardine/impl/SardineImpl.java +++ b/src/main/java/com/github/sardine/impl/SardineImpl.java @@ -16,57 +16,22 @@ package com.github.sardine.impl; -import com.github.sardine.DavAce; -import com.github.sardine.DavAcl; -import com.github.sardine.DavPrincipal; -import com.github.sardine.DavQuota; -import com.github.sardine.DavResource; -import com.github.sardine.Sardine; -import com.github.sardine.Version; -import com.github.sardine.impl.handler.ExistsResponseHandler; -import com.github.sardine.impl.handler.LockResponseHandler; -import com.github.sardine.impl.handler.MultiStatusResponseHandler; -import com.github.sardine.impl.handler.VoidResponseHandler; -import com.github.sardine.impl.io.ContentLengthInputStream; -import com.github.sardine.impl.io.HttpMethodReleaseInputStream; -import com.github.sardine.impl.methods.HttpAcl; -import com.github.sardine.impl.methods.HttpCopy; -import com.github.sardine.impl.methods.HttpLock; -import com.github.sardine.impl.methods.HttpMkCol; -import com.github.sardine.impl.methods.HttpMove; -import com.github.sardine.impl.methods.HttpPropFind; -import com.github.sardine.impl.methods.HttpPropPatch; -import com.github.sardine.impl.methods.HttpReport; -import com.github.sardine.impl.methods.HttpSearch; -import com.github.sardine.impl.methods.HttpUnlock; -import com.github.sardine.model.Ace; -import com.github.sardine.model.Acl; -import com.github.sardine.model.Allprop; -import com.github.sardine.model.Displayname; -import com.github.sardine.model.Exclusive; -import com.github.sardine.model.Group; -import com.github.sardine.model.Lockinfo; -import com.github.sardine.model.Lockscope; -import com.github.sardine.model.Locktype; -import com.github.sardine.model.Multistatus; -import com.github.sardine.model.ObjectFactory; -import com.github.sardine.model.Owner; -import com.github.sardine.model.PrincipalCollectionSet; -import com.github.sardine.model.PrincipalURL; -import com.github.sardine.model.Prop; -import com.github.sardine.model.Propertyupdate; -import com.github.sardine.model.Propfind; -import com.github.sardine.model.Propstat; -import com.github.sardine.model.QuotaAvailableBytes; -import com.github.sardine.model.QuotaUsedBytes; -import com.github.sardine.model.Remove; -import com.github.sardine.model.Resourcetype; -import com.github.sardine.model.Response; -import com.github.sardine.model.SearchRequest; -import com.github.sardine.model.Set; -import com.github.sardine.model.Write; -import com.github.sardine.report.SardineReport; -import com.github.sardine.util.SardineUtil; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.ProxySelector; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; + import org.apache.http.Consts; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -124,20 +89,57 @@ import org.apache.http.util.VersionInfo; import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.ProxySelector; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.logging.Logger; +import com.github.sardine.DavAce; +import com.github.sardine.DavAcl; +import com.github.sardine.DavPrincipal; +import com.github.sardine.DavQuota; +import com.github.sardine.DavResource; +import com.github.sardine.Sardine; +import com.github.sardine.Version; +import com.github.sardine.impl.handler.ExistsResponseHandler; +import com.github.sardine.impl.handler.LockResponseHandler; +import com.github.sardine.impl.handler.MultiStatusResponseHandler; +import com.github.sardine.impl.handler.VoidResponseHandler; +import com.github.sardine.impl.io.ContentLengthInputStream; +import com.github.sardine.impl.io.HttpMethodReleaseInputStream; +import com.github.sardine.impl.methods.HttpAcl; +import com.github.sardine.impl.methods.HttpCopy; +import com.github.sardine.impl.methods.HttpLock; +import com.github.sardine.impl.methods.HttpMkCol; +import com.github.sardine.impl.methods.HttpMove; +import com.github.sardine.impl.methods.HttpPropFind; +import com.github.sardine.impl.methods.HttpPropPatch; +import com.github.sardine.impl.methods.HttpReport; +import com.github.sardine.impl.methods.HttpSearch; +import com.github.sardine.impl.methods.HttpUnlock; +import com.github.sardine.model.Ace; +import com.github.sardine.model.Acl; +import com.github.sardine.model.Allprop; +import com.github.sardine.model.Displayname; +import com.github.sardine.model.Exclusive; +import com.github.sardine.model.Group; +import com.github.sardine.model.Lockinfo; +import com.github.sardine.model.Lockscope; +import com.github.sardine.model.Locktype; +import com.github.sardine.model.Multistatus; +import com.github.sardine.model.ObjectFactory; +import com.github.sardine.model.Owner; +import com.github.sardine.model.PrincipalCollectionSet; +import com.github.sardine.model.PrincipalURL; +import com.github.sardine.model.Prop; +import com.github.sardine.model.Propertyupdate; +import com.github.sardine.model.Propfind; +import com.github.sardine.model.Propstat; +import com.github.sardine.model.QuotaAvailableBytes; +import com.github.sardine.model.QuotaUsedBytes; +import com.github.sardine.model.Remove; +import com.github.sardine.model.Resourcetype; +import com.github.sardine.model.Response; +import com.github.sardine.model.SearchRequest; +import com.github.sardine.model.Set; +import com.github.sardine.model.Write; +import com.github.sardine.report.SardineReport; +import com.github.sardine.util.SardineUtil; /** * Implementation of the Sardine interface. This is where the meat of the Sardine library lives. diff --git a/src/main/java/com/github/sardine/impl/SardineRedirectStrategy.java b/src/main/java/com/github/sardine/impl/SardineRedirectStrategy.java index 817cdb01..023b6220 100644 --- a/src/main/java/com/github/sardine/impl/SardineRedirectStrategy.java +++ b/src/main/java/com/github/sardine/impl/SardineRedirectStrategy.java @@ -16,8 +16,6 @@ package com.github.sardine.impl; -import com.github.sardine.impl.methods.HttpPropFind; -import com.github.sardine.impl.methods.HttpReport; import org.apache.http.Header; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpRequest; @@ -28,6 +26,9 @@ import org.apache.http.impl.client.DefaultRedirectStrategy; import org.apache.http.protocol.HttpContext; +import com.github.sardine.impl.methods.HttpPropFind; +import com.github.sardine.impl.methods.HttpReport; + public class SardineRedirectStrategy extends DefaultRedirectStrategy { @Override diff --git a/src/main/java/com/github/sardine/impl/handler/ETagResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/ETagResponseHandler.java index 331c2dd0..5c1d89f6 100644 --- a/src/main/java/com/github/sardine/impl/handler/ETagResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/ETagResponseHandler.java @@ -16,11 +16,11 @@ package com.github.sardine.impl.handler; +import java.io.IOException; + import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; -import java.io.IOException; - public class ETagResponseHandler extends ValidatingResponseHandler { @Override public String handleResponse(HttpResponse response) throws IOException { diff --git a/src/main/java/com/github/sardine/impl/handler/HeadersResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/HeadersResponseHandler.java index 9264efd7..13a841e0 100644 --- a/src/main/java/com/github/sardine/impl/handler/HeadersResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/HeadersResponseHandler.java @@ -16,13 +16,13 @@ package com.github.sardine.impl.handler; -import org.apache.http.Header; -import org.apache.http.HttpResponse; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.http.Header; +import org.apache.http.HttpResponse; + public class HeadersResponseHandler extends ValidatingResponseHandler> { @Override public Map handleResponse(HttpResponse response) throws IOException { diff --git a/src/main/java/com/github/sardine/impl/handler/LockResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/LockResponseHandler.java index 9548046a..e55f3587 100644 --- a/src/main/java/com/github/sardine/impl/handler/LockResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/LockResponseHandler.java @@ -16,15 +16,16 @@ package com.github.sardine.impl.handler; -import com.github.sardine.impl.SardineException; -import com.github.sardine.model.Prop; -import com.github.sardine.util.SardineUtil; +import java.io.IOException; +import java.io.InputStream; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.StatusLine; -import java.io.IOException; -import java.io.InputStream; +import com.github.sardine.impl.SardineException; +import com.github.sardine.model.Prop; +import com.github.sardine.util.SardineUtil; /** */ diff --git a/src/main/java/com/github/sardine/impl/handler/MultiStatusResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/MultiStatusResponseHandler.java index ea576207..87eefac5 100644 --- a/src/main/java/com/github/sardine/impl/handler/MultiStatusResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/MultiStatusResponseHandler.java @@ -16,15 +16,16 @@ package com.github.sardine.impl.handler; -import com.github.sardine.impl.SardineException; -import com.github.sardine.model.Multistatus; -import com.github.sardine.util.SardineUtil; +import java.io.IOException; +import java.io.InputStream; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.StatusLine; -import java.io.IOException; -import java.io.InputStream; +import com.github.sardine.impl.SardineException; +import com.github.sardine.model.Multistatus; +import com.github.sardine.util.SardineUtil; /** * {@link org.apache.http.client.ResponseHandler} which returns the {@link Multistatus} response of diff --git a/src/main/java/com/github/sardine/impl/handler/ValidatingResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/ValidatingResponseHandler.java index e0d2e132..b1b53660 100644 --- a/src/main/java/com/github/sardine/impl/handler/ValidatingResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/ValidatingResponseHandler.java @@ -16,12 +16,13 @@ package com.github.sardine.impl.handler; -import com.github.sardine.impl.SardineException; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.StatusLine; import org.apache.http.client.ResponseHandler; +import com.github.sardine.impl.SardineException; + /** * Basic response handler which takes an url for documentation. * diff --git a/src/main/java/com/github/sardine/impl/handler/VoidResponseHandler.java b/src/main/java/com/github/sardine/impl/handler/VoidResponseHandler.java index 5df0b224..9e262fab 100644 --- a/src/main/java/com/github/sardine/impl/handler/VoidResponseHandler.java +++ b/src/main/java/com/github/sardine/impl/handler/VoidResponseHandler.java @@ -16,10 +16,10 @@ package com.github.sardine.impl.handler; -import org.apache.http.HttpResponse; - import java.io.IOException; +import org.apache.http.HttpResponse; + /** * {@link org.apache.http.client.ResponseHandler} which just executes the request and checks the answer is * in the valid range of {@link ValidatingResponseHandler#validateResponse(org.apache.http.HttpResponse)}. diff --git a/src/main/java/com/github/sardine/impl/io/ConsumingInputStream.java b/src/main/java/com/github/sardine/impl/io/ConsumingInputStream.java index b2bcb9ef..e7d154aa 100644 --- a/src/main/java/com/github/sardine/impl/io/ConsumingInputStream.java +++ b/src/main/java/com/github/sardine/impl/io/ConsumingInputStream.java @@ -17,13 +17,13 @@ package com.github.sardine.impl.io; +import java.io.FilterInputStream; +import java.io.IOException; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; -import java.io.FilterInputStream; -import java.io.IOException; - /** * Wrapper for the input stream, will consume the rest of the response on {@link ConsumingInputStream#close()}. */ diff --git a/src/main/java/com/github/sardine/impl/io/ContentLengthInputStream.java b/src/main/java/com/github/sardine/impl/io/ContentLengthInputStream.java index 592fb4bf..acd680c2 100644 --- a/src/main/java/com/github/sardine/impl/io/ContentLengthInputStream.java +++ b/src/main/java/com/github/sardine/impl/io/ContentLengthInputStream.java @@ -16,12 +16,12 @@ package com.github.sardine.impl.io; -import org.apache.http.HttpResponse; - import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; +import org.apache.http.HttpResponse; + public class ContentLengthInputStream extends FilterInputStream { diff --git a/src/main/java/com/github/sardine/impl/io/HttpMethodReleaseInputStream.java b/src/main/java/com/github/sardine/impl/io/HttpMethodReleaseInputStream.java index 4120e232..9c594d76 100644 --- a/src/main/java/com/github/sardine/impl/io/HttpMethodReleaseInputStream.java +++ b/src/main/java/com/github/sardine/impl/io/HttpMethodReleaseInputStream.java @@ -16,14 +16,14 @@ package com.github.sardine.impl.io; -import org.apache.http.HttpConnection; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.http.HttpConnection; +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.CloseableHttpResponse; + public class HttpMethodReleaseInputStream extends ByteCountInputStream { private static final Logger log = Logger.getLogger(HttpMethodReleaseInputStream.class.getName()); diff --git a/src/main/java/com/github/sardine/impl/methods/HttpAcl.java b/src/main/java/com/github/sardine/impl/methods/HttpAcl.java index 5532855a..2cf9addf 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpAcl.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpAcl.java @@ -16,11 +16,11 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import java.net.URI; - /** * Simple class for making WebDAV ACL requests. */ diff --git a/src/main/java/com/github/sardine/impl/methods/HttpCopy.java b/src/main/java/com/github/sardine/impl/methods/HttpCopy.java index 19a16684..00e43c03 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpCopy.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpCopy.java @@ -16,11 +16,11 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpRequestBase; -import java.net.URI; - /** * Simple class for making WebDAV COPY requests. Assumes Overwrite = T. * diff --git a/src/main/java/com/github/sardine/impl/methods/HttpLock.java b/src/main/java/com/github/sardine/impl/methods/HttpLock.java index adca4b76..8677b22a 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpLock.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpLock.java @@ -16,9 +16,10 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import java.net.URI; /** */ diff --git a/src/main/java/com/github/sardine/impl/methods/HttpMove.java b/src/main/java/com/github/sardine/impl/methods/HttpMove.java index de239133..f8a7ca9f 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpMove.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpMove.java @@ -16,11 +16,11 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpRequestBase; -import java.net.URI; - /** * Simple class for making WebDAV MOVE requests. * diff --git a/src/main/java/com/github/sardine/impl/methods/HttpPropFind.java b/src/main/java/com/github/sardine/impl/methods/HttpPropFind.java index b41579dc..536296af 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpPropFind.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpPropFind.java @@ -16,11 +16,11 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import java.net.URI; - /** * Simple class for making WebDAV PROPFIND requests. * diff --git a/src/main/java/com/github/sardine/impl/methods/HttpReport.java b/src/main/java/com/github/sardine/impl/methods/HttpReport.java index 65e3bf7c..22f2b9c0 100644 --- a/src/main/java/com/github/sardine/impl/methods/HttpReport.java +++ b/src/main/java/com/github/sardine/impl/methods/HttpReport.java @@ -1,10 +1,10 @@ package com.github.sardine.impl.methods; +import java.net.URI; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import java.net.URI; - public class HttpReport extends HttpEntityEnclosingRequestBase { public static final String METHOD_NAME = "REPORT"; diff --git a/src/main/java/com/github/sardine/model/Ace.java b/src/main/java/com/github/sardine/model/Ace.java index 4e417a75..7ec2f416 100644 --- a/src/main/java/com/github/sardine/model/Ace.java +++ b/src/main/java/com/github/sardine/model/Ace.java @@ -1,10 +1,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Acl.java b/src/main/java/com/github/sardine/model/Acl.java index b86755c9..d7e52b72 100644 --- a/src/main/java/com/github/sardine/model/Acl.java +++ b/src/main/java/com/github/sardine/model/Acl.java @@ -1,11 +1,12 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Activelock.java b/src/main/java/com/github/sardine/model/Activelock.java index 1c2c044e..a1970b59 100644 --- a/src/main/java/com/github/sardine/model/Activelock.java +++ b/src/main/java/com/github/sardine/model/Activelock.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/All.java b/src/main/java/com/github/sardine/model/All.java index f977b858..f8ba9e3c 100644 --- a/src/main/java/com/github/sardine/model/All.java +++ b/src/main/java/com/github/sardine/model/All.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Allprop.java b/src/main/java/com/github/sardine/model/Allprop.java index 96f3fbc2..f798f076 100644 --- a/src/main/java/com/github/sardine/model/Allprop.java +++ b/src/main/java/com/github/sardine/model/Allprop.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Authenticated.java b/src/main/java/com/github/sardine/model/Authenticated.java index c0bb151b..7011d380 100644 --- a/src/main/java/com/github/sardine/model/Authenticated.java +++ b/src/main/java/com/github/sardine/model/Authenticated.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Bind.java b/src/main/java/com/github/sardine/model/Bind.java index 4d294db3..ec79ef13 100644 --- a/src/main/java/com/github/sardine/model/Bind.java +++ b/src/main/java/com/github/sardine/model/Bind.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Collection.java b/src/main/java/com/github/sardine/model/Collection.java index 352e2209..df69affa 100644 --- a/src/main/java/com/github/sardine/model/Collection.java +++ b/src/main/java/com/github/sardine/model/Collection.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Creationdate.java b/src/main/java/com/github/sardine/model/Creationdate.java index 58ed2650..4385b4de 100644 --- a/src/main/java/com/github/sardine/model/Creationdate.java +++ b/src/main/java/com/github/sardine/model/Creationdate.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Deny.java b/src/main/java/com/github/sardine/model/Deny.java index 992b2409..9ba7d3d6 100644 --- a/src/main/java/com/github/sardine/model/Deny.java +++ b/src/main/java/com/github/sardine/model/Deny.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Displayname.java b/src/main/java/com/github/sardine/model/Displayname.java index c583ab5c..3bf8d1fa 100644 --- a/src/main/java/com/github/sardine/model/Displayname.java +++ b/src/main/java/com/github/sardine/model/Displayname.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Error.java b/src/main/java/com/github/sardine/model/Error.java index 0ef7be30..a2951525 100644 --- a/src/main/java/com/github/sardine/model/Error.java +++ b/src/main/java/com/github/sardine/model/Error.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Exclusive.java b/src/main/java/com/github/sardine/model/Exclusive.java index c9702f76..83ee201f 100644 --- a/src/main/java/com/github/sardine/model/Exclusive.java +++ b/src/main/java/com/github/sardine/model/Exclusive.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Getcontentlanguage.java b/src/main/java/com/github/sardine/model/Getcontentlanguage.java index 91b62913..24e75de8 100644 --- a/src/main/java/com/github/sardine/model/Getcontentlanguage.java +++ b/src/main/java/com/github/sardine/model/Getcontentlanguage.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Getcontentlength.java b/src/main/java/com/github/sardine/model/Getcontentlength.java index 73cb27d1..0a1109c0 100644 --- a/src/main/java/com/github/sardine/model/Getcontentlength.java +++ b/src/main/java/com/github/sardine/model/Getcontentlength.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Getcontenttype.java b/src/main/java/com/github/sardine/model/Getcontenttype.java index ccaf7def..5dca2376 100644 --- a/src/main/java/com/github/sardine/model/Getcontenttype.java +++ b/src/main/java/com/github/sardine/model/Getcontenttype.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Getetag.java b/src/main/java/com/github/sardine/model/Getetag.java index 0f78ccf9..3b48c46c 100644 --- a/src/main/java/com/github/sardine/model/Getetag.java +++ b/src/main/java/com/github/sardine/model/Getetag.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Getlastmodified.java b/src/main/java/com/github/sardine/model/Getlastmodified.java index 59e600de..40a33bbe 100644 --- a/src/main/java/com/github/sardine/model/Getlastmodified.java +++ b/src/main/java/com/github/sardine/model/Getlastmodified.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Grant.java b/src/main/java/com/github/sardine/model/Grant.java index 20510874..5fb53348 100644 --- a/src/main/java/com/github/sardine/model/Grant.java +++ b/src/main/java/com/github/sardine/model/Grant.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Group.java b/src/main/java/com/github/sardine/model/Group.java index a72709bb..7428b33c 100644 --- a/src/main/java/com/github/sardine/model/Group.java +++ b/src/main/java/com/github/sardine/model/Group.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Inherited.java b/src/main/java/com/github/sardine/model/Inherited.java index bd46f5a2..7cf52bed 100644 --- a/src/main/java/com/github/sardine/model/Inherited.java +++ b/src/main/java/com/github/sardine/model/Inherited.java @@ -1,9 +1,9 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { diff --git a/src/main/java/com/github/sardine/model/Keepalive.java b/src/main/java/com/github/sardine/model/Keepalive.java index eb731ab0..e091c36f 100644 --- a/src/main/java/com/github/sardine/model/Keepalive.java +++ b/src/main/java/com/github/sardine/model/Keepalive.java @@ -8,17 +8,18 @@ package com.github.sardine.model; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Limit.java b/src/main/java/com/github/sardine/model/Limit.java index 718728bf..9658d4f6 100644 --- a/src/main/java/com/github/sardine/model/Limit.java +++ b/src/main/java/com/github/sardine/model/Limit.java @@ -8,13 +8,14 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.math.BigInteger; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type. diff --git a/src/main/java/com/github/sardine/model/Link.java b/src/main/java/com/github/sardine/model/Link.java index 1be0545f..ff0c4809 100644 --- a/src/main/java/com/github/sardine/model/Link.java +++ b/src/main/java/com/github/sardine/model/Link.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Location.java b/src/main/java/com/github/sardine/model/Location.java index ee31dd31..4ee3374b 100644 --- a/src/main/java/com/github/sardine/model/Location.java +++ b/src/main/java/com/github/sardine/model/Location.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Lockdiscovery.java b/src/main/java/com/github/sardine/model/Lockdiscovery.java index f97a64c6..9eeb6ee3 100644 --- a/src/main/java/com/github/sardine/model/Lockdiscovery.java +++ b/src/main/java/com/github/sardine/model/Lockdiscovery.java @@ -8,13 +8,14 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Lockentry.java b/src/main/java/com/github/sardine/model/Lockentry.java index 51a5814d..d1a4baba 100644 --- a/src/main/java/com/github/sardine/model/Lockentry.java +++ b/src/main/java/com/github/sardine/model/Lockentry.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Lockinfo.java b/src/main/java/com/github/sardine/model/Lockinfo.java index b1a9639e..e3e6dfbb 100644 --- a/src/main/java/com/github/sardine/model/Lockinfo.java +++ b/src/main/java/com/github/sardine/model/Lockinfo.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Lockscope.java b/src/main/java/com/github/sardine/model/Lockscope.java index bb2fc714..ea8bc8c7 100644 --- a/src/main/java/com/github/sardine/model/Lockscope.java +++ b/src/main/java/com/github/sardine/model/Lockscope.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Locktoken.java b/src/main/java/com/github/sardine/model/Locktoken.java index 29d9f504..601b8936 100644 --- a/src/main/java/com/github/sardine/model/Locktoken.java +++ b/src/main/java/com/github/sardine/model/Locktoken.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Locktype.java b/src/main/java/com/github/sardine/model/Locktype.java index db034a93..7f51c9ca 100644 --- a/src/main/java/com/github/sardine/model/Locktype.java +++ b/src/main/java/com/github/sardine/model/Locktype.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Multistatus.java b/src/main/java/com/github/sardine/model/Multistatus.java index be2c6abe..f7c8be88 100644 --- a/src/main/java/com/github/sardine/model/Multistatus.java +++ b/src/main/java/com/github/sardine/model/Multistatus.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type. diff --git a/src/main/java/com/github/sardine/model/ObjectFactory.java b/src/main/java/com/github/sardine/model/ObjectFactory.java index cdca00a6..c1bd8380 100644 --- a/src/main/java/com/github/sardine/model/ObjectFactory.java +++ b/src/main/java/com/github/sardine/model/ObjectFactory.java @@ -8,12 +8,14 @@ package com.github.sardine.model; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; import java.math.BigInteger; +import javax.xml.namespace.QName; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; + /** * This object contains factory methods for each diff --git a/src/main/java/com/github/sardine/model/Omit.java b/src/main/java/com/github/sardine/model/Omit.java index 696494b2..be072108 100644 --- a/src/main/java/com/github/sardine/model/Omit.java +++ b/src/main/java/com/github/sardine/model/Omit.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Owner.java b/src/main/java/com/github/sardine/model/Owner.java index 54d939f1..b2e68d66 100644 --- a/src/main/java/com/github/sardine/model/Owner.java +++ b/src/main/java/com/github/sardine/model/Owner.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Principal.java b/src/main/java/com/github/sardine/model/Principal.java index 9666682b..bb3b469d 100644 --- a/src/main/java/com/github/sardine/model/Principal.java +++ b/src/main/java/com/github/sardine/model/Principal.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/PrincipalCollectionSet.java b/src/main/java/com/github/sardine/model/PrincipalCollectionSet.java index 5a8c89fc..0d5e2663 100644 --- a/src/main/java/com/github/sardine/model/PrincipalCollectionSet.java +++ b/src/main/java/com/github/sardine/model/PrincipalCollectionSet.java @@ -8,12 +8,13 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/PrincipalURL.java b/src/main/java/com/github/sardine/model/PrincipalURL.java index 83341bdc..3a9bd633 100644 --- a/src/main/java/com/github/sardine/model/PrincipalURL.java +++ b/src/main/java/com/github/sardine/model/PrincipalURL.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Privilege.java b/src/main/java/com/github/sardine/model/Privilege.java index 01b119fb..7600a6d3 100644 --- a/src/main/java/com/github/sardine/model/Privilege.java +++ b/src/main/java/com/github/sardine/model/Privilege.java @@ -1,14 +1,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "content" diff --git a/src/main/java/com/github/sardine/model/Prop.java b/src/main/java/com/github/sardine/model/Prop.java index 1aa40fa1..2740713f 100644 --- a/src/main/java/com/github/sardine/model/Prop.java +++ b/src/main/java/com/github/sardine/model/Prop.java @@ -8,16 +8,18 @@ package com.github.sardine.model; -import org.w3c.dom.Element; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import org.w3c.dom.Element; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Property.java b/src/main/java/com/github/sardine/model/Property.java index 286b8fa7..03835b47 100644 --- a/src/main/java/com/github/sardine/model/Property.java +++ b/src/main/java/com/github/sardine/model/Property.java @@ -10,11 +10,11 @@ import org.w3c.dom.Element; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; diff --git a/src/main/java/com/github/sardine/model/Propertybehavior.java b/src/main/java/com/github/sardine/model/Propertybehavior.java index 2d08cbfb..9dd47eed 100644 --- a/src/main/java/com/github/sardine/model/Propertybehavior.java +++ b/src/main/java/com/github/sardine/model/Propertybehavior.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Propertyupdate.java b/src/main/java/com/github/sardine/model/Propertyupdate.java index 36bca2e3..e47beb12 100644 --- a/src/main/java/com/github/sardine/model/Propertyupdate.java +++ b/src/main/java/com/github/sardine/model/Propertyupdate.java @@ -8,15 +8,16 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Propfind.java b/src/main/java/com/github/sardine/model/Propfind.java index 664c0f3f..0b51f9d6 100644 --- a/src/main/java/com/github/sardine/model/Propfind.java +++ b/src/main/java/com/github/sardine/model/Propfind.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Propname.java b/src/main/java/com/github/sardine/model/Propname.java index d4c08f21..2d1f44a7 100644 --- a/src/main/java/com/github/sardine/model/Propname.java +++ b/src/main/java/com/github/sardine/model/Propname.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Propstat.java b/src/main/java/com/github/sardine/model/Propstat.java index 2c8ec2cd..2d1c438f 100644 --- a/src/main/java/com/github/sardine/model/Propstat.java +++ b/src/main/java/com/github/sardine/model/Propstat.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Protected.java b/src/main/java/com/github/sardine/model/Protected.java index bfef8950..2f5fdbd9 100644 --- a/src/main/java/com/github/sardine/model/Protected.java +++ b/src/main/java/com/github/sardine/model/Protected.java @@ -1,9 +1,9 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") diff --git a/src/main/java/com/github/sardine/model/QuotaAvailableBytes.java b/src/main/java/com/github/sardine/model/QuotaAvailableBytes.java index 6e8fa904..bdf91417 100644 --- a/src/main/java/com/github/sardine/model/QuotaAvailableBytes.java +++ b/src/main/java/com/github/sardine/model/QuotaAvailableBytes.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/QuotaUsedBytes.java b/src/main/java/com/github/sardine/model/QuotaUsedBytes.java index f55f1b25..a0e44e35 100644 --- a/src/main/java/com/github/sardine/model/QuotaUsedBytes.java +++ b/src/main/java/com/github/sardine/model/QuotaUsedBytes.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Read.java b/src/main/java/com/github/sardine/model/Read.java index 5466f6fa..438cc07b 100644 --- a/src/main/java/com/github/sardine/model/Read.java +++ b/src/main/java/com/github/sardine/model/Read.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/ReadAcl.java b/src/main/java/com/github/sardine/model/ReadAcl.java index 80c20f51..22237fab 100644 --- a/src/main/java/com/github/sardine/model/ReadAcl.java +++ b/src/main/java/com/github/sardine/model/ReadAcl.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/ReadCurrentUserPrivilegeSet.java b/src/main/java/com/github/sardine/model/ReadCurrentUserPrivilegeSet.java index 80b62bb3..0b43ffd7 100644 --- a/src/main/java/com/github/sardine/model/ReadCurrentUserPrivilegeSet.java +++ b/src/main/java/com/github/sardine/model/ReadCurrentUserPrivilegeSet.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Remove.java b/src/main/java/com/github/sardine/model/Remove.java index 2d2ea0a4..b48b7bb2 100644 --- a/src/main/java/com/github/sardine/model/Remove.java +++ b/src/main/java/com/github/sardine/model/Remove.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Report.java b/src/main/java/com/github/sardine/model/Report.java index ca7835c7..180796c1 100644 --- a/src/main/java/com/github/sardine/model/Report.java +++ b/src/main/java/com/github/sardine/model/Report.java @@ -10,11 +10,11 @@ import org.w3c.dom.Element; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Resourcetype.java b/src/main/java/com/github/sardine/model/Resourcetype.java index 88e2d82d..b5c67ca8 100644 --- a/src/main/java/com/github/sardine/model/Resourcetype.java +++ b/src/main/java/com/github/sardine/model/Resourcetype.java @@ -8,16 +8,17 @@ package com.github.sardine.model; -import org.w3c.dom.Element; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import org.w3c.dom.Element; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/Response.java b/src/main/java/com/github/sardine/model/Response.java index 706c3708..864a8a1d 100644 --- a/src/main/java/com/github/sardine/model/Response.java +++ b/src/main/java/com/github/sardine/model/Response.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type. diff --git a/src/main/java/com/github/sardine/model/SearchRequest.java b/src/main/java/com/github/sardine/model/SearchRequest.java index 9f85831b..d2dac9ca 100644 --- a/src/main/java/com/github/sardine/model/SearchRequest.java +++ b/src/main/java/com/github/sardine/model/SearchRequest.java @@ -3,13 +3,14 @@ */ package com.github.sardine.model; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

* diff --git a/src/main/java/com/github/sardine/model/Self.java b/src/main/java/com/github/sardine/model/Self.java index a25506ac..1b5ececa 100644 --- a/src/main/java/com/github/sardine/model/Self.java +++ b/src/main/java/com/github/sardine/model/Self.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Set.java b/src/main/java/com/github/sardine/model/Set.java index 05508050..1ef8a2a9 100644 --- a/src/main/java/com/github/sardine/model/Set.java +++ b/src/main/java/com/github/sardine/model/Set.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Shared.java b/src/main/java/com/github/sardine/model/Shared.java index c8d9358a..a42445d6 100644 --- a/src/main/java/com/github/sardine/model/Shared.java +++ b/src/main/java/com/github/sardine/model/Shared.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Source.java b/src/main/java/com/github/sardine/model/Source.java index 518765dd..c72c1587 100644 --- a/src/main/java/com/github/sardine/model/Source.java +++ b/src/main/java/com/github/sardine/model/Source.java @@ -8,13 +8,14 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/SupportedReport.java b/src/main/java/com/github/sardine/model/SupportedReport.java index c9ac0d61..7e713ba7 100644 --- a/src/main/java/com/github/sardine/model/SupportedReport.java +++ b/src/main/java/com/github/sardine/model/SupportedReport.java @@ -8,11 +8,11 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/SupportedReportSet.java b/src/main/java/com/github/sardine/model/SupportedReportSet.java index 5bbfd6bf..86f2acb4 100644 --- a/src/main/java/com/github/sardine/model/SupportedReportSet.java +++ b/src/main/java/com/github/sardine/model/SupportedReportSet.java @@ -8,14 +8,15 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type. diff --git a/src/main/java/com/github/sardine/model/Supportedlock.java b/src/main/java/com/github/sardine/model/Supportedlock.java index fb222249..c5e8bdce 100644 --- a/src/main/java/com/github/sardine/model/Supportedlock.java +++ b/src/main/java/com/github/sardine/model/Supportedlock.java @@ -8,13 +8,14 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** *

Java class for anonymous complex type.

diff --git a/src/main/java/com/github/sardine/model/SyncCollection.java b/src/main/java/com/github/sardine/model/SyncCollection.java index 1369ae0d..91a3b186 100644 --- a/src/main/java/com/github/sardine/model/SyncCollection.java +++ b/src/main/java/com/github/sardine/model/SyncCollection.java @@ -8,12 +8,12 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/UnBind.java b/src/main/java/com/github/sardine/model/UnBind.java index 441fddee..64994269 100644 --- a/src/main/java/com/github/sardine/model/UnBind.java +++ b/src/main/java/com/github/sardine/model/UnBind.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Unauthenticated.java b/src/main/java/com/github/sardine/model/Unauthenticated.java index e7893ec2..19b572e0 100644 --- a/src/main/java/com/github/sardine/model/Unauthenticated.java +++ b/src/main/java/com/github/sardine/model/Unauthenticated.java @@ -1,9 +1,9 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Unlock.java b/src/main/java/com/github/sardine/model/Unlock.java index ba47176d..de154072 100644 --- a/src/main/java/com/github/sardine/model/Unlock.java +++ b/src/main/java/com/github/sardine/model/Unlock.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/Write.java b/src/main/java/com/github/sardine/model/Write.java index 3353dbee..a0d44009 100644 --- a/src/main/java/com/github/sardine/model/Write.java +++ b/src/main/java/com/github/sardine/model/Write.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/WriteContent.java b/src/main/java/com/github/sardine/model/WriteContent.java index cd4bed88..1e2be55c 100644 --- a/src/main/java/com/github/sardine/model/WriteContent.java +++ b/src/main/java/com/github/sardine/model/WriteContent.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/WriteProperties.java b/src/main/java/com/github/sardine/model/WriteProperties.java index 1bfc7b0d..fc67536f 100644 --- a/src/main/java/com/github/sardine/model/WriteProperties.java +++ b/src/main/java/com/github/sardine/model/WriteProperties.java @@ -8,10 +8,10 @@ package com.github.sardine.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/src/main/java/com/github/sardine/model/package-info.java b/src/main/java/com/github/sardine/model/package-info.java index 5e991630..58ff6201 100644 --- a/src/main/java/com/github/sardine/model/package-info.java +++ b/src/main/java/com/github/sardine/model/package-info.java @@ -8,5 +8,5 @@ /** * Generated classes from the WebDAV XML schema. */ -@javax.xml.bind.annotation.XmlSchema(namespace = "DAV:", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "DAV:", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.github.sardine.model; diff --git a/src/main/java/com/github/sardine/report/SardineReport.java b/src/main/java/com/github/sardine/report/SardineReport.java index 139c7ddf..3a26a588 100644 --- a/src/main/java/com/github/sardine/report/SardineReport.java +++ b/src/main/java/com/github/sardine/report/SardineReport.java @@ -1,10 +1,10 @@ package com.github.sardine.report; +import java.io.IOException; + import com.github.sardine.model.Multistatus; import com.github.sardine.util.SardineUtil; -import java.io.IOException; - public abstract class SardineReport { public String toXml() throws IOException diff --git a/src/main/java/com/github/sardine/report/SyncCollectionReport.java b/src/main/java/com/github/sardine/report/SyncCollectionReport.java index f718f5f4..00681690 100644 --- a/src/main/java/com/github/sardine/report/SyncCollectionReport.java +++ b/src/main/java/com/github/sardine/report/SyncCollectionReport.java @@ -1,5 +1,16 @@ package com.github.sardine.report; +import java.math.BigInteger; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; + +import org.w3c.dom.Element; + import com.github.sardine.DavResource; import com.github.sardine.model.Limit; import com.github.sardine.model.Multistatus; @@ -7,15 +18,6 @@ import com.github.sardine.model.Response; import com.github.sardine.model.SyncCollection; import com.github.sardine.util.SardineUtil; -import org.w3c.dom.Element; - -import javax.xml.namespace.QName; -import java.math.BigInteger; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.logging.Logger; public class SyncCollectionReport extends SardineReport { diff --git a/src/main/java/com/github/sardine/util/SardineUtil.java b/src/main/java/com/github/sardine/util/SardineUtil.java index 33a29fc7..f47488b9 100644 --- a/src/main/java/com/github/sardine/util/SardineUtil.java +++ b/src/main/java/com/github/sardine/util/SardineUtil.java @@ -1,26 +1,5 @@ package com.github.sardine.util; -import com.github.sardine.model.ObjectFactory; - -import org.apache.http.client.utils.DateUtils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; - -import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.sax.SAXSource; - import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -33,6 +12,28 @@ import java.util.List; import java.util.Map; +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.sax.SAXSource; + +import org.apache.http.client.utils.DateUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; + +import com.github.sardine.model.ObjectFactory; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + /** * Basic utility code. I borrowed some code from the webdavlib for * parsing dates. diff --git a/src/test/java/com/github/sardine/AuthenticationTest.java b/src/test/java/com/github/sardine/AuthenticationTest.java index 38d3d450..c4e671c8 100644 --- a/src/test/java/com/github/sardine/AuthenticationTest.java +++ b/src/test/java/com/github/sardine/AuthenticationTest.java @@ -16,8 +16,16 @@ package com.github.sardine; -import com.github.sardine.impl.SardineException; -import com.github.sardine.impl.SardineImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.net.URI; +import java.security.Principal; +import java.util.List; +import java.util.concurrent.CountDownLatch; + import org.apache.http.auth.AuthScope; import org.apache.http.auth.BasicUserPrincipal; import org.apache.http.auth.Credentials; @@ -26,12 +34,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import java.net.URI; -import java.security.Principal; -import java.util.List; -import java.util.concurrent.CountDownLatch; - -import static org.junit.Assert.*; +import com.github.sardine.impl.SardineException; +import com.github.sardine.impl.SardineImpl; @Category(IntegrationTest.class) public class AuthenticationTest diff --git a/src/test/java/com/github/sardine/DavResourceTest.java b/src/test/java/com/github/sardine/DavResourceTest.java index cdf7bbdb..cc0ffbe5 100644 --- a/src/test/java/com/github/sardine/DavResourceTest.java +++ b/src/test/java/com/github/sardine/DavResourceTest.java @@ -16,9 +16,10 @@ package com.github.sardine; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -import javax.xml.namespace.QName; import java.net.URISyntaxException; import java.util.Arrays; import java.util.Collections; @@ -26,7 +27,9 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.*; +import javax.xml.namespace.QName; + +import org.junit.Test; /** */ diff --git a/src/test/java/com/github/sardine/FunctionalSardineTest.java b/src/test/java/com/github/sardine/FunctionalSardineTest.java index 19853811..439f7352 100644 --- a/src/test/java/com/github/sardine/FunctionalSardineTest.java +++ b/src/test/java/com/github/sardine/FunctionalSardineTest.java @@ -17,25 +17,13 @@ package com.github.sardine; -import com.github.sardine.DavPrincipal.PrincipalType; -import com.github.sardine.impl.SardineException; -import com.github.sardine.impl.SardineImpl; -import com.github.sardine.util.SardineUtil; -import org.apache.http.HttpClientConnection; -import org.apache.http.HttpException; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpRequest; -import org.apache.http.HttpRequestInterceptor; -import org.apache.http.HttpResponse; -import org.apache.http.HttpResponseInterceptor; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.protocol.HttpContext; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.EOFException; @@ -54,7 +42,27 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.*; +import javax.xml.namespace.QName; + +import org.apache.http.HttpClientConnection; +import org.apache.http.HttpException; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpRequest; +import org.apache.http.HttpRequestInterceptor; +import org.apache.http.HttpResponse; +import org.apache.http.HttpResponseInterceptor; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.protocol.HttpContext; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.github.sardine.DavPrincipal.PrincipalType; +import com.github.sardine.impl.SardineException; +import com.github.sardine.impl.SardineImpl; +import com.github.sardine.util.SardineUtil; + +import jakarta.xml.bind.JAXBException; @Category(IntegrationTest.class) public class FunctionalSardineTest diff --git a/src/test/java/com/github/sardine/LockTest.java b/src/test/java/com/github/sardine/LockTest.java index 3d7afc8b..dcdb402f 100644 --- a/src/test/java/com/github/sardine/LockTest.java +++ b/src/test/java/com/github/sardine/LockTest.java @@ -16,16 +16,18 @@ package com.github.sardine; -import com.github.sardine.impl.SardineException; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.ByteArrayInputStream; -import java.util.UUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.ByteArrayInputStream; +import java.util.UUID; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.github.sardine.impl.SardineException; + @Category(IntegrationTest.class) public class LockTest { diff --git a/src/test/java/com/github/sardine/ProppatchTest.java b/src/test/java/com/github/sardine/ProppatchTest.java index a6ebc5a4..a9b6d2aa 100644 --- a/src/test/java/com/github/sardine/ProppatchTest.java +++ b/src/test/java/com/github/sardine/ProppatchTest.java @@ -16,12 +16,12 @@ package com.github.sardine; -import com.github.sardine.util.SardineUtil; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.w3c.dom.Element; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; -import javax.xml.namespace.QName; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -33,7 +33,13 @@ import java.util.Set; import java.util.UUID; -import static org.junit.Assert.*; +import javax.xml.namespace.QName; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.w3c.dom.Element; + +import com.github.sardine.util.SardineUtil; @Category(IntegrationTest.class) public class ProppatchTest diff --git a/src/test/java/com/github/sardine/SardineUtilTest.java b/src/test/java/com/github/sardine/SardineUtilTest.java index 61e79a5e..8db4e142 100644 --- a/src/test/java/com/github/sardine/SardineUtilTest.java +++ b/src/test/java/com/github/sardine/SardineUtilTest.java @@ -16,11 +16,11 @@ package com.github.sardine; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.hamcrest.CoreMatchers.containsString; import org.junit.Test; import com.github.sardine.model.Allprop; diff --git a/src/test/java/com/github/sardine/impl/SardineExceptionTest.java b/src/test/java/com/github/sardine/impl/SardineExceptionTest.java index d0152d2a..ba5fb573 100644 --- a/src/test/java/com/github/sardine/impl/SardineExceptionTest.java +++ b/src/test/java/com/github/sardine/impl/SardineExceptionTest.java @@ -1,9 +1,9 @@ package com.github.sardine.impl; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class SardineExceptionTest { diff --git a/src/test/java/com/github/sardine/impl/handler/MultiStatusResponseHandlerTest.java b/src/test/java/com/github/sardine/impl/handler/MultiStatusResponseHandlerTest.java index 250f51f1..85ac3e5b 100644 --- a/src/test/java/com/github/sardine/impl/handler/MultiStatusResponseHandlerTest.java +++ b/src/test/java/com/github/sardine/impl/handler/MultiStatusResponseHandlerTest.java @@ -16,19 +16,26 @@ package com.github.sardine.impl.handler; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.ByteArrayInputStream; +import java.io.IOException; + +import javax.xml.namespace.QName; + +import org.junit.Test; + import com.github.sardine.DavAcl; import com.github.sardine.DavPrincipal; import com.github.sardine.DavResource; import com.github.sardine.model.Multistatus; import com.github.sardine.model.Response; -import org.junit.Test; - -import javax.xml.bind.UnmarshalException; -import javax.xml.namespace.QName; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import static org.junit.Assert.*; +import jakarta.xml.bind.UnmarshalException; /** */ diff --git a/src/test/java/com/github/sardine/impl/io/ByteCountInputStreamTest.java b/src/test/java/com/github/sardine/impl/io/ByteCountInputStreamTest.java index 7b325aea..da7dc53b 100644 --- a/src/test/java/com/github/sardine/impl/io/ByteCountInputStreamTest.java +++ b/src/test/java/com/github/sardine/impl/io/ByteCountInputStreamTest.java @@ -1,10 +1,10 @@ package com.github.sardine.impl.io; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; -import static org.junit.Assert.assertEquals; +import org.junit.Test; public class ByteCountInputStreamTest { From 71efd29e9c1a3dda3b33fa5bce5e5349bdfd0fab Mon Sep 17 00:00:00 2001 From: David Kocher Date: Tue, 18 Apr 2023 09:31:54 +0200 Subject: [PATCH 02/15] Configure dependabot for dependency management. --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..2d8ea038 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" +- package-ecosystem: maven + directory: "/" + schedule: + interval: "daily" + open-pull-requests-limit: 99 From c3b29a4f434f098f054c8f534237416af986c1ba Mon Sep 17 00:00:00 2001 From: Andre Wachsmuth Date: Mon, 17 Apr 2023 01:45:10 +0200 Subject: [PATCH 03/15] Add Automatic-Module-Name to manifest http://branchandbound.net/blog/java/2017/12/automatic-module-name/ --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 00dd09f6..1fd87b61 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,9 @@ true true + + com.github.sardine + From 1dd7f4d9d3f33ba9fc5fd7a4f05361aa678590d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:08 +0000 Subject: [PATCH 04/15] Bump ant from 1.10.11 to 1.10.13 Bumps ant from 1.10.11 to 1.10.13. --- updated-dependencies: - dependency-name: org.apache.ant:ant dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fd87b61..8a565602 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ org.apache.ant ant - 1.10.11 + 1.10.13 provided From 3583cdb84ab5be5046441f8b3288a5c026b07d01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:36 +0000 Subject: [PATCH 05/15] Bump maven-failsafe-plugin from 2.19 to 3.0.0 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 2.19 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.19...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a565602..90470a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.19 + 3.0.0 UTF-8 From 28a39cc1616d2cc235efccd69e0ce52c6c7047bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:25 +0000 Subject: [PATCH 06/15] Bump maven-surefire-plugin from 2.19 to 3.0.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.19 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.19...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90470a7c..c49d258c 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19 + 3.0.0 com.github.sardine.IntegrationTest.class false From 14855d3df717b006604ad4ea6c4c8a4bcee3616e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:29 +0000 Subject: [PATCH 07/15] Bump maven-source-plugin from 3.0.1 to 3.2.1 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.0.1 to 3.2.1. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.0.1...maven-source-plugin-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c49d258c..6fe31367 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ maven-source-plugin - 3.0.1 + 3.2.1 From c1323a94d20f380bfbca31b5f02d2aa635deae9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:32 +0000 Subject: [PATCH 08/15] Bump maven-javadoc-plugin from 2.10.4 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 2.10.4 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-2.10.4...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fe31367..3cb09ec7 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 8 - 2.10.4 + 3.5.0 From d6ffe391eb78b21a654a43af9b7776555d1f353a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:21 +0000 Subject: [PATCH 09/15] Bump nexus-staging-maven-plugin from 1.6.8 to 1.6.13 Bumps nexus-staging-maven-plugin from 1.6.8 to 1.6.13. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cb09ec7..55649f9d 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh From 680f33142cb4bfc15335b7d34649060f42ac7020 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:20 +0000 Subject: [PATCH 10/15] Bump maven-compiler-plugin from 3.3 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.3 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.3...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55649f9d..0b1a4912 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ maven-compiler-plugin - 3.3 + 3.11.0 1.7 1.7 From 562def6bbe132cd6e802905cc68df71557c177ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:17 +0000 Subject: [PATCH 11/15] Bump maven-gpg-plugin from 1.6 to 3.0.1 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 1.6 to 3.0.1. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-1.6...maven-gpg-plugin-3.0.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b1a4912..4b6a2dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From 2f1eff77355c79ff1685aa69a1ca6483e1617e04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:13 +0000 Subject: [PATCH 12/15] Bump maven-jar-plugin from 2.6 to 3.3.0 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 2.6 to 3.3.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-2.6...maven-jar-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b6a2dcc..4776f252 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ maven-jar-plugin - 2.6 + 3.3.0 From 9e50ac25ad1785e0704c180da4ee1ecbd9179dc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:20:10 +0000 Subject: [PATCH 13/15] Bump httpclient from 4.5.1 to 4.5.14 Bumps httpclient from 4.5.1 to 4.5.14. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4776f252..43db4bfe 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.apache.httpcomponents httpclient - 4.5.1 + 4.5.14 From b63e4ce9c6f5ab7bea7f6bd16b05de4becf1010c Mon Sep 17 00:00:00 2001 From: David Kocher Date: Tue, 18 Apr 2023 21:06:33 +0200 Subject: [PATCH 14/15] Fix test. --- src/test/java/com/github/sardine/impl/SardineExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/sardine/impl/SardineExceptionTest.java b/src/test/java/com/github/sardine/impl/SardineExceptionTest.java index ba5fb573..5c06b360 100644 --- a/src/test/java/com/github/sardine/impl/SardineExceptionTest.java +++ b/src/test/java/com/github/sardine/impl/SardineExceptionTest.java @@ -11,7 +11,7 @@ public class SardineExceptionTest public void testMessage() { final SardineException e = new SardineException("m", 400, "response phrase"); - assertEquals("m (400 response phrase)", e.getMessage()); + assertEquals("status code: 400, reason phrase: m (400 response phrase)", e.getMessage()); assertEquals("response phrase", e.getResponsePhrase()); assertEquals(400, e.getStatusCode()); } From a17b054f63459ee130951979dd57b3136ba71c98 Mon Sep 17 00:00:00 2001 From: Ilia_Poliakov Date: Mon, 18 May 2020 22:10:59 +0300 Subject: [PATCH 15/15] implemented versioning --- src/main/java/com/github/sardine/Sardine.java | 69 ++++++++ .../com/github/sardine/impl/SardineImpl.java | 153 ++++++++---------- .../sardine/impl/methods/HttpCheckin.java | 26 +++ .../sardine/impl/methods/HttpCheckout.java | 26 +++ .../impl/methods/HttpVersionControl.java | 26 +++ .../github/sardine/model/ObjectFactory.java | 4 + .../com/github/sardine/model/VersionTree.java | 38 +++++ .../sardine/report/VersionTreeReport.java | 59 +++++++ webdav.xsd | 8 + 9 files changed, 324 insertions(+), 85 deletions(-) create mode 100644 src/main/java/com/github/sardine/impl/methods/HttpCheckin.java create mode 100644 src/main/java/com/github/sardine/impl/methods/HttpCheckout.java create mode 100644 src/main/java/com/github/sardine/impl/methods/HttpVersionControl.java create mode 100644 src/main/java/com/github/sardine/model/VersionTree.java create mode 100644 src/main/java/com/github/sardine/report/VersionTreeReport.java diff --git a/src/main/java/com/github/sardine/Sardine.java b/src/main/java/com/github/sardine/Sardine.java index 03666395..728e4f47 100644 --- a/src/main/java/com/github/sardine/Sardine.java +++ b/src/main/java/com/github/sardine/Sardine.java @@ -88,6 +88,37 @@ public interface Sardine */ List list(String url, int depth, boolean allProp) throws IOException; + /** + * Gets versions listing of resource. + * + * @param url Path to the resource including protocol and hostname + * @throws IOException I/O error or HTTP response validation failure + */ + List versionsList(String url) throws IOException; + + /** + * Gets versions listing of resource. + * + * @param url Path to the resource including protocol and hostname + * @param depth The depth to look at (use 0 for single resource, 1 for directory listing, + * -1 for infinite recursion) + * @throws IOException I/O error or HTTP response validation failure + * + */ + List versionsList(String url, int depth) throws IOException; + + /** + * Gets versions listing of resource. + * + * @param url Path to the resource including protocol and hostname + * @param depth The depth to look at (use 0 for single resource, 1 for directory listing, + * -1 for infinite recursion) + * @param props Set of properties to be requested + * @throws IOException I/O error or HTTP response validation failure + * + */ + List versionsList(String url, int depth, Set props) throws IOException; + /** * Fetches a resource using WebDAV PROPFIND. Only the specified properties * are retrieved. @@ -182,6 +213,17 @@ public interface Sardine */ InputStream get(String url) throws IOException; + /** + * Uses HTTP GET to download specific version of data from a server. + * The stream must be closed after reading. + * + * @param url Path to the resource including protocol and hostname + * @param version version of resource + * @return Data stream to read from + * @throws IOException I/O error or HTTP response validation failure + */ + InputStream get(String url, String version) throws IOException; + /** * Uses HTTP GET to download data from a server. The stream must be closed after reading. * @@ -434,6 +476,33 @@ public interface Sardine */ void unlock(String url, String token) throws IOException; + /** + * Put the resource under version control. + * + * @param url Path to the resource including protocol and hostname + * @throws IOException I/O error or HTTP response validation failure + */ + void addToVersionControl(String url) throws IOException; + + /** + * CHECKOUT request can be applied only to a checked-in version-controlled resource + * to allow modifications to the content and properties of that version-controlled resource. + * + * @param url Path to the checked-in, version-controlled resource including protocol and hostname + * @throws IOException I/O error or HTTP response validation failure + */ + void checkout(String url) throws IOException; + + /** + * CHECKIN request can be applied to a checked-out version-controlled + * resource to produce a new version whose content and properties + * are copied from the checked-out resource. + * + * @param url Path to the checked-out, version-controlled resource including protocol and hostname + * @throws IOException I/O error or HTTP response validation failure + */ + void checkin(String url) throws IOException; + /** * Read access control list for resource * diff --git a/src/main/java/com/github/sardine/impl/SardineImpl.java b/src/main/java/com/github/sardine/impl/SardineImpl.java index ac45e2ee..95a34d4f 100644 --- a/src/main/java/com/github/sardine/impl/SardineImpl.java +++ b/src/main/java/com/github/sardine/impl/SardineImpl.java @@ -16,29 +16,19 @@ package com.github.sardine.impl; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.ProxySelector; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; - -import org.apache.http.Consts; -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpHost; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; +import com.github.sardine.*; +import com.github.sardine.impl.handler.ExistsResponseHandler; +import com.github.sardine.impl.handler.LockResponseHandler; +import com.github.sardine.impl.handler.MultiStatusResponseHandler; +import com.github.sardine.impl.handler.VoidResponseHandler; +import com.github.sardine.impl.io.ContentLengthInputStream; +import com.github.sardine.impl.io.HttpMethodReleaseInputStream; +import com.github.sardine.impl.methods.*; +import com.github.sardine.model.*; +import com.github.sardine.report.SardineReport; +import com.github.sardine.report.VersionTreeReport; +import com.github.sardine.util.SardineUtil; +import org.apache.http.*; import org.apache.http.auth.AuthScope; import org.apache.http.auth.AuthState; import org.apache.http.auth.NTCredentials; @@ -49,12 +39,7 @@ import org.apache.http.client.ResponseHandler; import org.apache.http.client.config.AuthSchemes; import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.*; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.client.protocol.RequestAcceptEncoding; import org.apache.http.client.protocol.ResponseContentEncoding; @@ -73,11 +58,7 @@ import org.apache.http.entity.InputStreamEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.auth.BasicScheme; -import org.apache.http.impl.client.BasicAuthCache; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.*; import org.apache.http.impl.conn.DefaultSchemePortResolver; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.impl.conn.SystemDefaultRoutePlanner; @@ -89,57 +70,22 @@ import org.apache.http.util.VersionInfo; import org.w3c.dom.Element; -import com.github.sardine.DavAce; -import com.github.sardine.DavAcl; -import com.github.sardine.DavPrincipal; -import com.github.sardine.DavQuota; -import com.github.sardine.DavResource; -import com.github.sardine.Sardine; -import com.github.sardine.Version; -import com.github.sardine.impl.handler.ExistsResponseHandler; -import com.github.sardine.impl.handler.LockResponseHandler; -import com.github.sardine.impl.handler.MultiStatusResponseHandler; -import com.github.sardine.impl.handler.VoidResponseHandler; -import com.github.sardine.impl.io.ContentLengthInputStream; -import com.github.sardine.impl.io.HttpMethodReleaseInputStream; -import com.github.sardine.impl.methods.HttpAcl; -import com.github.sardine.impl.methods.HttpCopy; -import com.github.sardine.impl.methods.HttpLock; -import com.github.sardine.impl.methods.HttpMkCol; -import com.github.sardine.impl.methods.HttpMove; -import com.github.sardine.impl.methods.HttpPropFind; -import com.github.sardine.impl.methods.HttpPropPatch; -import com.github.sardine.impl.methods.HttpReport; -import com.github.sardine.impl.methods.HttpSearch; -import com.github.sardine.impl.methods.HttpUnlock; -import com.github.sardine.model.Ace; -import com.github.sardine.model.Acl; -import com.github.sardine.model.Allprop; -import com.github.sardine.model.Displayname; -import com.github.sardine.model.Exclusive; -import com.github.sardine.model.Group; -import com.github.sardine.model.Lockinfo; -import com.github.sardine.model.Lockscope; -import com.github.sardine.model.Locktype; -import com.github.sardine.model.Multistatus; -import com.github.sardine.model.ObjectFactory; -import com.github.sardine.model.Owner; -import com.github.sardine.model.PrincipalCollectionSet; -import com.github.sardine.model.PrincipalURL; -import com.github.sardine.model.Prop; -import com.github.sardine.model.Propertyupdate; -import com.github.sardine.model.Propfind; -import com.github.sardine.model.Propstat; -import com.github.sardine.model.QuotaAvailableBytes; -import com.github.sardine.model.QuotaUsedBytes; -import com.github.sardine.model.Remove; -import com.github.sardine.model.Resourcetype; -import com.github.sardine.model.Response; -import com.github.sardine.model.SearchRequest; -import com.github.sardine.model.Set; -import com.github.sardine.model.Write; -import com.github.sardine.report.SardineReport; -import com.github.sardine.util.SardineUtil; +import javax.xml.namespace.QName; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.ProxySelector; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.logging.Logger; + +import static com.github.sardine.util.SardineUtil.createQNameWithDefaultNamespace; /** * Implementation of the Sardine interface. This is where the meat of the Sardine library lives. @@ -416,6 +362,21 @@ public List list(String url, int depth, boolean allProp) throws IOE } } + @Override + public List versionsList(String url) throws IOException { + return versionsList(url, 0); + } + + @Override + public List versionsList(String url, int depth) throws IOException { + return versionsList(url, depth, Collections.emptySet()); + } + + @Override + public List versionsList(String url, int depth, java.util.Set props) throws IOException { + return report(url, depth, new VersionTreeReport(props)); + } + @Override public List list(String url, int depth, java.util.Set props) throws IOException { @@ -645,6 +606,21 @@ public void unlock(String url, String token) throws IOException this.execute(entity, new VoidResponseHandler()); } + @Override + public void addToVersionControl(String url) throws IOException { + this.execute(new HttpVersionControl(url), new VoidResponseHandler()); + } + + @Override + public void checkout(String url) throws IOException { + this.execute(new HttpCheckout(url), new VoidResponseHandler()); + } + + @Override + public void checkin(String url) throws IOException { + this.execute(new HttpCheckin(url), new VoidResponseHandler()); + } + @Override public void setAcl(String url, List aces) throws IOException { @@ -808,6 +784,13 @@ public ContentLengthInputStream get(String url) throws IOException return this.get(url, Collections.emptyMap()); } + @Override + public ContentLengthInputStream get(String url, String version) throws IOException { + List versionHistory = propfind(url, 0, Collections.singleton(createQNameWithDefaultNamespace("version-history"))); + String storageUrl = versionHistory.get(0).getCustomProps().get("version-history"); + return this.get(storageUrl + version); + } + @Override public ContentLengthInputStream get(String url, Map headers) throws IOException { diff --git a/src/main/java/com/github/sardine/impl/methods/HttpCheckin.java b/src/main/java/com/github/sardine/impl/methods/HttpCheckin.java new file mode 100644 index 00000000..afba8f99 --- /dev/null +++ b/src/main/java/com/github/sardine/impl/methods/HttpCheckin.java @@ -0,0 +1,26 @@ +package com.github.sardine.impl.methods; + +import org.apache.http.client.methods.HttpRequestBase; + +import java.net.URI; + +/** + * Simple class for making WebDAV CHECKIN requests. + */ +public class HttpCheckin extends HttpRequestBase { + + public static final String METHOD_NAME = "CHECKIN"; + + public HttpCheckin(String uri) { + this(URI.create(uri)); + } + + public HttpCheckin(URI uri) { + this.setURI(uri); + } + + @Override + public String getMethod() { + return METHOD_NAME; + } +} diff --git a/src/main/java/com/github/sardine/impl/methods/HttpCheckout.java b/src/main/java/com/github/sardine/impl/methods/HttpCheckout.java new file mode 100644 index 00000000..47b5d668 --- /dev/null +++ b/src/main/java/com/github/sardine/impl/methods/HttpCheckout.java @@ -0,0 +1,26 @@ +package com.github.sardine.impl.methods; + +import org.apache.http.client.methods.HttpRequestBase; + +import java.net.URI; + +/** + * Simple class for making WebDAV CHECKOUT requests. + */ +public class HttpCheckout extends HttpRequestBase { + + public static final String METHOD_NAME = "CHECKOUT"; + + public HttpCheckout(String uri) { + this(URI.create(uri)); + } + + public HttpCheckout(URI uri) { + this.setURI(uri); + } + + @Override + public String getMethod() { + return METHOD_NAME; + } +} diff --git a/src/main/java/com/github/sardine/impl/methods/HttpVersionControl.java b/src/main/java/com/github/sardine/impl/methods/HttpVersionControl.java new file mode 100644 index 00000000..d41e8fd5 --- /dev/null +++ b/src/main/java/com/github/sardine/impl/methods/HttpVersionControl.java @@ -0,0 +1,26 @@ +package com.github.sardine.impl.methods; + +import org.apache.http.client.methods.HttpRequestBase; + +import java.net.URI; + +/** + * Simple class for making WebDAV VERSION-CONTROL requests. + */ +public class HttpVersionControl extends HttpRequestBase { + + public static final String METHOD_NAME = "VERSION-CONTROL"; + + public HttpVersionControl(String uri) { + this(URI.create(uri)); + } + + public HttpVersionControl(URI uri) { + this.setURI(uri); + } + + @Override + public String getMethod() { + return METHOD_NAME; + } +} diff --git a/src/main/java/com/github/sardine/model/ObjectFactory.java b/src/main/java/com/github/sardine/model/ObjectFactory.java index c1bd8380..e5da9706 100644 --- a/src/main/java/com/github/sardine/model/ObjectFactory.java +++ b/src/main/java/com/github/sardine/model/ObjectFactory.java @@ -284,6 +284,10 @@ public SyncCollection createSyncCollection() { return new SyncCollection(); } + public VersionTree createVersionTree() { + return new VersionTree(); + } + /** * Create an instance of {@link Limit } * diff --git a/src/main/java/com/github/sardine/model/VersionTree.java b/src/main/java/com/github/sardine/model/VersionTree.java new file mode 100644 index 00000000..a906af9b --- /dev/null +++ b/src/main/java/com/github/sardine/model/VersionTree.java @@ -0,0 +1,38 @@ +package com.github.sardine.model; + +import jakarta.xml.bind.annotation.*; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "prop" +}) +@XmlRootElement(name = "version-tree") +public class VersionTree { + + @XmlElement + protected Prop prop; + + /** + * Gets the value of the prop property. + * + * @return + * possible object is + * {@link Prop } + * + */ + public Prop getProp() { + return prop; + } + + /** + * Sets the value of the prop property. + * + * @param value + * allowed object is + * {@link Prop } + * + */ + public void setProp(Prop value) { + this.prop = value; + } +} diff --git a/src/main/java/com/github/sardine/report/VersionTreeReport.java b/src/main/java/com/github/sardine/report/VersionTreeReport.java new file mode 100644 index 00000000..04b66870 --- /dev/null +++ b/src/main/java/com/github/sardine/report/VersionTreeReport.java @@ -0,0 +1,59 @@ +package com.github.sardine.report; + +import com.github.sardine.DavResource; +import com.github.sardine.model.*; +import com.github.sardine.util.SardineUtil; +import org.w3c.dom.Element; + +import javax.xml.namespace.QName; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.logging.Logger; + +public class VersionTreeReport extends SardineReport> +{ + + private static final Logger log = Logger.getLogger(SardineReport.class.getName()); + + private final Set properties; + + public VersionTreeReport(Set properties) + { + this.properties = properties; + } + + @Override + public Object toJaxb() + { + Prop prop = new Prop(); + List any = prop.getAny(); + for (QName entry : properties) + { + any.add(SardineUtil.createElement(entry)); + } + + VersionTree versionTree = new VersionTree(); + versionTree.setProp(prop); + return versionTree; + } + + @Override + public List fromMultistatus(Multistatus multistatus) + { + List responses = multistatus.getResponse(); + List resources = new ArrayList(responses.size()); + for (Response response : responses) { + try + { + resources.add(new DavResource(response)); + } + catch (URISyntaxException e) + { + log.warning(String.format("Ignore resource with invalid URI %s", response.getHref().get(0))); + } + } + return resources; + } +} diff --git a/webdav.xsd b/webdav.xsd index e7443f71..e9c3c8cf 100644 --- a/webdav.xsd +++ b/webdav.xsd @@ -400,6 +400,14 @@ + + + + + + + +