Commit 47b67808 authored by Matija Obreza's avatar Matija Obreza
Browse files

Renamed *.controller.* packages to *.api.* and *.mvc.*

parent 4d6774a5
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
import java.text.MessageFormat; import java.text.MessageFormat;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
import java.util.List; import java.util.List;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
......
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
public class GeoJsData { public class GeoJsData {
......
package org.genesys2.server.servlet.controller.api.model; package org.genesys2.server.api.model;
import java.util.Set; import java.util.Set;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import java.io.IOException; import java.io.IOException;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import java.io.IOException; import java.io.IOException;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import java.io.IOException; import java.io.IOException;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import java.io.IOException; import java.io.IOException;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.serialization; package org.genesys2.server.api.serialization;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -26,6 +26,9 @@ import javax.persistence.RollbackException; ...@@ -26,6 +26,9 @@ import javax.persistence.RollbackException;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.genesys2.server.api.PleaseRetryException;
import org.genesys2.server.api.RestController;
import org.genesys2.server.api.model.AccessionHeaderJson;
import org.genesys2.server.exception.InvalidApiUsageException; import org.genesys2.server.exception.InvalidApiUsageException;
import org.genesys2.server.model.elastic.AccessionDetails; import org.genesys2.server.model.elastic.AccessionDetails;
import org.genesys2.server.model.genesys.Accession; import org.genesys2.server.model.genesys.Accession;
...@@ -45,9 +48,6 @@ import org.genesys2.server.service.impl.RESTApiValueException; ...@@ -45,9 +48,6 @@ import org.genesys2.server.service.impl.RESTApiValueException;
import org.genesys2.server.service.impl.SearchException; import org.genesys2.server.service.impl.SearchException;
import org.genesys2.server.service.worker.AccessionOpResponse; import org.genesys2.server.service.worker.AccessionOpResponse;
import org.genesys2.server.service.worker.AccessionOpResponse.UpsertResult; import org.genesys2.server.service.worker.AccessionOpResponse.UpsertResult;
import org.genesys2.server.servlet.controller.api.PleaseRetryException;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.server.servlet.controller.api.model.AccessionHeaderJson;
import org.genesys2.server.service.worker.AccessionUploader; import org.genesys2.server.service.worker.AccessionUploader;
import org.genesys2.spring.ResourceNotFoundException; import org.genesys2.spring.ResourceNotFoundException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.genesys2.server.api.RestController;
import org.genesys2.server.service.MappingService; import org.genesys2.server.service.MappingService;
import org.genesys2.server.servlet.controller.api.RestController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
......
...@@ -14,12 +14,15 @@ ...@@ -14,12 +14,15 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.util.List; import java.util.List;
import javax.xml.bind.ValidationException; import javax.xml.bind.ValidationException;
import org.genesys2.server.api.ModelValidationException;
import org.genesys2.server.api.OAuth2Cleanup;
import org.genesys2.server.api.RestController;
import org.genesys2.server.exception.AuthorizationException; import org.genesys2.server.exception.AuthorizationException;
import org.genesys2.server.model.genesys.Parameter; import org.genesys2.server.model.genesys.Parameter;
import org.genesys2.server.model.impl.Crop; import org.genesys2.server.model.impl.Crop;
...@@ -28,9 +31,6 @@ import org.genesys2.server.model.impl.CropTaxonomy; ...@@ -28,9 +31,6 @@ import org.genesys2.server.model.impl.CropTaxonomy;
import org.genesys2.server.service.CropService; import org.genesys2.server.service.CropService;
import org.genesys2.server.service.GenesysService; import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.TraitService; import org.genesys2.server.service.TraitService;
import org.genesys2.server.servlet.controller.api.ModelValidationException;
import org.genesys2.server.servlet.controller.api.OAuth2Cleanup;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.spring.ResourceNotFoundException; import org.genesys2.spring.ResourceNotFoundException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
...@@ -34,6 +34,9 @@ import net.sf.oval.constraint.MinLength; ...@@ -34,6 +34,9 @@ import net.sf.oval.constraint.MinLength;
import net.sf.oval.constraint.NotBlank; import net.sf.oval.constraint.NotBlank;
import net.sf.oval.constraint.NotNull; import net.sf.oval.constraint.NotNull;
import org.genesys2.server.api.ModelValidationException;
import org.genesys2.server.api.OAuth2Cleanup;
import org.genesys2.server.api.RestController;
import org.genesys2.server.exception.AuthorizationException; import org.genesys2.server.exception.AuthorizationException;
import org.genesys2.server.model.genesys.Accession; import org.genesys2.server.model.genesys.Accession;
import org.genesys2.server.model.genesys.Metadata; import org.genesys2.server.model.genesys.Metadata;
...@@ -47,9 +50,6 @@ import org.genesys2.server.service.GenesysService; ...@@ -47,9 +50,6 @@ import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.InstituteService; import org.genesys2.server.service.InstituteService;
import org.genesys2.server.service.TraitService; import org.genesys2.server.service.TraitService;
import org.genesys2.server.service.impl.NonUniqueAccessionException; import org.genesys2.server.service.impl.NonUniqueAccessionException;
import org.genesys2.server.servlet.controller.api.ModelValidationException;
import org.genesys2.server.servlet.controller.api.OAuth2Cleanup;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.spring.ResourceNotFoundException; import org.genesys2.spring.ResourceNotFoundException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
......
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.genesys2.server.api.RestController;
import org.genesys2.server.api.model.GeoJsData;
import org.genesys2.server.model.impl.GeoRegion; import org.genesys2.server.model.impl.GeoRegion;
import org.genesys2.server.persistence.domain.CountryRepository; import org.genesys2.server.persistence.CountryRepository;
import org.genesys2.server.service.GeoRegionService; import org.genesys2.server.service.GeoRegionService;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.server.servlet.controller.api.model.GeoJsData;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
...@@ -29,13 +29,13 @@ import org.genesys.filerepository.InvalidRepositoryPathException; ...@@ -29,13 +29,13 @@ import org.genesys.filerepository.InvalidRepositoryPathException;
import org.genesys.filerepository.NoSuchRepositoryFileException; import org.genesys.filerepository.NoSuchRepositoryFileException;
import org.genesys.filerepository.model.ImageGallery; import org.genesys.filerepository.model.ImageGallery;
import org.genesys.filerepository.model.RepositoryImage; import org.genesys.filerepository.model.RepositoryImage;
import org.genesys2.server.api.RestController;
import org.genesys2.server.model.genesys.Accession; import org.genesys2.server.model.genesys.Accession;
import org.genesys2.server.model.impl.FaoInstitute; import org.genesys2.server.model.impl.FaoInstitute;
import org.genesys2.server.service.GenesysService; import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.InstituteFilesService; import org.genesys2.server.service.InstituteFilesService;
import org.genesys2.server.service.InstituteService; import org.genesys2.server.service.InstituteService;
import org.genesys2.server.service.impl.NonUniqueAccessionException; import org.genesys2.server.service.impl.NonUniqueAccessionException;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.spring.ResourceNotFoundException; import org.genesys2.spring.ResourceNotFoundException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
...@@ -26,6 +26,10 @@ import javax.xml.bind.ValidationException; ...@@ -26,6 +26,10 @@ import javax.xml.bind.ValidationException;
import net.sf.oval.ConstraintViolation; import net.sf.oval.ConstraintViolation;
import net.sf.oval.Validator; import net.sf.oval.Validator;
import org.genesys2.server.api.ModelValidationException;
import org.genesys2.server.api.RestController;
import org.genesys2.server.api.model.ExecutionDimensionJson;
import org.genesys2.server.api.model.ExecutionJson;
import org.genesys2.server.exception.AuthorizationException; import org.genesys2.server.exception.AuthorizationException;
import org.genesys2.server.model.kpi.BooleanDimension; import org.genesys2.server.model.kpi.BooleanDimension;
import org.genesys2.server.model.kpi.Dimension; import org.genesys2.server.model.kpi.Dimension;
...@@ -34,10 +38,6 @@ import org.genesys2.server.model.kpi.ExecutionDimension; ...@@ -34,10 +38,6 @@ import org.genesys2.server.model.kpi.ExecutionDimension;
import org.genesys2.server.model.kpi.KPIParameter; import org.genesys2.server.model.kpi.KPIParameter;
import org.genesys2.server.model.kpi.Observation; import org.genesys2.server.model.kpi.Observation;
import org.genesys2.server.service.KPIService; import org.genesys2.server.service.KPIService;
import org.genesys2.server.servlet.controller.api.ModelValidationException;
import org.genesys2.server.servlet.controller.api.RestController;
import org.genesys2.server.servlet.controller.api.model.ExecutionDimensionJson;
import org.genesys2.server.servlet.controller.api.model.ExecutionJson;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
**/ **/
package org.genesys2.server.servlet.controller.api.v0; package org.genesys2.server.api.v0;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
...@@ -22,12 +22,12 @@ import java.util.Map; ...@@ -22,12 +22,12 @@ import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.genesys2.server.api.RestController;
import org.genesys2.server.model.impl.Country; import org.genesys2.server.model.impl.Country;
import org.genesys2.server.service.GenesysService; import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.GeoService; import org.genesys2.server.service.GeoService;
import org.genesys2.server.service.InstituteService; import org.genesys2.server.service.InstituteService;
import org.genesys2.server.service.TaxonomyService; import org.genesys2.server.service.TaxonomyService;
import org.genesys2.server.servlet.controller.api.RestController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment