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
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
45
Issues
45
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
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
Genesys Backend
Commits
ec10963d
Commit
ec10963d
authored
Jul 18, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved catalog model and JPA repositories to right packages
parent
74eb82e2
Changes
75
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
376 additions
and
352 deletions
+376
-352
.gitignore
.gitignore
+1
-0
pom.xml
pom.xml
+2
-2
src/main/java/org/genesys/catalog/annotations/PublishValidation.java
...va/org/genesys/catalog/annotations/PublishValidation.java
+3
-3
src/main/java/org/genesys/catalog/annotations/PublishValidationException.java
...nesys/catalog/annotations/PublishValidationException.java
+3
-1
src/main/java/org/genesys/catalog/exceptions/InvalidApiUsageException.java
.../genesys/catalog/exceptions/InvalidApiUsageException.java
+1
-1
src/main/java/org/genesys/catalog/exceptions/NotFoundElement.java
.../java/org/genesys/catalog/exceptions/NotFoundElement.java
+1
-1
src/main/java/org/genesys/catalog/model/Partner.java
src/main/java/org/genesys/catalog/model/Partner.java
+4
-4
src/main/java/org/genesys/catalog/model/ShortFilter.java
src/main/java/org/genesys/catalog/model/ShortFilter.java
+1
-1
src/main/java/org/genesys/catalog/model/dataset/AccessionIdentifier.java
...rg/genesys/catalog/model/dataset/AccessionIdentifier.java
+1
-1
src/main/java/org/genesys/catalog/model/dataset/Dataset.java
src/main/java/org/genesys/catalog/model/dataset/Dataset.java
+5
-5
src/main/java/org/genesys/catalog/model/dataset/DatasetCreator.java
...ava/org/genesys/catalog/model/dataset/DatasetCreator.java
+3
-3
src/main/java/org/genesys/catalog/model/dataset/DatasetLocation.java
...va/org/genesys/catalog/model/dataset/DatasetLocation.java
+3
-3
src/main/java/org/genesys/catalog/model/dataset/DatasetVersions.java
...va/org/genesys/catalog/model/dataset/DatasetVersions.java
+2
-2
src/main/java/org/genesys/catalog/model/filters/AccessionIdentifierFilter.java
...esys/catalog/model/filters/AccessionIdentifierFilter.java
+8
-7
src/main/java/org/genesys/catalog/model/filters/ControlledVocabularyFilter.java
...sys/catalog/model/filters/ControlledVocabularyFilter.java
+7
-6
src/main/java/org/genesys/catalog/model/filters/DatasetFilter.java
...java/org/genesys/catalog/model/filters/DatasetFilter.java
+7
-6
src/main/java/org/genesys/catalog/model/filters/DescriptorFilter.java
...a/org/genesys/catalog/model/filters/DescriptorFilter.java
+12
-11
src/main/java/org/genesys/catalog/model/filters/DescriptorListFilter.java
...g/genesys/catalog/model/filters/DescriptorListFilter.java
+6
-5
src/main/java/org/genesys/catalog/model/filters/FilterHelpers.java
...java/org/genesys/catalog/model/filters/FilterHelpers.java
+4
-4
src/main/java/org/genesys/catalog/model/filters/PartnerFilter.java
...java/org/genesys/catalog/model/filters/PartnerFilter.java
+8
-7
src/main/java/org/genesys/catalog/model/traits/Descriptor.java
...ain/java/org/genesys/catalog/model/traits/Descriptor.java
+5
-5
src/main/java/org/genesys/catalog/model/traits/DescriptorList.java
...java/org/genesys/catalog/model/traits/DescriptorList.java
+2
-2
src/main/java/org/genesys/catalog/model/vocab/ControlledVocabulary.java
...org/genesys/catalog/model/vocab/ControlledVocabulary.java
+2
-2
src/main/java/org/genesys/catalog/model/vocab/VocabularyTerm.java
.../java/org/genesys/catalog/model/vocab/VocabularyTerm.java
+2
-2
src/main/java/org/genesys/catalog/persistence/PartnerRepository.java
...va/org/genesys/catalog/persistence/PartnerRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/ShortFilterRepository.java
...rg/genesys/catalog/persistence/ShortFilterRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/dataset/DatasetCreatorRepository.java
...catalog/persistence/dataset/DatasetCreatorRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/dataset/DatasetLocationRepository.java
...atalog/persistence/dataset/DatasetLocationRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/dataset/DatasetRepository.java
...enesys/catalog/persistence/dataset/DatasetRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/dataset/DatasetVersionsRepository.java
...atalog/persistence/dataset/DatasetVersionsRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/traits/DescriptorListRepository.java
.../catalog/persistence/traits/DescriptorListRepository.java
+2
-2
src/main/java/org/genesys/catalog/persistence/traits/DescriptorRepository.java
...esys/catalog/persistence/traits/DescriptorRepository.java
+4
-4
src/main/java/org/genesys/catalog/persistence/vocab/ControlledVocabularyRepository.java
...log/persistence/vocab/ControlledVocabularyRepository.java
+3
-3
src/main/java/org/genesys/catalog/persistence/vocab/VocabularyTermRepository.java
...s/catalog/persistence/vocab/VocabularyTermRepository.java
+2
-2
src/main/java/org/genesys/catalog/server/controller/DescriptorListExporter.java
...sys/catalog/server/controller/DescriptorListExporter.java
+3
-3
src/main/java/org/genesys/catalog/server/controller/api/v0/ApiExceptionHandler.java
...catalog/server/controller/api/v0/ApiExceptionHandler.java
+2
-2
src/main/java/org/genesys/catalog/server/controller/api/v0/DatasetController.java
...s/catalog/server/controller/api/v0/DatasetController.java
+8
-8
src/main/java/org/genesys/catalog/server/controller/api/v0/DatasetCreatorController.java
...og/server/controller/api/v0/DatasetCreatorController.java
+5
-5
src/main/java/org/genesys/catalog/server/controller/api/v0/DatasetFilesController.java
...alog/server/controller/api/v0/DatasetFilesController.java
+3
-3
src/main/java/org/genesys/catalog/server/controller/api/v0/DescriptorController.java
...atalog/server/controller/api/v0/DescriptorController.java
+6
-6
src/main/java/org/genesys/catalog/server/controller/api/v0/DescriptorListController.java
...og/server/controller/api/v0/DescriptorListController.java
+6
-6
src/main/java/org/genesys/catalog/server/controller/api/v0/MetadataController.java
.../catalog/server/controller/api/v0/MetadataController.java
+1
-1
src/main/java/org/genesys/catalog/server/controller/api/v0/PartnerController.java
...s/catalog/server/controller/api/v0/PartnerController.java
+4
-4
src/main/java/org/genesys/catalog/server/controller/api/v0/RepositoryController.java
...atalog/server/controller/api/v0/RepositoryController.java
+2
-2
src/main/java/org/genesys/catalog/service/DatasetCreatorService.java
...va/org/genesys/catalog/service/DatasetCreatorService.java
+4
-4
src/main/java/org/genesys/catalog/service/DatasetService.java
...main/java/org/genesys/catalog/service/DatasetService.java
+7
-7
src/main/java/org/genesys/catalog/service/DescriptorListService.java
...va/org/genesys/catalog/service/DescriptorListService.java
+4
-4
src/main/java/org/genesys/catalog/service/DescriptorService.java
...n/java/org/genesys/catalog/service/DescriptorService.java
+6
-6
src/main/java/org/genesys/catalog/service/FreemarkerTemplating.java
...ava/org/genesys/catalog/service/FreemarkerTemplating.java
+1
-1
src/main/java/org/genesys/catalog/service/LocationService.java
...ain/java/org/genesys/catalog/service/LocationService.java
+4
-4
src/main/java/org/genesys/catalog/service/MetadataService.java
...ain/java/org/genesys/catalog/service/MetadataService.java
+1
-1
src/main/java/org/genesys/catalog/service/PartnerService.java
...main/java/org/genesys/catalog/service/PartnerService.java
+3
-3
src/main/java/org/genesys/catalog/service/PublishValidationInterface.java
...g/genesys/catalog/service/PublishValidationInterface.java
+8
-8
src/main/java/org/genesys/catalog/service/ShortFilterService.java
.../java/org/genesys/catalog/service/ShortFilterService.java
+2
-2
src/main/java/org/genesys/catalog/service/VersionManager.java
...main/java/org/genesys/catalog/service/VersionManager.java
+1
-1
src/main/java/org/genesys/catalog/service/VocabularyService.java
...n/java/org/genesys/catalog/service/VocabularyService.java
+5
-5
src/main/java/org/genesys/catalog/service/impl/DatasetCreatorServiceImpl.java
...nesys/catalog/service/impl/DatasetCreatorServiceImpl.java
+16
-15
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
.../org/genesys/catalog/service/impl/DatasetServiceImpl.java
+25
-19
src/main/java/org/genesys/catalog/service/impl/DescriptorListServiceImpl.java
...nesys/catalog/service/impl/DescriptorListServiceImpl.java
+24
-17
src/main/java/org/genesys/catalog/service/impl/DescriptorServiceImpl.java
...g/genesys/catalog/service/impl/DescriptorServiceImpl.java
+24
-22
src/main/java/org/genesys/catalog/service/impl/FreemarkerTemplatingServiceImpl.java
...catalog/service/impl/FreemarkerTemplatingServiceImpl.java
+2
-2
src/main/java/org/genesys/catalog/service/impl/LocationServiceImpl.java
...org/genesys/catalog/service/impl/LocationServiceImpl.java
+13
-13
src/main/java/org/genesys/catalog/service/impl/MetadataServiceImpl.java
...org/genesys/catalog/service/impl/MetadataServiceImpl.java
+10
-13
src/main/java/org/genesys/catalog/service/impl/PartnerServiceImpl.java
.../org/genesys/catalog/service/impl/PartnerServiceImpl.java
+10
-10
src/main/java/org/genesys/catalog/service/impl/ShortFilterServiceImpl.java
.../genesys/catalog/service/impl/ShortFilterServiceImpl.java
+13
-12
src/main/java/org/genesys/catalog/service/impl/VersionManagerImpl.java
.../org/genesys/catalog/service/impl/VersionManagerImpl.java
+5
-5
src/main/java/org/genesys/catalog/service/impl/VocabularyServiceImpl.java
...g/genesys/catalog/service/impl/VocabularyServiceImpl.java
+17
-16
src/main/java/org/genesys/catalog/service/worker/DavrosCountrySource.java
...g/genesys/catalog/service/worker/DavrosCountrySource.java
+2
-2
src/main/java/org/genesys/catalog/service/worker/GeonamesISOLanguageSource.java
...sys/catalog/service/worker/GeonamesISOLanguageSource.java
+1
-1
src/main/java/org/genesys/catalog/service/worker/ISO3166VocabularyUpdater.java
...esys/catalog/service/worker/ISO3166VocabularyUpdater.java
+3
-3
src/main/java/org/genesys/catalog/service/worker/ISO639VocabularyUpdater.java
...nesys/catalog/service/worker/ISO639VocabularyUpdater.java
+3
-3
src/main/java/org/genesys/catalog/service/worker/WiewsVocabularySource.java
...genesys/catalog/service/worker/WiewsVocabularySource.java
+1
-1
src/main/java/org/genesys/catalog/service/worker/WiewsVocabularyUpdater.java
...enesys/catalog/service/worker/WiewsVocabularyUpdater.java
+3
-3
src/main/java/org/genesys2/spring/config/DatabaseConfig.java
src/main/java/org/genesys2/spring/config/DatabaseConfig.java
+1
-1
src/main/java/org/genesys2/spring/config/WebConfiguration.java
...ain/java/org/genesys2/spring/config/WebConfiguration.java
+1
-1
No files found.
.gitignore
View file @
ec10963d
...
...
@@ -25,3 +25,4 @@ npm-debug.log
.pmd
node_tmp
effective.pom
src/main/resources/genesys.properties
pom.xml
View file @
ec10963d
...
...
@@ -581,8 +581,8 @@
<!-- List packages to be processed -->
<include>
org.genesys2.server.model
</include>
<include>
org.genesys2.server.model.*
</include>
<include>
org.genesys.catalog.
server.
model
</include>
<include>
org.genesys.catalog.
server.
model.*
</include>
<include>
org.genesys.catalog.model
</include>
<include>
org.genesys.catalog.model.*
</include>
</includes>
<outputDirectory>
target/generated-sources/querydsl
</outputDirectory>
<processor>
com.querydsl.apt.jpa.JPAAnnotationProcessor
</processor>
...
...
src/main/java/org/genesys/catalog/
server/
annotations/PublishValidation.java
→
src/main/java/org/genesys/catalog/annotations/PublishValidation.java
View file @
ec10963d
...
...
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.annotations
;
import
org.genesys.catalog.server.service.PublishValidationInterface
;
package
org.genesys.catalog.annotations
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
org.genesys.catalog.service.PublishValidationInterface
;
import
static
java
.
lang
.
annotation
.
ElementType
.
FIELD
;
/**
...
...
src/main/java/org/genesys/catalog/
server/excep
tions/PublishValidationException.java
→
src/main/java/org/genesys/catalog/
annota
tions/PublishValidationException.java
View file @
ec10963d
...
...
@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.excep
tions
;
package
org.genesys.catalog.
annota
tions
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.genesys.catalog.exceptions.InvalidApiUsageException
;
/**
* The Class PublishValidationException.
*
...
...
src/main/java/org/genesys/catalog/
server/
exceptions/InvalidApiUsageException.java
→
src/main/java/org/genesys/catalog/exceptions/InvalidApiUsageException.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
exceptions
;
package
org.genesys.catalog.exceptions
;
/**
* Parent exception for cases where data does not match business logic.
...
...
src/main/java/org/genesys/catalog/
server/
exceptions/NotFoundElement.java
→
src/main/java/org/genesys/catalog/exceptions/NotFoundElement.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
exceptions
;
package
org.genesys.catalog.exceptions
;
/**
* This exception should generate when some element not found somewhere.
...
...
src/main/java/org/genesys/catalog/
server/
model/Partner.java
→
src/main/java/org/genesys/catalog/model/Partner.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model
;
package
org.genesys.catalog.model
;
import
com.fasterxml.jackson.annotation.JsonIdentityInfo
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
...
...
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys.catalog.
server.
model.traits.Descriptor
;
import
org.genesys.catalog.
server.
model.traits.DescriptorList
;
import
org.genesys.catalog.
server.
model.vocab.ControlledVocabulary
;
import
org.genesys.catalog.model.traits.Descriptor
;
import
org.genesys.catalog.model.traits.DescriptorList
;
import
org.genesys.catalog.model.vocab.ControlledVocabulary
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
javax.persistence.*
;
...
...
src/main/java/org/genesys/catalog/
server/
model/ShortFilter.java
→
src/main/java/org/genesys/catalog/model/ShortFilter.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model
;
package
org.genesys.catalog.model
;
import
org.genesys.blocks.model.EntityId
;
import
org.hibernate.annotations.Type
;
...
...
src/main/java/org/genesys/catalog/
server/
model/dataset/AccessionIdentifier.java
→
src/main/java/org/genesys/catalog/model/dataset/AccessionIdentifier.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.dataset
;
package
org.genesys.catalog.model.dataset
;
import
javax.persistence.Column
;
import
javax.persistence.Embeddable
;
...
...
src/main/java/org/genesys/catalog/
server/
model/dataset/Dataset.java
→
src/main/java/org/genesys/catalog/model/dataset/Dataset.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.dataset
;
package
org.genesys.catalog.model.dataset
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonView
;
...
...
@@ -23,10 +23,10 @@ import org.genesys.blocks.model.Publishable;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys.catalog.
server.
annotations.PublishValidation
;
import
org.genesys.catalog.
server.
model.Partner
;
import
org.genesys.catalog.
server.
model.traits.Descriptor
;
import
org.genesys.catalog.serv
er.serv
ice.PublishValidationInterface
;
import
org.genesys.catalog.annotations.PublishValidation
;
import
org.genesys.catalog.model.Partner
;
import
org.genesys.catalog.model.traits.Descriptor
;
import
org.genesys.catalog.service.PublishValidationInterface
;
import
org.genesys.filerepository.model.RepositoryFile
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
...
...
src/main/java/org/genesys/catalog/
server/
model/dataset/DatasetCreator.java
→
src/main/java/org/genesys/catalog/model/dataset/DatasetCreator.java
View file @
ec10963d
...
...
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.dataset
;
package
org.genesys.catalog.model.dataset
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.catalog.
server.
annotations.PublishValidation
;
import
org.genesys.catalog.serv
er.serv
ice.PublishValidationInterface
;
import
org.genesys.catalog.annotations.PublishValidation
;
import
org.genesys.catalog.service.PublishValidationInterface
;
import
javax.persistence.*
;
import
java.util.Map
;
...
...
src/main/java/org/genesys/catalog/
server/
model/dataset/DatasetLocation.java
→
src/main/java/org/genesys/catalog/model/dataset/DatasetLocation.java
View file @
ec10963d
...
...
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.dataset
;
package
org.genesys.catalog.model.dataset
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.catalog.
server.
annotations.PublishValidation
;
import
org.genesys.catalog.serv
er.serv
ice.PublishValidationInterface
;
import
org.genesys.catalog.annotations.PublishValidation
;
import
org.genesys.catalog.service.PublishValidationInterface
;
import
javax.persistence.*
;
import
java.util.Map
;
...
...
src/main/java/org/genesys/catalog/
server/
model/dataset/DatasetVersions.java
→
src/main/java/org/genesys/catalog/model/dataset/DatasetVersions.java
View file @
ec10963d
...
...
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.dataset
;
package
org.genesys.catalog.model.dataset
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.catalog.
server.
annotations.PublishValidation
;
import
org.genesys.catalog.annotations.PublishValidation
;
import
javax.persistence.Entity
;
import
javax.persistence.FetchType
;
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/AccessionIdentifierFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/AccessionIdentifierFilter.java
View file @
ec10963d
...
...
@@ -13,17 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
java.util.HashSet
;
import
java.util.Set
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.catalog.model.dataset.AccessionIdentifier
;
import
org.genesys.catalog.model.dataset.QAccessionIdentifier
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.core.types.dsl.SetPath
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.catalog.server.model.dataset.AccessionIdentifier
;
import
org.genesys.catalog.server.model.dataset.QAccessionIdentifier
;
import
java.util.HashSet
;
import
java.util.Set
;
/**
* The Class AccessionIdentifierFilter.
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/ControlledVocabularyFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/ControlledVocabularyFilter.java
View file @
ec10963d
...
...
@@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
static
org
.
genesys
.
catalog
.
model
.
vocab
.
QControlledVocabulary
.
controlledVocabulary
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.jpa.JPAExpressions
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.blocks.model.filters.UuidModelFilter
;
import
org.genesys.catalog.
server.
model.QPartner
;
import
org.genesys.catalog.model.QPartner
;
import
static
org
.
genesys
.
catalog
.
server
.
model
.
vocab
.
QControlledVocabulary
.
controlledVocabulary
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.jpa.JPAExpressions
;
public
class
ControlledVocabularyFilter
extends
UuidModelFilter
{
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/DatasetFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/DatasetFilter.java
View file @
ec10963d
...
...
@@ -13,19 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
static
org
.
genesys
.
catalog
.
model
.
dataset
.
QDataset
.
dataset
;
import
java.util.Set
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.blocks.model.filters.UuidModelFilter
;
import
java.util.Set
;
import
static
org
.
genesys
.
catalog
.
server
.
model
.
dataset
.
QDataset
.
dataset
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
/**
* The Class DatasetFilter.
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/DescriptorFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/DescriptorFilter.java
View file @
ec10963d
...
...
@@ -13,24 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
static
org
.
genesys
.
catalog
.
model
.
traits
.
QDescriptor
.
descriptor
;
import
java.util.Set
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.jpa.JPAExpressions
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.model.filters.NumberFilter
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.blocks.model.filters.UuidModelFilter
;
import
org.genesys.catalog.
server.model.traits.Descripto
r
;
import
org.genesys.catalog.
server.model.traits.Q
Descriptor
;
import
org.genesys.catalog.
server.model.traits.QDescriptorList
;
import
org.genesys.catalog.
server.model.QPartner
;
import
org.genesys.catalog.
model.QPartne
r
;
import
org.genesys.catalog.
model.traits.
Descriptor
;
import
org.genesys.catalog.
model.traits.QDescriptor
;
import
org.genesys.catalog.
model.traits.QDescriptorList
;
import
java.util.Set
;
import
static
org
.
genesys
.
catalog
.
server
.
model
.
traits
.
QDescriptor
.
descriptor
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.jpa.JPAExpressions
;
/**
* The Class DescriptorFilter.
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/DescriptorListFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/DescriptorListFilter.java
View file @
ec10963d
...
...
@@ -13,18 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.service
.filters
;
package
org.genesys.catalog.
model
.filters
;
import
static
org
.
genesys
.
catalog
.
server
.
model
.
traits
.
QDescriptorList
.
descriptorList
;
import
static
org
.
genesys
.
catalog
.
model
.
traits
.
QDescriptorList
.
descriptorList
;
import
java.util.Set
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.blocks.model.filters.UuidModelFilter
;
import
java.util.Set
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
/**
* The Class DescriptorListFilter.
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/FilterHelpers.java
→
src/main/java/org/genesys/catalog/
model
/filters/FilterHelpers.java
View file @
ec10963d
...
...
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
java.util.Arrays
;
import
java.util.regex.Pattern
;
import
com.querydsl.core.types.Predicate
;
import
com.querydsl.core.types.dsl.BooleanExpression
;
import
com.querydsl.core.types.dsl.StringPath
;
import
java.util.Arrays
;
import
java.util.regex.Pattern
;
/**
* Filter Helpers.
*/
...
...
src/main/java/org/genesys/catalog/
server/service
/filters/PartnerFilter.java
→
src/main/java/org/genesys/catalog/
model
/filters/PartnerFilter.java
View file @
ec10963d
...
...
@@ -13,18 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.server.service.filters
;
package
org.genesys.catalog.model.filters
;
import
static
org
.
genesys
.
catalog
.
model
.
QPartner
.
partner
;
import
java.util.Set
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.genesys.blocks.model.filters.StringFilter
;
import
org.genesys.blocks.model.filters.UuidModelFilter
;
import
org.genesys.catalog.
server.
model.QPartner
;
import
org.genesys.catalog.model.QPartner
;
import
java.util.Set
;
import
static
org
.
genesys
.
catalog
.
server
.
model
.
QPartner
.
partner
;
import
com.querydsl.core.BooleanBuilder
;
import
com.querydsl.core.types.Predicate
;
/**
* The Class PartnerFilter.
...
...
src/main/java/org/genesys/catalog/
server/
model/traits/Descriptor.java
→
src/main/java/org/genesys/catalog/model/traits/Descriptor.java
View file @
ec10963d
...
...
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.traits
;
package
org.genesys.catalog.model.traits
;
import
com.fasterxml.jackson.annotation.*
;
import
org.genesys.blocks.auditlog.annotations.Audited
;
import
org.genesys.blocks.model.*
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys.catalog.
server.
model.Partner
;
import
org.genesys.catalog.
server.
model.dataset.Dataset
;
import
org.genesys.catalog.
server.
model.vocab.ControlledVocabulary
;
import
org.genesys.catalog.
server.
model.vocab.VocabularyTerm
;
import
org.genesys.catalog.model.Partner
;
import
org.genesys.catalog.model.dataset.Dataset
;
import
org.genesys.catalog.model.vocab.ControlledVocabulary
;
import
org.genesys.catalog.model.vocab.VocabularyTerm
;
import
org.springframework.dao.DataIntegrityViolationException
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
...
...
src/main/java/org/genesys/catalog/
server/
model/traits/DescriptorList.java
→
src/main/java/org/genesys/catalog/model/traits/DescriptorList.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.traits
;
package
org.genesys.catalog.model.traits
;
import
com.fasterxml.jackson.annotation.JsonIdentityInfo
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
...
...
@@ -25,7 +25,7 @@ import org.genesys.blocks.model.Publishable;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys.catalog.
server.
model.Partner
;
import
org.genesys.catalog.model.Partner
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldType
;
...
...
src/main/java/org/genesys/catalog/
server/
model/vocab/ControlledVocabulary.java
→
src/main/java/org/genesys/catalog/model/vocab/ControlledVocabulary.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.vocab
;
package
org.genesys.catalog.model.vocab
;
import
com.fasterxml.jackson.annotation.*
;
import
org.genesys.blocks.model.JsonViews
;
...
...
@@ -21,7 +21,7 @@ import org.genesys.blocks.model.Publishable;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys.catalog.
server.
model.Partner
;
import
org.genesys.catalog.model.Partner
;
import
org.hibernate.annotations.ColumnDefault
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
...
...
src/main/java/org/genesys/catalog/
server/
model/vocab/VocabularyTerm.java
→
src/main/java/org/genesys/catalog/model/vocab/VocabularyTerm.java
View file @
ec10963d
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
model.vocab
;
package
org.genesys.catalog.model.vocab
;
import
com.fasterxml.jackson.annotation.JsonIdentityReference
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
...
...
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonView;
import
org.genesys.blocks.model.BasicModel
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.catalog.
server.
model.traits.Descriptor
;
import
org.genesys.catalog.model.traits.Descriptor
;
import
org.springframework.data.elasticsearch.annotations.Document
;
import
org.springframework.data.elasticsearch.annotations.Field
;
import
org.springframework.data.elasticsearch.annotations.FieldType
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/PartnerRepository.java
→
src/main/java/org/genesys/catalog/persistence/PartnerRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence
;
package
org.genesys.catalog.persistence
;
import
org.genesys.catalog.
server.
model.Partner
;
import
org.genesys.catalog.model.Partner
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.querydsl.QueryDslPredicateExecutor
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/ShortFilterRepository.java
→
src/main/java/org/genesys/catalog/persistence/ShortFilterRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence
;
package
org.genesys.catalog.persistence
;
import
org.genesys.catalog.
server.
model.ShortFilter
;
import
org.genesys.catalog.model.ShortFilter
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.querydsl.QueryDslPredicateExecutor
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/dataset/DatasetCreatorRepository.java
→
src/main/java/org/genesys/catalog/persistence/dataset/DatasetCreatorRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.dataset
;
package
org.genesys.catalog.persistence.dataset
;
import
org.genesys.catalog.
server.
model.dataset.DatasetCreator
;
import
org.genesys.catalog.model.dataset.DatasetCreator
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/dataset/DatasetLocationRepository.java
→
src/main/java/org/genesys/catalog/persistence/dataset/DatasetLocationRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.dataset
;
package
org.genesys.catalog.persistence.dataset
;
import
org.genesys.catalog.
server.
model.dataset.DatasetLocation
;
import
org.genesys.catalog.model.dataset.DatasetLocation
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/dataset/DatasetRepository.java
→
src/main/java/org/genesys/catalog/persistence/dataset/DatasetRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.dataset
;
package
org.genesys.catalog.persistence.dataset
;
import
org.genesys.catalog.
server.
model.dataset.Dataset
;
import
org.genesys.catalog.model.dataset.Dataset
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/dataset/DatasetVersionsRepository.java
→
src/main/java/org/genesys/catalog/persistence/dataset/DatasetVersionsRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.dataset
;
package
org.genesys.catalog.persistence.dataset
;
import
org.genesys.catalog.
server.
model.dataset.DatasetVersions
;
import
org.genesys.catalog.model.dataset.DatasetVersions
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.querydsl.QueryDslPredicateExecutor
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/traits/DescriptorListRepository.java
→
src/main/java/org/genesys/catalog/persistence/traits/DescriptorListRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.traits
;
package
org.genesys.catalog.persistence.traits
;
import
org.genesys.catalog.
server.
model.traits.DescriptorList
;
import
org.genesys.catalog.model.traits.DescriptorList
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.querydsl.QueryDslPredicateExecutor
;
import
org.springframework.stereotype.Repository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/traits/DescriptorRepository.java
→
src/main/java/org/genesys/catalog/persistence/traits/DescriptorRepository.java
View file @
ec10963d
...
...
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.traits
;
package
org.genesys.catalog.persistence.traits
;
import
org.genesys.catalog.
server.
model.dataset.Dataset
;
import
org.genesys.catalog.
server.
model.traits.Descriptor
;
import
org.genesys.catalog.
server.
model.traits.DescriptorList
;
import
org.genesys.catalog.model.dataset.Dataset
;
import
org.genesys.catalog.model.traits.Descriptor
;
import
org.genesys.catalog.model.traits.DescriptorList
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.data.querydsl.QueryDslPredicateExecutor
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/vocab/ControlledVocabularyRepository.java
→
src/main/java/org/genesys/catalog/persistence/vocab/ControlledVocabularyRepository.java
View file @
ec10963d
...
...
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.vocab
;
package
org.genesys.catalog.persistence.vocab
;
import
org.genesys.catalog.
server.
model.vocab.ControlledVocabulary
;
import
org.genesys.catalog.
server.
model.vocab.VocabularyTerm
;
import
org.genesys.catalog.model.vocab.ControlledVocabulary
;
import
org.genesys.catalog.model.vocab.VocabularyTerm
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
...
...
src/main/java/org/genesys/catalog/
server/
persistence/vocab/VocabularyTermRepository.java
→
src/main/java/org/genesys/catalog/persistence/vocab/VocabularyTermRepository.java
View file @
ec10963d
...
...
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys.catalog.
server.
persistence.vocab
;
package
org.genesys.catalog.persistence.vocab
;
import
org.genesys.catalog.
server.
model.vocab.VocabularyTerm
;
import
org.genesys.catalog.model.vocab.VocabularyTerm
;
import
org.springframework.data.jpa.repository.JpaRepository
;