Moved catalog model and JPA repositories to right packages

.gitignore

@@ -25,3 +25,4 @@ npm-debug.log
 .pmd
 node_tmp
 effective.pom
+src/main/resources/genesys.properties

pom.xml

@@ -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

@@ -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/exceptions/PublishValidationException.java → src/main/java/org/genesys/catalog/annotations/PublishValidationException.java

@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.genesys.catalog.server.exceptions;
+package org.genesys.catalog.annotations;
 
 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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.server.service.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

@@ -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.server.service.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

@@ -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.server.service.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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.Descriptor;
-import org.genesys.catalog.server.model.traits.QDescriptor;
-import org.genesys.catalog.server.model.traits.QDescriptorList;
-import org.genesys.catalog.server.model.QPartner;
+import org.genesys.catalog.model.QPartner;
+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

@@ -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

@@ -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

@@ -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.