Skip to content

move to simple-xml-safe #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2020
Merged

move to simple-xml-safe #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions api/src/main/java/io/minio/SelectResponseStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.zip.CRC32;
import org.xmlpull.v1.XmlPullParserException;

/** Select object content response stream. */
public class SelectResponseStream extends InputStream {
Expand Down Expand Up @@ -85,8 +84,7 @@ private Map<String, String> decodeHeaderData(ByteArrayInputStream bais) throws I
return headerMap;
}

private boolean populate()
throws EOFException, IOException, InternalException, MinioException, XmlPullParserException {
private boolean populate() throws EOFException, IOException, InternalException, MinioException {
ByteStreams.readFully(inputStream, prelude);
ByteStreams.readFully(inputStream, preludeCrc);
crcHasher.reset();
Expand Down Expand Up @@ -173,7 +171,7 @@ public int read() throws IOException {
;
} catch (EOFException e) {
return -1;
} catch (MinioException | XmlPullParserException e) {
} catch (MinioException e) {
throw new IOException(e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ apply plugin: 'io.codearte.nexus-staging'

allprojects {
group = 'io.minio'
version = '7.0.3'
version = '7.1.0'
if (!project.hasProperty('release')) {
version += '-DEV'
}
Expand All @@ -48,7 +48,7 @@ subprojects {
}

dependencies {
compile "org.simpleframework:simple-xml:2.7.1"
compile "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1"
compile "com.google.guava:guava:25.1-jre"
compile "com.squareup.okhttp3:okhttp:3.13.1"
compile "com.squareup.okio:okio:1.17.2"
Expand Down
3 changes: 1 addition & 2 deletions examples/BucketExists.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class BucketExists {
/** MinioClient.bucketExists() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ComposeObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import org.xmlpull.v1.XmlPullParserException;

public class ComposeObject {
/** MinioClient.composeObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.minio.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ComposeObjectEncrypted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
import java.util.ArrayList;
import java.util.List;
import javax.crypto.spec.SecretKeySpec;
import org.xmlpull.v1.XmlPullParserException;

public class ComposeObjectEncrypted {
/** MinioClient.composeObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.minio.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/CopyObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class CopyObject {
/** MinioClient.copyObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/CopyObjectEncrypted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import javax.crypto.spec.SecretKeySpec;
import org.xmlpull.v1.XmlPullParserException;

public class CopyObjectEncrypted {
/** MinioClient.copyObject() example using SSE_C. */
public static void main(String[] args)
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/CopyObjectEncryptedKms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
import org.xmlpull.v1.XmlPullParserException;

public class CopyObjectEncryptedKms {
/** MinioClient.copyObject() example using SSE_KMS. */
public static void main(String[] args)
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/CopyObjectEncryptedS3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class CopyObjectEncryptedS3 {
/** MinioClient.copyObject() example using SSE_S3. */
public static void main(String[] args)
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/CopyObjectMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
import org.xmlpull.v1.XmlPullParserException;

public class CopyObjectMetadata {
/** MinioClient.copyObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/DeleteBucketLifeCycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class DeleteBucketLifeCycle {
/** MinioClient.DeleteBucketLifeCycle() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* Amazon S3: */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/DownloadObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class DownloadObject {
/** MinioClient.getObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
9 changes: 4 additions & 5 deletions examples/EnableDisableObjectLegalHold.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,17 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class EnableDisableObjectLegalHold {
/**
* MinioClient.enableObjectLegalHold() example. MinioClient.disableObjectLegalHold() example.
* MinioClient.isObjectLegalHoldEnabled() example.
*/
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException,
InvalidResponseException, InsufficientDataException, InternalException,
ErrorResponseException, InvalidBucketNameException, InvalidPortException,
InvalidEndpointException, RegionConflictException, IllegalArgumentException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException,
InsufficientDataException, InternalException, ErrorResponseException,
InvalidBucketNameException, InvalidPortException, InvalidEndpointException,
RegionConflictException, IllegalArgumentException {
try {

/* play.min.io for test and development. */
Expand Down
3 changes: 1 addition & 2 deletions examples/GetBucketLifeCycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class GetBucketLifeCycle {
/** MinioClient.getBucketLifecycle() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* Amazon S3: */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/GetBucketNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class GetBucketNotification {
/** MinioClient.getBucketNotification() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/GetBucketPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class GetBucketPolicy {
/** MinioClient.getBucketPolicy() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/GetObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class GetObject {
/** MinioClient.getObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/GetObjectProgressBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import me.tongfei.progressbar.ProgressBarStyle;
import org.xmlpull.v1.XmlPullParserException;

public class GetObjectProgressBar {
/** MinioClient.getObjectProgressBar() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/GetPartialObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class GetPartialObject {
/** MinioClient.getObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ListBuckets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.List;
import org.xmlpull.v1.XmlPullParserException;

public class ListBuckets {
/** MinioClient.listBuckets() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ListIncompleteUploads.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class ListIncompleteUploads {
/** MinioClient.listIncompleteUploads() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ListObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class ListObjects {
/** MinioClient.listObjects() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/ListenBucketNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class ListenBucketNotification {
/** MinioClient.listenBucketNotification() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/MakeBucket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class MakeBucket {
/** MinioClient.makeBucket() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
3 changes: 1 addition & 2 deletions examples/MakeBucketWithLock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class MakeBucketWithLock {
/** MinioClient.makeBucket() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {

/* Amazon S3: */
Expand Down
3 changes: 1 addition & 2 deletions examples/PresignedGetObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import org.xmlpull.v1.XmlPullParserException;

public class PresignedGetObject {
/** MinioClient.presignedGetObject() example. */
public static void main(String[] args)
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
try {
/* play.min.io for test and development. */
MinioClient minioClient =
Expand Down
Loading