Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
File Repository
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
File Repository
Commits
d514b734
Commit
d514b734
authored
Oct 25, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Thumbnail generation
- ImageGallery aspects fire before bytes are stored
parent
eeb3df10
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
.../filerepository/service/impl/ImageGalleryServiceImpl.java
+2
-2
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
...ys/filerepository/service/impl/RepositoryServiceImpl.java
+7
-4
file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
...ys/filerepository/service/ImageGalleryThumbnailsTest.java
+2
-2
No files found.
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
View file @
d514b734
...
...
@@ -250,10 +250,10 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
for
(
int
thumbSize:
thumbnailSizes
)
{
ensureThumbnail
(
thumbSize
,
thumbSize
,
repositoryImage
,
()
->
{
if
(
cache
[
0
]
!=
null
)
{
LOG
.
warn
(
"Using cached image bytes for {}"
,
repositoryImage
.
get
Path
());
LOG
.
debug
(
"Using cached image bytes for {}"
,
repositoryImage
.
getStorage
Path
());
return
cache
[
0
];
}
else
{
LOG
.
warn
(
"Must load image bytes for {}"
,
repositoryImage
.
get
Path
());
LOG
.
info
(
"Must load image bytes for {}"
,
repositoryImage
.
getStorage
Path
());
return
cache
[
0
]
=
bytesStorageService
.
get
(
repositoryImage
.
storagePath
());
}
});
...
...
file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
View file @
d514b734
...
...
@@ -232,8 +232,11 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
repositoryImage
.
setContentType
(
contentType
);
fillImageProperties
(
repositoryImage
,
bytes
);
repositoryImage
=
repositoryImagePersistence
.
save
(
repositoryImage
);
// We need the UUID before we save bytes
if
(
repositoryImage
.
getUuid
()
==
null
)
{
repositoryImage
.
setUuid
(
UUID
.
randomUUID
());
}
try
{
bytesStorageService
.
upsert
(
repositoryImage
.
storagePath
(),
bytes
);
...
...
@@ -244,7 +247,7 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
throw
e
;
}
return
repositoryImage
;
return
repositoryImage
Persistence
.
save
(
repositoryImage
)
;
}
/**
...
...
@@ -591,7 +594,7 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
try
{
List
<
String
>
thumbnails
=
bytesStorageService
.
listFiles
(
path
);
for
(
String
thumb
:
thumbnails
)
{
System
.
err
.
println
(
"Should remove "
+
thumb
+
" from "
+
path
.
resolve
(
thumb
));
LOG
.
debug
(
"Removing thumbnail at {}"
,
path
.
resolve
(
thumb
));
try
{
bytesStorageService
.
remove
(
path
.
resolve
(
thumb
));
}
catch
(
IOException
e
)
{
...
...
file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
View file @
d514b734
...
...
@@ -116,11 +116,11 @@ public class ImageGalleryThumbnailsTest extends RepositoryServiceTest {
@Test
public
void
testThumbnails1
()
throws
InvalidRepositoryPathException
,
InvalidRepositoryFileDataException
,
NoSuchRepositoryFileException
,
IOException
{
final
ImageGallery
imageGallery
=
imageGalleryService
.
createImageGallery
(
initialPath
,
DEFAULT_GALLERY_TITLE
,
DEFAULT_GALLERY_DESCRIPTION
);
imageGalleryService
.
createImageGallery
(
initialPath
,
DEFAULT_GALLERY_TITLE
,
DEFAULT_GALLERY_DESCRIPTION
);
final
TestImage
image1
=
new
TestImage
(
"maize.jpg"
,
"image/jpg"
);
final
RepositoryImage
repoImage1
=
fileRepoService
.
addImage
(
initialPath
,
image1
.
getOriginalFilename
(),
image1
.
getContentType
(),
image1
.
getImageBytes
(),
null
);
final
byte
[]
thumbBytes1
=
bytesStorageService
.
get
(
Paths
.
get
(
ImageGalleryService
.
THUMB_PATH
,
repoImage1
.
getThumbnailPath
(),
"200x200"
+
".png"
));
assertThat
(
"Thumbnail must not be null"
,
thumbBytes1
,
notNullValue
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment