Skip to content

Feature/3204 generic s3 input output options #51

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

Open
SInCE wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Feature/3204 generic s3 input output options #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6ea0f9
Updated generic S3 Input/Output properties (added ssl, s3signatureVer…
SInCE Aug 13, 2018
afca2e3
added example for generic S3 Input/Output encoding
SInCE Aug 13, 2018
1ad625e
added "signature version" settings to generic s3 example
SInCE Aug 13, 2018
ec7229e
added "ssl" settings to generic s3 example
SInCE Aug 13, 2018
7975dd8
added "port" settings to generic s3 example
SInCE Aug 13, 2018
130f099
added "encoderVersion" settings to generic s3 example
SInCE Aug 13, 2018
2da094e
renamed generic S3 example
SInCE Aug 13, 2018
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
10 changes: 10 additions & 0 deletions src/main/java/com/bitmovin/api/encoding/S3SignatureVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.bitmovin.api.encoding;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public enum S3SignatureVersion
{
S3_V2,
S3_V4
}
29 changes: 29 additions & 0 deletions src/main/java/com/bitmovin/api/encoding/inputs/GenericS3Input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.bitmovin.api.encoding.inputs;

import com.bitmovin.api.encoding.S3SignatureVersion;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Created by dmoser on 02.02.17.
*/
Expand All @@ -11,6 +14,12 @@ public class GenericS3Input extends Input
private String host;
private Integer port;

@JsonProperty(value = "signatureVersion")
private S3SignatureVersion signatureVersion;

@JsonProperty(value = "ssl")
private Boolean ssl;

public GenericS3Input()
{
super();
Expand Down Expand Up @@ -66,4 +75,24 @@ public void setPort(Integer port)
{
this.port = port;
}

public S3SignatureVersion getSignatureVersion()
{
return this.signatureVersion;
}

public void setSignatureVersion(S3SignatureVersion signatureVersion)
{
this.signatureVersion = signatureVersion;
}

public Boolean getSsl()
{
return this.ssl;
}

public void setSsl(Boolean ssl)
{
this.ssl = ssl;
}
}
29 changes: 29 additions & 0 deletions src/main/java/com/bitmovin/api/encoding/outputs/GenericS3Output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.bitmovin.api.encoding.outputs;

import com.bitmovin.api.encoding.S3SignatureVersion;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Created by dmoser on 02.02.17.
*/
Expand All @@ -11,6 +14,12 @@ public class GenericS3Output extends Output
private String host;
private Integer port;

@JsonProperty(value = "signatureVersion")
private S3SignatureVersion signatureVersion;

@JsonProperty(value = "ssl")
private Boolean ssl;

public GenericS3Output()
{
this.setType(OutputType.GENERIC_S3);
Expand Down Expand Up @@ -65,4 +74,24 @@ public void setPort(Integer port)
{
this.port = port;
}

public S3SignatureVersion getSignatureVersion()
{
return this.signatureVersion;
}

public void setSignatureVersion(S3SignatureVersion signatureVersion)
{
this.signatureVersion = signatureVersion;
}

public Boolean getSsl()
{
return this.ssl;
}

public void setSsl(Boolean ssl)
{
this.ssl = ssl;
}
}
Loading