-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix-1.10.x' into hotfix-2.0.x
- Loading branch information
Showing
21 changed files
with
676 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Core: More NPE occurrences during the massive concurrent publishing process have been fixes. |
18 changes: 18 additions & 0 deletions
18
...i/request/api/v2/{project}/nodes/{nodeUuid}/binary/{fieldName}/variants/request-body.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "variants" : [ { | ||
| "width" : "auto", | ||
| "height" : "100", | ||
| "resizeMode" : "SMART", | ||
| "cacheKey" : "resizeSMARTrwautorh100" | ||
| }, { | ||
| "resizeMode" : "SMART", | ||
| "focalPoint" : { | ||
| "x" : 0.3, | ||
| "y" : 0.3 | ||
| }, | ||
| "focalZoom" : 0.6, | ||
| "focalPointZoom" : 0.6, | ||
| "cacheKey" : "resizeSMARTfp0.3-0.3fpz0.6" | ||
| } ], | ||
| "deleteOther" : false | ||
| } |
97 changes: 97 additions & 0 deletions
97
...request/api/v2/{project}/nodes/{nodeUuid}/binary/{fieldName}/variants/request-schema.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageManipulationRequest", | ||
| "properties" : { | ||
| "variants" : { | ||
| "type" : "array", | ||
| "description" : "This field contains a set of image manipulation variants to be manipulated upon.", | ||
| "items" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageVariantRequest", | ||
| "properties" : { | ||
| "width" : { | ||
| "type" : "string", | ||
| "description" : "Desired image width. Set to 'auto' to compute automatically from the image height and ratio." | ||
| }, | ||
| "height" : { | ||
| "type" : "string", | ||
| "description" : "Desired image height. Set to 'auto' to compute automatically from the image width and ratio." | ||
| }, | ||
| "rect" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:parameter:image:ImageRect", | ||
| "description" : "Desired image crop parameters.", | ||
| "properties" : { | ||
| "startX" : { | ||
| "type" : "integer" | ||
| }, | ||
| "startY" : { | ||
| "type" : "integer" | ||
| }, | ||
| "width" : { | ||
| "type" : "integer" | ||
| }, | ||
| "height" : { | ||
| "type" : "integer" | ||
| } | ||
| } | ||
| }, | ||
| "cropMode" : { | ||
| "type" : "string", | ||
| "description" : "The image crop mode.", | ||
| "enum" : [ "RECT", "FOCALPOINT" ] | ||
| }, | ||
| "resizeMode" : { | ||
| "type" : "string", | ||
| "description" : "The image resize mode.", | ||
| "enum" : [ "FORCE", "SMART", "PROP" ] | ||
| }, | ||
| "focalPoint" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:FocalPoint", | ||
| "description" : "The image focal point, containing factors of the image width/height. The value 0.5 is the center of the image.", | ||
| "properties" : { | ||
| "x" : { | ||
| "type" : "number", | ||
| "description" : "The horizontal position of the focal point. The value is a factor of the image width. The value 0.5 is the center of the image." | ||
| }, | ||
| "y" : { | ||
| "type" : "number", | ||
| "description" : "The vertical position of the focal point. The value is a factor of the image height. The value 0.5 is the center of the image." | ||
| } | ||
| } | ||
| }, | ||
| "focalZoom" : { | ||
| "type" : "number", | ||
| "description" : "The image focal point zoom factor." | ||
| }, | ||
| "focalPointZoom" : { | ||
| "type" : "number" | ||
| }, | ||
| "size" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:Point", | ||
| "properties" : { | ||
| "x" : { | ||
| "type" : "integer" | ||
| }, | ||
| "y" : { | ||
| "type" : "integer" | ||
| }, | ||
| "ratio" : { | ||
| "type" : "number" | ||
| } | ||
| } | ||
| }, | ||
| "cacheKey" : { | ||
| "type" : "string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "deleteOther" : { | ||
| "type" : "boolean", | ||
| "description" : "This flag states that all the existing variants, except the mentioned in `variants` field, should be dropped.If no variants are provided along with the flag, all the image manipulation variants are to be dropped." | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
.../docs/generated/api/request/api/v2/{project}/nodes/{nodeUuid}/published/request-body.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "imageVariants" : { | ||
| "binaryField" : { | ||
| "variants" : [ { | ||
| "width" : "250", | ||
| "height" : "auto", | ||
| "cropMode" : "FOCALPOINT", | ||
| "resizeMode" : "SMART", | ||
| "focalPoint" : { | ||
| "x" : 0.5, | ||
| "y" : 0.5 | ||
| }, | ||
| "cacheKey" : "cropFOCALPOINTresizeSMARTrw250rhautofp0.5-0.5" | ||
| }, { | ||
| "width" : "500", | ||
| "height" : "100", | ||
| "resizeMode" : "SMART", | ||
| "size" : { | ||
| "x" : 500, | ||
| "y" : 100, | ||
| "ratio" : 5.0 | ||
| }, | ||
| "cacheKey" : "resizeSMARTrw500rh100" | ||
| } ], | ||
| "deleteOther" : true | ||
| } | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
...ocs/generated/api/request/api/v2/{project}/nodes/{nodeUuid}/published/request-schema.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:NodePublishRequest", | ||
| "properties" : { | ||
| "imageVariants" : { | ||
| "type" : "object", | ||
| "required" : true, | ||
| "description" : "If a binary image is to be published, this field contains a set of image manipulation variants to be created immediately", | ||
| "additionalProperties" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageManipulationRequest", | ||
| "properties" : { | ||
| "variants" : { | ||
| "type" : "array", | ||
| "description" : "This field contains a set of image manipulation variants to be manipulated upon.", | ||
| "items" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageVariantRequest", | ||
| "properties" : { | ||
| "width" : { | ||
| "type" : "string", | ||
| "description" : "Desired image width. Set to 'auto' to compute automatically from the image height and ratio." | ||
| }, | ||
| "height" : { | ||
| "type" : "string", | ||
| "description" : "Desired image height. Set to 'auto' to compute automatically from the image width and ratio." | ||
| }, | ||
| "rect" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:parameter:image:ImageRect", | ||
| "description" : "Desired image crop parameters.", | ||
| "properties" : { | ||
| "startX" : { | ||
| "type" : "integer" | ||
| }, | ||
| "startY" : { | ||
| "type" : "integer" | ||
| }, | ||
| "width" : { | ||
| "type" : "integer" | ||
| }, | ||
| "height" : { | ||
| "type" : "integer" | ||
| } | ||
| } | ||
| }, | ||
| "cropMode" : { | ||
| "type" : "string", | ||
| "description" : "The image crop mode.", | ||
| "enum" : [ "RECT", "FOCALPOINT" ] | ||
| }, | ||
| "resizeMode" : { | ||
| "type" : "string", | ||
| "description" : "The image resize mode.", | ||
| "enum" : [ "FORCE", "SMART", "PROP" ] | ||
| }, | ||
| "focalPoint" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:FocalPoint", | ||
| "description" : "The image focal point, containing factors of the image width/height. The value 0.5 is the center of the image.", | ||
| "properties" : { | ||
| "x" : { | ||
| "type" : "number", | ||
| "description" : "The horizontal position of the focal point. The value is a factor of the image width. The value 0.5 is the center of the image." | ||
| }, | ||
| "y" : { | ||
| "type" : "number", | ||
| "description" : "The vertical position of the focal point. The value is a factor of the image height. The value 0.5 is the center of the image." | ||
| } | ||
| } | ||
| }, | ||
| "focalZoom" : { | ||
| "type" : "number", | ||
| "description" : "The image focal point zoom factor." | ||
| }, | ||
| "focalPointZoom" : { | ||
| "type" : "number" | ||
| }, | ||
| "size" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:Point", | ||
| "properties" : { | ||
| "x" : { | ||
| "type" : "integer" | ||
| }, | ||
| "y" : { | ||
| "type" : "integer" | ||
| }, | ||
| "ratio" : { | ||
| "type" : "number" | ||
| } | ||
| } | ||
| }, | ||
| "cacheKey" : { | ||
| "type" : "string" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "deleteOther" : { | ||
| "type" : "boolean", | ||
| "description" : "This flag states that all the existing variants, except the mentioned in `variants` field, should be dropped.If no variants are provided along with the flag, all the image manipulation variants are to be dropped." | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...i/response/api/v2/{project}/nodes/{nodeUuid}/binary/{fieldName}/variants/200/example.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "variants" : [ { | ||
| "width" : 500, | ||
| "height" : 100, | ||
| "origin" : true, | ||
| "auto" : false | ||
| }, { | ||
| "rect" : { | ||
| "startX" : 10, | ||
| "startY" : 10, | ||
| "width" : 20, | ||
| "height" : 20 | ||
| }, | ||
| "cropMode" : "RECT", | ||
| "origin" : false, | ||
| "auto" : false | ||
| }, { | ||
| "height" : 50, | ||
| "origin" : false, | ||
| "auto" : false | ||
| } ] | ||
| } |
84 changes: 84 additions & 0 deletions
84
...nse/api/v2/{project}/nodes/{nodeUuid}/binary/{fieldName}/variants/200/request-schema.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageVariantsResponse", | ||
| "properties" : { | ||
| "variants" : { | ||
| "type" : "array", | ||
| "description" : "List of image manipulation variants.", | ||
| "items" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:ImageVariantResponse", | ||
| "properties" : { | ||
| "width" : { | ||
| "type" : "integer", | ||
| "description" : "Image width." | ||
| }, | ||
| "height" : { | ||
| "type" : "integer", | ||
| "description" : "Image height." | ||
| }, | ||
| "rect" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:parameter:image:ImageRect", | ||
| "description" : "Image crop parameters.", | ||
| "properties" : { | ||
| "startX" : { | ||
| "type" : "integer" | ||
| }, | ||
| "startY" : { | ||
| "type" : "integer" | ||
| }, | ||
| "width" : { | ||
| "type" : "integer" | ||
| }, | ||
| "height" : { | ||
| "type" : "integer" | ||
| } | ||
| } | ||
| }, | ||
| "cropMode" : { | ||
| "type" : "string", | ||
| "description" : "The image crop mode.", | ||
| "enum" : [ "RECT", "FOCALPOINT" ] | ||
| }, | ||
| "resizeMode" : { | ||
| "type" : "string", | ||
| "description" : "The image resize mode.", | ||
| "enum" : [ "FORCE", "SMART", "PROP" ] | ||
| }, | ||
| "focalPoint" : { | ||
| "type" : "object", | ||
| "id" : "urn:jsonschema:com:gentics:mesh:core:rest:node:field:image:FocalPoint", | ||
| "description" : "The image focal point, containing factors of the image width/height. The value 0.5 is the center of the image.", | ||
| "properties" : { | ||
| "x" : { | ||
| "type" : "number", | ||
| "description" : "The horizontal position of the focal point. The value is a factor of the image width. The value 0.5 is the center of the image." | ||
| }, | ||
| "y" : { | ||
| "type" : "number", | ||
| "description" : "The vertical position of the focal point. The value is a factor of the image height. The value 0.5 is the center of the image." | ||
| } | ||
| } | ||
| }, | ||
| "focalZoom" : { | ||
| "type" : "number", | ||
| "description" : "The image focal point zoom factor." | ||
| }, | ||
| "fileSize" : { | ||
| "type" : "integer", | ||
| "description" : "The image file size." | ||
| }, | ||
| "origin" : { | ||
| "type" : "boolean", | ||
| "description" : "This flag states that this variant is an original image." | ||
| }, | ||
| "auto" : { | ||
| "type" : "boolean", | ||
| "description" : "This flag states that this variant is a proportional (aka 'auto') image." | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
...i/response/api/v2/{project}/nodes/{nodeUuid}/binary/{fieldName}/variants/404/example.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "message" : "I18n message" | ||
| } |
Oops, something went wrong.