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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
File Repository
Commits
237b4ad2
Commit
237b4ad2
authored
Jul 18, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix table names for hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy
parent
5d0ada75
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
23 deletions
+19
-23
file-repository-core/src/main/java/org/genesys/filerepository/model/ImageGallery.java
...n/java/org/genesys/filerepository/model/ImageGallery.java
+4
-2
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryDocument.java
.../org/genesys/filerepository/model/RepositoryDocument.java
+2
-6
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java
...java/org/genesys/filerepository/model/RepositoryFile.java
+4
-4
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryImage.java
...ava/org/genesys/filerepository/model/RepositoryImage.java
+1
-2
file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java
...ilerepository/persistence/RepositoryImagePersistence.java
+5
-6
file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java
...org/genesys/filerepository/service/RepositoryService.java
+3
-3
No files found.
file-repository-core/src/main/java/org/genesys/filerepository/model/ImageGallery.java
View file @
237b4ad2
...
...
@@ -27,6 +27,7 @@ import javax.persistence.JoinTable;
import
javax.persistence.Lob
;
import
javax.persistence.ManyToMany
;
import
javax.persistence.OrderColumn
;
import
javax.persistence.Table
;
import
org.genesys.blocks.model.AuditedVersionedModel
;
import
org.genesys.blocks.model.Copyable
;
...
...
@@ -44,7 +45,8 @@ import org.hibernate.annotations.Type;
*
* @author mobreza
*/
@Entity
(
name
=
"RepositoryGallery"
)
@Entity
@Table
(
name
=
"repository_gallery"
)
public
class
ImageGallery
extends
AuditedVersionedModel
implements
AclAwareModel
,
Copyable
<
ImageGallery
>
{
/** The Constant serialVersionUID. */
...
...
@@ -72,7 +74,7 @@ public class ImageGallery extends AuditedVersionedModel implements AclAwareModel
/** The images. */
@ManyToMany
(
cascade
=
{
CascadeType
.
REFRESH
})
@JoinTable
(
name
=
"
RepositoryGalleryI
mage"
,
joinColumns
=
@JoinColumn
(
name
=
"galleryId"
),
inverseJoinColumns
=
@JoinColumn
(
name
=
"imageId"
))
@JoinTable
(
name
=
"
repository_gallery_i
mage"
,
joinColumns
=
@JoinColumn
(
name
=
"galleryId"
),
inverseJoinColumns
=
@JoinColumn
(
name
=
"imageId"
))
@OrderColumn
(
name
=
"position"
)
private
List
<
RepositoryImage
>
images
;
...
...
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryDocument.java
View file @
237b4ad2
...
...
@@ -23,19 +23,15 @@ import javax.persistence.PrePersist;
import
javax.persistence.Table
;
import
org.genesys.filerepository.metadata.DocumentMetadata
;
import
org.genesys.filerepository.metadata.ImageMetadata
;
import
org.hibernate.annotations.Type
;
// TODO: Auto-generated Javadoc
/**
* An {@link RepositoryDocument} is an graphics file in one of the supported
* image formats (PNG and JPG). It extends the {@link RepositoryFile} by
* including image-specific metadata defined in {@link ImageMetadata}.
* An {@link RepositoryDocument} is a text document in the repository.
*
* @author mobreza
*/
@Entity
@Table
@Table
(
name
=
"repository_document"
)
public
class
RepositoryDocument
extends
RepositoryFile
implements
DocumentMetadata
{
/** The Constant serialVersionUID. */
...
...
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java
View file @
237b4ad2
...
...
@@ -48,7 +48,7 @@ import org.hibernate.annotations.Type;
* The RepositoryFile.
*/
@Entity
@Table
(
name
=
"
RepositoryF
ile"
,
@Table
(
name
=
"
repository_f
ile"
,
// indexes
indexes
=
{
@Index
(
unique
=
false
,
columnList
=
"path"
,
name
=
"IX_repoFile_path"
)
}
// unique
...
...
@@ -61,7 +61,7 @@ public class RepositoryFile extends AuditedVersionedModelWithoutId implements Ac
/** The id. */
@Id
@GeneratedValue
(
strategy
=
GenerationType
.
AUTO
)
@GeneratedValue
(
strategy
=
GenerationType
.
TABLE
)
@Column
(
unique
=
true
,
nullable
=
false
,
length
=
20
)
private
Long
id
=
InMemoryIdGenerator
.
nextId
();
...
...
@@ -72,11 +72,11 @@ public class RepositoryFile extends AuditedVersionedModelWithoutId implements Ac
/** The path. */
// Path in the repository
@Column
(
nullable
=
false
)
@Column
(
nullable
=
false
,
length
=
250
)
private
String
path
;
/** The original filename as provided by the end user. */
@Column
(
nullable
=
false
)
@Column
(
nullable
=
false
,
length
=
250
)
private
String
originalFilename
;
/** Extension based on originalFilename. */
...
...
file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryImage.java
View file @
237b4ad2
...
...
@@ -26,7 +26,6 @@ import javax.persistence.Transient;
import
org.genesys.filerepository.metadata.ImageMetadata
;
// TODO: Auto-generated Javadoc
/**
* An {@link RepositoryImage} is an graphics file in one of the supported image
* formats (PNG and JPG). It extends the {@link RepositoryFile} by including
...
...
@@ -35,7 +34,7 @@ import org.genesys.filerepository.metadata.ImageMetadata;
* @author mobreza
*/
@Entity
@Table
@Table
(
name
=
"repository_image"
)
public
class
RepositoryImage
extends
RepositoryFile
implements
ImageMetadata
{
/** The Constant serialVersionUID. */
...
...
file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java
View file @
237b4ad2
...
...
@@ -20,7 +20,6 @@ import java.util.List;
import
java.util.UUID
;
import
org.genesys.filerepository.RepositoryPersistence
;
import
org.genesys.filerepository.model.RepositoryFile
;
import
org.genesys.filerepository.model.RepositoryImage
;
import
org.springframework.stereotype.Repository
;
...
...
@@ -40,11 +39,11 @@ public interface RepositoryImagePersistence extends RepositoryPersistence<Reposi
RepositoryImage
findByUuid
(
UUID
uuid
);
/**
* Find by uuid and version
*
* @param fileUuid
* @param version
* @return
* Find by uuid and version
.
*
* @param fileUuid
the file uuid
* @param version
the version
* @return
the repository image
*/
RepositoryImage
findByUuidAndVersion
(
UUID
fileUuid
,
int
version
);
...
...
file-repository-core/src/main/java/org/genesys/filerepository/service/RepositoryService.java
View file @
237b4ad2
...
...
@@ -81,8 +81,9 @@ public interface RepositoryService {
RepositoryFile
getFile
(
UUID
fileUuid
)
throws
NoSuchRepositoryFileException
;
/**
* Get repository file by its UUID and version
* Get repository file by its UUID and version
.
*
* @param <T> the generic type
* @param fileUuid the file uuid
* @param version the record version
* @return the file
...
...
@@ -140,7 +141,6 @@ public interface RepositoryService {
* Update file metadata. The update is based on the record UUID.
*
* @param <T> the generic type
* @param uuid UUID of the repository file
* @param fileData the file data
* @return the updated RepositoryFile
* @throws NoSuchRepositoryFileException when file is not available in the
...
...
@@ -151,6 +151,7 @@ public interface RepositoryService {
/**
* Update file bytes.
*
* @param <T> the generic type
* @param fileData the file data
* @param contentType the content type
* @param bytes the data
...
...
@@ -239,7 +240,6 @@ public interface RepositoryService {
/**
* Update image metadata. The update is based on the record UUID.
*
* @param uuid Repository image UUID
* @param imageData the file metadata
* @return the updated metadata
* @throws NoSuchRepositoryFileException when file is not available in the
...
...
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