diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java index 5e5dab495..a1f709848 100644 --- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java +++ b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java @@ -11,9 +11,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import java.util.List; -/** - * Created by ikalyvas on 12/15/2017. - */ + @SpringBootApplication public class EuDatApplication extends SpringBootServletInitializer { private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class); diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java index 1d0b57f82..1e0f30662 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java +++ b/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java @@ -1,8 +1,6 @@ package eu.eudat.configurations; -/** - * Created by ikalyvas on 12/15/2017. - */ + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java index 9e0f1dbe2..055dbdb64 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java +++ b/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java @@ -14,9 +14,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter import java.util.List; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Configuration public class WebMVCConfiguration extends WebMvcConfigurerAdapter { diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java b/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java index 3911618d0..aabe12b12 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java @@ -10,9 +10,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; -/** - * Created by ikalyvas on 1/2/2018. - */ + public abstract class BaseController { private ApiContext apiContext; diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java index 738f82f9e..fd7042c33 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java @@ -20,9 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.transaction.Transactional; import java.util.List; -/** - * Created by ikalyvas on 12/20/2017. - */ + @RestController @CrossOrigin diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java index 26e1c907f..4488cf157 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -16,9 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + @RestController @CrossOrigin public class ExternalDatasets extends BaseController{ diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java index 4b6728a98..cfe49649a 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java @@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.transaction.Transactional; -/** - * Created by ikalyvas on 12/15/2017. - */ + @RestController @CrossOrigin @RequestMapping(value = "/auth") diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java index 010c5766b..c06e73fed 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java @@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + @RequestMapping("invite/") @RestController @CrossOrigin diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java index b78fc3554..08c0a6fc7 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java @@ -16,9 +16,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; import java.util.List; import java.util.Locale; -/** - * Created by ikalyvas on 12/22/2017. - */ + @ControllerAdvice public class ControllerErrorHandler { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java b/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java index 1ee381eb7..e5f7aaa32 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccess.java @@ -3,9 +3,7 @@ package eu.eudat.dao; import eu.eudat.dao.databaselayer.service.DatabaseService; import eu.eudat.entities.DataEntity; -/** - * Created by ikalyvas on 1/25/2018. - */ + public class DatabaseAccess> { private DatabaseService databaseService; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java b/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java index f5bbb7981..948e9d87e 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java @@ -1,8 +1,6 @@ package eu.eudat.dao; -/** - * Created by ikalyvas on 1/25/2018. - */ + public interface DatabaseAccessLayer { T createOrUpdate(T item); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java index f80223f1d..c356d64f0 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java @@ -14,9 +14,7 @@ import javax.persistence.criteria.Root; import java.util.List; import java.util.UUID; -/** - * Created by giannis on 7/16/2017. - */ + @Repository("databaseCtx") public class DatabaseContext> { @Autowired diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java index 337a1d9a1..5508bb2d2 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java @@ -10,9 +10,7 @@ import org.springframework.stereotype.Service; import java.util.Set; import java.util.UUID; -/** - * Created by giannis on 7/17/2017. - */ + @Service("databaseService") public class DatabaseService> { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java index 0b091c0d5..3f80dca8c 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java @@ -10,9 +10,7 @@ import eu.eudat.queryable.QueryableList; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + public interface ExternalDatasetDao extends DatabaseAccessLayer { QueryableList getWithCriteria(ExternalDatasetCriteria criteria); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java index 16399126e..4b7a5f15a 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java @@ -11,9 +11,7 @@ import org.springframework.stereotype.Component; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + @Component("externalDatasetDao") public class ExternalDatasetDaoImpl extends DatabaseAccess implements ExternalDatasetDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java index cd5994a38..9e75acde6 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java @@ -10,9 +10,7 @@ import eu.eudat.queryable.QueryableList; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + public interface InvitationDao extends DatabaseAccessLayer { QueryableList getWithCriteria(InvitationCriteria criteria); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java index bc9f75ee2..c42596443 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java @@ -11,9 +11,7 @@ import org.springframework.stereotype.Service; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + @Service("invitationDao") public class InvitationDaoImpl extends DatabaseAccess implements InvitationDao{ diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java index deaa2d428..6b0363727 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDao.java @@ -7,9 +7,7 @@ import eu.eudat.entities.UserRole; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/30/2018. - */ + public interface UserRoleDao extends DatabaseAccessLayer { List getUserRoles(UserInfo userInfo); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java index 7aaf231fb..de68015ce 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java @@ -11,9 +11,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/30/2018. - */ + @Component("userRoleDao") public class UserRoleDaoImpl extends DatabaseAccess implements UserRoleDao{ diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java index 9646ee96c..48018b332 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java @@ -7,9 +7,7 @@ import eu.eudat.models.login.Credentials; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + public interface CredentialDao extends DatabaseAccessLayer { Credential getLoggedInCredentials(Credentials credentials); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java index 87d6e64ea..0ba65f7dc 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java @@ -11,9 +11,7 @@ import org.springframework.stereotype.Component; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Component("credentialDao") public class CredentialDaoImpl extends DatabaseAccess implements CredentialDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java index 2e3de2a79..6715270dd 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java @@ -4,9 +4,7 @@ import eu.eudat.entities.UserToken; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + public interface UserTokenDao { UserToken createOrUpdate(UserToken item); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java index d5b65d941..7b6e205d5 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java @@ -8,9 +8,7 @@ import org.springframework.stereotype.Component; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Component("userTokenDao") public class UserTokenDaoImpl extends DatabaseAccess implements UserTokenDao { diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java b/dmp-backend/src/main/java/eu/eudat/entities/Credential.java index d1e69902b..e961e6413 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Credential.java @@ -6,16 +6,12 @@ import javax.persistence.*; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Entity @Table(name = "\"Credential\"") public class Credential implements DataEntity { @Id - @GeneratedValue - @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"Id\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java index 777bd8e13..e4763f786 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java @@ -1,5 +1,6 @@ package eu.eudat.entities; +import javax.persistence.Tuple; import java.util.Map; import java.util.Set; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java index ab1a94e15..a825b8990 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java @@ -6,9 +6,7 @@ import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + @Entity @Table(name="\"DatasetExternalDataset\"") diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java index 69b8a4ab4..433d1790a 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java @@ -64,5 +64,5 @@ public class DatasetProfileRuleset implements Serializable { } - + } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java b/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java index 8bdaa012b..42a85d7b7 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java @@ -9,9 +9,7 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + @Entity @Table(name="\"ExternalDataset\"") public class ExternalDataset implements DataEntity{ diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java b/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java index 1b265d40d..00726f3cd 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java @@ -7,9 +7,7 @@ import javax.persistence.*; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Entity @Table(name="\"Invitation\"") public class Invitation implements DataEntity{ diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java b/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java index 2f35d899d..ef9f9631d 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java @@ -6,9 +6,7 @@ import javax.persistence.*; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 1/30/2018. - */ + @Entity @Table(name = "\"UserRole\"") public class UserRole implements DataEntity { diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java b/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java index caf85c453..ce6be8419 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java @@ -4,9 +4,7 @@ import javax.persistence.*; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Entity @Table(name="\"UserToken\"") public class UserToken implements DataEntity{ diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java index 21e505f38..7a9dc7291 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java @@ -4,9 +4,7 @@ import eu.eudat.utilities.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; -/** - * Created by ikalyvas on 1/19/2018. - */ + public class Page implements DatabaseViewStyleDefinition,XmlSerializable { private String id; private int ordinal; diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/UnauthorisedException.java b/dmp-backend/src/main/java/eu/eudat/exceptions/UnauthorisedException.java index 62c0f12d1..cac7ea2c2 100644 --- a/dmp-backend/src/main/java/eu/eudat/exceptions/UnauthorisedException.java +++ b/dmp-backend/src/main/java/eu/eudat/exceptions/UnauthorisedException.java @@ -3,9 +3,7 @@ package eu.eudat.exceptions; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; -/** - * Created by ikalyvas on 12/18/2017. - */ + @ResponseStatus(value = HttpStatus.UNAUTHORIZED) public class UnauthorisedException extends RuntimeException{ public UnauthorisedException() { diff --git a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java b/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java index b36622892..5555b705e 100644 --- a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java +++ b/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java @@ -16,9 +16,7 @@ import java.util.*; import static eu.eudat.types.Authorities.USER; -/** - * Created by ikalyvas on 12/15/2017. - */ + public final class PrincipalArgumentResolver implements HandlerMethodArgumentResolver { private AuthenticationService authenticationService; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java index b99ab0ac6..a2af33e36 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java @@ -24,9 +24,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class DatasetManager { public DataTableData getPaged(ApiContext apiContext, DatasetTableRequest datasetTableRequest, Principal principal) throws Exception { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java index 78f7c8d1b..a06fd3663 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetProfileManager.java @@ -12,9 +12,7 @@ import eu.eudat.utilities.builders.DomainModelConverter; import java.util.List; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileManager { public static List getWithCriteria(DatasetProfileDao datasetProfileRepository, DatasetProfileAutocompleteRequest datasetProfileAutocompleteRequest) throws IllegalAccessException, InstantiationException{ diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java index dc552d106..8d2cf5262 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java @@ -21,9 +21,7 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetWizardManager { public static List getUserDmps(DMPDao dmpRepository, DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, Principal principal) throws InstantiationException, IllegalAccessException { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java index 9c056f00e..abba1ffb4 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java @@ -15,9 +15,7 @@ import eu.eudat.utilities.builders.DomainModelConverter; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class ExternalDatasetManager { public DataTableData getPaged(ExternalDatasetDao externalDatasetDao, ExternalDatasetTableRequest externalDatasetTableRequest) throws Exception { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java b/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java index 7bf26ca5f..7c45f249c 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/InvitationsManager.java @@ -17,9 +17,7 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class InvitationsManager { public static void inviteUsers(ApiContext apiContext, Invitation invitation, Principal principal) throws Exception { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java index 684307ff2..293ebe6fd 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java @@ -38,9 +38,6 @@ public class UserManager { public static DataTableData getPaged(UserInfoDao userInfoDao, UserInfoTableRequestItem userInfoTableRequestItem) throws Exception { QueryableList users = userInfoDao.getWithCriteria(userInfoTableRequestItem.getCriteria()); QueryableList pagedUsers = PaginationManager.applyPaging(users, userInfoTableRequestItem); - if (userInfoTableRequestItem.getSelection() != null && userInfoTableRequestItem.getSelection().getFields() != null) { - pagedUsers.withFields(Arrays.asList(userInfoTableRequestItem.getSelection().getFields())); - } List modelUsers = new DomainModelConverter().fromDataModel(pagedUsers.toList(), UserListingModel.class); DataTableData dataTableData = new DataTableData<>(); dataTableData.setData(modelUsers); diff --git a/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java b/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java index 7c2d50070..15a418112 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java +++ b/dmp-backend/src/main/java/eu/eudat/models/HintedModelFactory.java @@ -1,8 +1,6 @@ package eu.eudat.models; -/** - * Created by ikalyvas on 1/18/2018. - */ + public class HintedModelFactory { public static String getHint(Class clazz) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java index d0a4ab63f..96c62d20d 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java @@ -3,9 +3,7 @@ package eu.eudat.models.admin.components.datasetprofile; import eu.eudat.entities.xmlmodels.datasetprofiledefinition.*; import eu.eudat.utilities.ViewStyleDefinition; -/** - * Created by ikalyvas on 1/19/2018. - */ + public class Page implements Comparable,ViewStyleDefinition { private String id; private Integer ordinal; diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java index 87d1e178e..67442b9b4 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/FreeTextData.java @@ -6,9 +6,7 @@ import org.w3c.dom.Element; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 1/3/2018. - */ + public class FreeTextData extends FieldData { @Override diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java index a1a13b52e..c2c19bb8e 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/TextAreaData.java @@ -5,9 +5,7 @@ import org.w3c.dom.Element; import java.util.Map; -/** - * Created by ikalyvas on 1/3/2018. - */ + public class TextAreaData extends FieldData{ @Override public TextAreaData fromData(Object data) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java index 06ae71f79..78f36fe3d 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java @@ -6,9 +6,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class DatasetCriteria extends Criteria{ private Integer status; private Date periodStart; diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java index 58a215e8a..c231fa799 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileCriteria.java @@ -2,8 +2,6 @@ package eu.eudat.models.criteria; import eu.eudat.entities.DatasetProfile; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileCriteria extends Criteria{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java index f2c5a8659..be0e1c15d 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java @@ -4,9 +4,7 @@ import eu.eudat.entities.DatasetProfile; import java.util.UUID; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileWizardCriteria extends Criteria { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java index 9e58e058b..045748668 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java @@ -3,8 +3,6 @@ package eu.eudat.models.criteria; import eu.eudat.entities.DMP; import eu.eudat.models.dmp.DataManagementPlan; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetWizardUserDmpCriteria extends Criteria{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java index 2855db897..333760469 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/ExternalDatasetCriteria.java @@ -2,8 +2,6 @@ package eu.eudat.models.criteria; import eu.eudat.entities.ExternalDataset; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class ExternalDatasetCriteria extends Criteria { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java index e3320133d..9345b69c1 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/InvitationCriteria.java @@ -2,8 +2,6 @@ package eu.eudat.models.criteria; import eu.eudat.entities.Invitation; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class InvitationCriteria extends Criteria{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java index 9b3d6562a..28b79ec8c 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java @@ -2,9 +2,7 @@ package eu.eudat.models.criteria; import eu.eudat.entities.UserInfo; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class UserInfoCriteria extends Criteria { private String email; diff --git a/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java b/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java index 8c48a455b..052aa7fb4 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/dataset/DatasetTableRequest.java @@ -5,8 +5,6 @@ import eu.eudat.models.criteria.ProjectCriteria; import eu.eudat.models.helpers.requests.RequestItem; import eu.eudat.models.helpers.requests.TableRequest; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class DatasetTableRequest extends TableRequest { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java index 06a70325c..31b234a1a 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteItem.java @@ -5,9 +5,7 @@ import eu.eudat.models.DataModel; import java.util.UUID; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileAutocompleteItem implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java index f45125fa3..17127403a 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileAutocompleteRequest.java @@ -5,8 +5,6 @@ import eu.eudat.models.criteria.DatasetProfileWizardCriteria; import eu.eudat.models.criteria.DatasetWizardUserDmpCriteria; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileAutocompleteRequest extends RequestItem { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java index da1820b3a..21f604303 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileListingModel.java @@ -13,9 +13,7 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class DatasetProfileListingModel implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java index cc0a887f9..e9cea93d4 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetprofile/DatasetProfileTableRequestItem.java @@ -3,8 +3,6 @@ package eu.eudat.models.datasetprofile; import eu.eudat.models.criteria.DatasetProfileCriteria; import eu.eudat.models.helpers.requests.TableRequest; -/** - * Created by ikalyvas on 1/2/2018. - */ + public class DatasetProfileTableRequestItem extends TableRequest { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java index c1a8d6095..c9b66cc92 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DataManagentPlanListingModel.java @@ -3,9 +3,7 @@ package eu.eudat.models.datasetwizard; import eu.eudat.entities.DMP; import eu.eudat.models.DataModel; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DataManagentPlanListingModel implements DataModel{ private String id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java index 2f2d14037..ea7881a7b 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetProfileWizardAutocompleteRequest.java @@ -4,8 +4,6 @@ import eu.eudat.models.criteria.DatasetProfileWizardCriteria; import eu.eudat.models.datasetprofile.DatasetProfileAutocompleteRequest; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetProfileWizardAutocompleteRequest extends RequestItem { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java index fca452ee4..346ea6fe3 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardAutocompleteRequest.java @@ -3,8 +3,6 @@ package eu.eudat.models.datasetwizard; import eu.eudat.models.criteria.DatasetWizardUserDmpCriteria; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class DatasetWizardAutocompleteRequest extends RequestItem { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java index 0e1d0e328..53944268d 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java @@ -19,9 +19,7 @@ import eu.eudat.utilities.builders.DomainModelConverter; import java.util.*; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 12/22/2017. - */ + public class DatasetWizardModel implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java b/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java index fd23db84b..a9a6c109e 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/models/dmp/AssociatedProfile.java @@ -6,9 +6,7 @@ import org.w3c.dom.Element; import java.util.UUID; -/** - * Created by ikalyvas on 12/20/2017. - */ + public class AssociatedProfile implements XmlSerializable{ private UUID id; private String label; diff --git a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java b/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java index 9400b33de..a546c05e5 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/dmp/DataManagementPlanCriteriaRequest.java @@ -3,8 +3,6 @@ package eu.eudat.models.dmp; import eu.eudat.models.criteria.DataManagementPlanCriteria; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class DataManagementPlanCriteriaRequest extends RequestItem{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java b/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java index b9cadd303..2135a3e53 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java +++ b/dmp-backend/src/main/java/eu/eudat/models/errormodels/ValidationErrorContext.java @@ -5,9 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/22/2017. - */ + public class ValidationErrorContext extends HashMap{ public ValidationErrorContext() { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java index 047e585eb..45fd77283 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalDatasetModel.java @@ -3,9 +3,7 @@ package eu.eudat.models.external; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class ExternalDatasetModel extends ExternalListingItem { @Override public ExternalDatasetModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java index 22205ed1a..402674385 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalItem.java @@ -3,9 +3,7 @@ package eu.eudat.models.external; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public interface ExternalItem { T fromExternalItem(List> values); } diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java index fd87dd781..286f3f985 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalListingItem.java @@ -3,9 +3,7 @@ package eu.eudat.models.external; import java.util.ArrayList; import java.util.List; -/** - * Created by ikalyvas on 12/19/2017. - */ + public abstract class ExternalListingItem extends ArrayList implements ExternalItem { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java index 7bacb023f..0e37d50c9 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ExternalSourcesItemModel.java @@ -1,8 +1,6 @@ package eu.eudat.models.external; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class ExternalSourcesItemModel{ private String id; private String name; diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java index 5c70ed66a..ce17d792c 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/OrganisationsExternalSourcesModel.java @@ -4,9 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class OrganisationsExternalSourcesModel extends ExternalListingItem{ @Override public OrganisationsExternalSourcesModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java index 5ec784ea1..01f9787b9 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ProjectsExternalSourcesModel.java @@ -4,9 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class ProjectsExternalSourcesModel extends ExternalListingItem { @Override public ProjectsExternalSourcesModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java index 5ba168f74..3e0261c78 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/RegistriesExternalSourcesModel.java @@ -4,9 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class RegistriesExternalSourcesModel extends ExternalListingItem { @Override public RegistriesExternalSourcesModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java index b79ba0e0d..4dc7515c4 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ResearchersExternalSourcesModel.java @@ -4,9 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class ResearchersExternalSourcesModel extends ExternalListingItem { @Override public ResearchersExternalSourcesModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java b/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java index 38208f680..9abf89980 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/external/ServiceExternalSourcesModel.java @@ -4,9 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class ServiceExternalSourcesModel extends ExternalListingItem { @Override public ServiceExternalSourcesModel fromExternalItem(List> values) { diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java index c28efe62e..e560d6007 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetListingModel.java @@ -7,9 +7,7 @@ import javax.persistence.Column; import java.util.Date; import java.util.UUID; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class ExternalDatasetListingModel implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java b/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java index e75d59609..5f637ecc2 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/externaldataset/ExternalDatasetTableRequest.java @@ -3,8 +3,6 @@ package eu.eudat.models.externaldataset; import eu.eudat.models.criteria.ExternalDatasetCriteria; import eu.eudat.models.helpers.requests.TableRequest; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class ExternalDatasetTableRequest extends TableRequest { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java index 62b2cd5e6..504669e36 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java +++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/ColumnOrderings.java @@ -3,9 +3,7 @@ package eu.eudat.models.helpers.common; import java.util.LinkedList; import java.util.List; -/** - * Created by ikalyvas on 1/25/2018. - */ + public class ColumnOrderings { private String[] fields; diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java index 2ce579938..9109ba2cb 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java +++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/Ordering.java @@ -1,8 +1,6 @@ package eu.eudat.models.helpers.common; -/** - * Created by ikalyvas on 1/25/2018. - */ + public class Ordering { public enum OrderByType { ASC, DESC diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java index 1b501896b..717d8eca8 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java +++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/common/SelectionFields.java @@ -1,8 +1,6 @@ package eu.eudat.models.helpers.common; -/** - * Created by ikalyvas on 1/31/2018. - */ + public class SelectionFields { private String[] fields; diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java index 27d5d1eb5..3e315fdb1 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java @@ -3,9 +3,7 @@ package eu.eudat.models.helpers.responses; import eu.eudat.types.ApiMessageCode; import org.springframework.http.HttpStatus; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class ResponseItem { private Integer statusCode; private String message; diff --git a/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java b/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java index 35069cfcd..518a824f7 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java +++ b/dmp-backend/src/main/java/eu/eudat/models/invitation/Invitation.java @@ -6,9 +6,7 @@ import eu.eudat.models.userinfo.UserInfoInvitationModel; import java.util.List; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class Invitation { private UUID dataManagementPlan; private List users; diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java index a758a54a1..b10ab6a5f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DataManagementPlanListingModel.java @@ -12,9 +12,7 @@ import eu.eudat.utilities.helpers.LabelGenerator; import java.util.List; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class DataManagementPlanListingModel implements DataModel { private String id; private String label; diff --git a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java index 3db86aae5..856935fab 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/listingmodels/DatasetListingModel.java @@ -21,9 +21,7 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class DatasetListingModel implements DataModel { private String id; private String label; diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java b/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java index 72786d291..33c4561d3 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java +++ b/dmp-backend/src/main/java/eu/eudat/models/login/Credentials.java @@ -1,8 +1,6 @@ package eu.eudat.models.login; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class Credentials { private String username; private String secret; diff --git a/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java b/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java index d902a6212..6a5413245 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java +++ b/dmp-backend/src/main/java/eu/eudat/models/login/LoginInfo.java @@ -2,9 +2,7 @@ package eu.eudat.models.login; import eu.eudat.security.validators.TokenValidatorFactoryImpl; -/** - * Created by ikalyvas on 12/18/2017. - */ + public class LoginInfo { private String ticket; private TokenValidatorFactoryImpl.LoginProvider provider; diff --git a/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java b/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java index 74c69e6c6..ded6cebf7 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java +++ b/dmp-backend/src/main/java/eu/eudat/models/loginprovider/LoginProviderUser.java @@ -2,9 +2,7 @@ package eu.eudat.models.loginprovider; import eu.eudat.security.validators.TokenValidatorFactoryImpl; -/** - * Created by ikalyvas on 1/9/2018. - */ + public class LoginProviderUser { private String name; private String email; diff --git a/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java b/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java index 28fcc5bdf..99f20278c 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java +++ b/dmp-backend/src/main/java/eu/eudat/models/mail/SimpleMail.java @@ -1,8 +1,6 @@ package eu.eudat.models.mail; -/** - * Created by ikalyvas on 1/5/2018. - */ + public class SimpleMail { private String from; private String to; diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java b/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java index 7afd40023..8d6a7a954 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaModel.java @@ -6,9 +6,7 @@ import eu.eudat.models.DataModel; import java.util.UUID; -/** - * Created by ikalyvas on 1/15/2018. - */ + public class ProjectCriteriaModel implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java b/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java index 2eb111557..3bf00e34e 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java +++ b/dmp-backend/src/main/java/eu/eudat/models/project/ProjectCriteriaRequest.java @@ -3,8 +3,6 @@ package eu.eudat.models.project; import eu.eudat.models.criteria.ProjectCriteria; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 12/18/2017. - */ + public class ProjectCriteriaRequest extends RequestItem{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java b/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java index 2174a8b98..e15fade9e 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java +++ b/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java @@ -4,9 +4,7 @@ import eu.eudat.models.user.components.datasetprofile.*; import java.util.List; -/** - * Created by ikalyvas on 1/19/2018. - */ + public class DatasetProfilePage { private Integer ordinal; private String title; diff --git a/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java b/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java index 299a01e67..f20d926c4 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java +++ b/dmp-backend/src/main/java/eu/eudat/models/security/Principal.java @@ -7,9 +7,7 @@ import eu.eudat.types.Authorities; import java.util.*; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 12/15/2017. - */ + public class Principal { private UUID id; private UUID token; diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java b/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java index 0eddceb07..f652bbc50 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java +++ b/dmp-backend/src/main/java/eu/eudat/models/user/composite/DatasetProfilePage.java @@ -3,9 +3,7 @@ package eu.eudat.models.user.composite; import eu.eudat.models.user.components.datasetprofile.Section; import java.util.List; -/** - * Created by ikalyvas on 1/19/2018. - */ + public class DatasetProfilePage { private Integer ordinal; private String title; diff --git a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java b/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java index 6a30c7a4e..4199071bd 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/models/user/composite/PagedDatasetProfile.java @@ -9,9 +9,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 1/19/2018. - */ + public class PagedDatasetProfile implements PropertiesGenerator { private List pages; private List rules; diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java index 56165b2be..ea68796de 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoInvitationModel.java @@ -6,9 +6,7 @@ import eu.eudat.models.DataModel; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class UserInfoInvitationModel implements DataModel{ private UUID id; private String email; diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java index 284217edc..77af96280 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoRequestItem.java @@ -3,8 +3,6 @@ package eu.eudat.models.userinfo; import eu.eudat.models.criteria.UserInfoCriteria; import eu.eudat.models.helpers.requests.RequestItem; -/** - * Created by ikalyvas on 1/4/2018. - */ + public class UserInfoRequestItem extends RequestItem{ } diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java index daecbf449..d3f0708d0 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserInfoTableRequestItem.java @@ -3,8 +3,6 @@ package eu.eudat.models.userinfo; import eu.eudat.models.criteria.UserInfoCriteria; import eu.eudat.models.helpers.requests.TableRequest; -/** - * Created by ikalyvas on 1/31/2018. - */ + public class UserInfoTableRequestItem extends TableRequest { } diff --git a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java index 89e8b8928..4d1ea8cf9 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/userinfo/UserListingModel.java @@ -9,9 +9,7 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -/** - * Created by ikalyvas on 1/31/2018. - */ + public class UserListingModel implements DataModel { private UUID id; diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java b/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java index ba47baa46..1203bc3ee 100644 --- a/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java +++ b/dmp-backend/src/main/java/eu/eudat/proxy/config/entities/DatasetUrls.java @@ -7,9 +7,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import java.util.List; -/** - * Created by ikalyvas on 1/17/2018. - */ + public class DatasetUrls { List urls; FetchStrategy fetchMode; diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java b/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java index f71efa226..48bff08db 100644 --- a/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java +++ b/dmp-backend/src/main/java/eu/eudat/queryable/QueryableList.java @@ -35,7 +35,5 @@ public interface QueryableList> { QueryableList withHint(String hint); - QueryableList withFields(List fields); - Long count(); } diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java b/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java index ef171fbdb..8e8c5fe08 100644 --- a/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java +++ b/dmp-backend/src/main/java/eu/eudat/queryable/exceptions/NotSingleResultException.java @@ -1,8 +1,6 @@ package eu.eudat.queryable.exceptions; -/** - * Created by ikalyvas on 1/30/2018. - */ + public class NotSingleResultException extends RuntimeException{ public NotSingleResultException() { super(); diff --git a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java b/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java index 97965e47b..eda14f829 100644 --- a/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java +++ b/dmp-backend/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java @@ -24,7 +24,7 @@ public class QueryableHibernateList> implements Queryabl private Root root; private List predicates = new LinkedList(); private List orderings = new LinkedList<>(); - private List> fields = new LinkedList<>(); + private List fields = new LinkedList<>(); private Integer length; private Integer offset; private Set hints; @@ -103,14 +103,6 @@ public class QueryableHibernateList> implements Queryabl return this; } - @Override - public QueryableList withFields(List fields) { - for (String field : fields) { - this.fields.add(this.root.get(field)); - } - return this; - } - public Long count() { CriteriaBuilder criteriaBuilder = this.manager.getCriteriaBuilder(); CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class); @@ -123,8 +115,6 @@ public class QueryableHibernateList> implements Queryabl this.query.where(this.predicates.toArray(new Predicate[this.predicates.size()])); if (!this.orderings.isEmpty()) this.query.orderBy(this.orderings); - if (this.fields != null && !this.fields.isEmpty()) this.query.multiselect(this.fields); - TypedQuery typedQuery = this.manager.createQuery(this.query); if (this.offset != null) typedQuery.setFirstResult(this.offset); if (this.length != null) typedQuery.setMaxResults(this.length); diff --git a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java b/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java index de7ba6c66..54a2b6481 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java +++ b/dmp-backend/src/main/java/eu/eudat/security/claims/ClaimedAuthorities.java @@ -10,9 +10,7 @@ import java.lang.annotation.Target; import static eu.eudat.types.Authorities.USER; -/** - * Created by ikalyvas on 1/30/2018. - */ + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) public @interface ClaimedAuthorities { diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java b/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java index ca99d8eac..01ddce38d 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java +++ b/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactory.java @@ -1,8 +1,6 @@ package eu.eudat.security.validators; -/** - * Created by ikalyvas on 1/9/2018. - */ + public interface TokenValidatorFactory { TokenValidator getProvider(TokenValidatorFactoryImpl.LoginProvider provider); } diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java b/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java index 502d96dd6..e7f241fcb 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidatorFactoryImpl.java @@ -7,9 +7,7 @@ import eu.eudat.security.validators.twitter.TwitterTokenValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -/** - * Created by ikalyvas on 1/9/2018. - */ + @Service("tokenValidatorFactory") public class TokenValidatorFactoryImpl implements TokenValidatorFactory{ public enum LoginProvider { diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java b/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java index 56c51cb71..73486bf79 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/security/validators/facebook/FacebookTokenValidator.java @@ -32,9 +32,7 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.util.*; -/** - * Created by ikalyvas on 1/9/2018. - */ + @Component("facebookTokenValidator") public class FacebookTokenValidator implements TokenValidator { diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java b/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java index 3b4ea90c9..c81d2a040 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/security/validators/linkedin/LinkedInTokenValidator.java @@ -21,9 +21,7 @@ import org.springframework.stereotype.Component; import java.io.IOException; import java.security.GeneralSecurityException; -/** - * Created by ikalyvas on 1/10/2018. - */ + @Component("linkedInTokenValidator") public class LinkedInTokenValidator implements TokenValidator { diff --git a/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java b/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java index 136e86fd6..c5b1d44c4 100644 --- a/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/security/validators/twitter/TwitterTokenValidator.java @@ -26,9 +26,7 @@ import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Map; -/** - * Created by ikalyvas on 1/11/2018. - */ + @Component("twitterTokenValidator") public class TwitterTokenValidator implements TokenValidator { diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java b/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java index 6aba099df..76e782861 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java +++ b/dmp-backend/src/main/java/eu/eudat/services/ApiContext.java @@ -4,9 +4,7 @@ import eu.eudat.proxy.fetching.RemoteFetcher; import org.springframework.context.ApplicationContext; import org.springframework.context.MessageSource; -/** - * Created by ikalyvas on 1/3/2018. - */ + public interface ApiContext { DatabaseRepository getDatabaseRepository(); ApplicationContext getApplicationContext(); diff --git a/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java b/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java index 1ad80ba04..0e4feb222 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/services/ApiContextImpl.java @@ -6,9 +6,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.MessageSource; import org.springframework.stereotype.Service; -/** - * Created by ikalyvas on 1/3/2018. - */ + @Service("apiContext") public class ApiContextImpl implements ApiContext{ diff --git a/dmp-backend/src/main/java/eu/eudat/services/AuthenticationService.java b/dmp-backend/src/main/java/eu/eudat/services/AuthenticationService.java index e562aeb29..c9b6aae0b 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/AuthenticationService.java +++ b/dmp-backend/src/main/java/eu/eudat/services/AuthenticationService.java @@ -20,9 +20,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.xml.ws.ServiceMode; import java.util.*; -/** - * Created by ikalyvas on 12/15/2017. - */ + @Service("authenticationService ") public class AuthenticationService { private ApiContext apiContext; diff --git a/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepository.java b/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepository.java index 4f796c068..286de5fac 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepository.java +++ b/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepository.java @@ -4,9 +4,7 @@ import eu.eudat.dao.entities.*; import eu.eudat.dao.entities.security.CredentialDao; import eu.eudat.dao.entities.security.UserTokenDao; -/** - * Created by ikalyvas on 1/4/2018. - */ + public interface DatabaseRepository { DataRepositoryDao getDataRepositoryDao(); DatasetDao getDatasetDao(); diff --git a/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepositoryImpl.java b/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepositoryImpl.java index 21af3271e..91aeb976a 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepositoryImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/services/DatabaseRepositoryImpl.java @@ -8,9 +8,7 @@ import org.springframework.stereotype.Service; import javax.persistence.EntityManager; -/** - * Created by ikalyvas on 1/4/2018. - */ + @Service("databaseRepository") public class DatabaseRepositoryImpl implements DatabaseRepository{ diff --git a/dmp-backend/src/main/java/eu/eudat/services/InvitationService.java b/dmp-backend/src/main/java/eu/eudat/services/InvitationService.java index a7806eb3e..f05d36d2a 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/InvitationService.java +++ b/dmp-backend/src/main/java/eu/eudat/services/InvitationService.java @@ -10,9 +10,7 @@ import eu.eudat.models.userinfo.UserInfoInvitationModel; import java.util.List; -/** - * Created by ikalyvas on 1/4/2018. - */ + public interface InvitationService { void assignToDmp(DMPDao dmpDao, List users, DMP dmp); diff --git a/dmp-backend/src/main/java/eu/eudat/services/InvitationServiceImpl.java b/dmp-backend/src/main/java/eu/eudat/services/InvitationServiceImpl.java index 1e7beedb8..7c67a402b 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/InvitationServiceImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/services/InvitationServiceImpl.java @@ -15,9 +15,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -/** - * Created by ikalyvas on 1/4/2018. - */ + @Service("invitationService") public class InvitationServiceImpl implements InvitationService { @Override diff --git a/dmp-backend/src/main/java/eu/eudat/services/MailService.java b/dmp-backend/src/main/java/eu/eudat/services/MailService.java index 5e1ca21d3..440cbaeed 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/MailService.java +++ b/dmp-backend/src/main/java/eu/eudat/services/MailService.java @@ -2,9 +2,7 @@ package eu.eudat.services; import eu.eudat.models.mail.SimpleMail; -/** - * Created by ikalyvas on 1/5/2018. - */ + public interface MailService { void sendSimpleMail(SimpleMail mail); String getMailTemplateContent(); diff --git a/dmp-backend/src/main/java/eu/eudat/services/MailServiceImpl.java b/dmp-backend/src/main/java/eu/eudat/services/MailServiceImpl.java index 6063783de..5475ae4bf 100644 --- a/dmp-backend/src/main/java/eu/eudat/services/MailServiceImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/services/MailServiceImpl.java @@ -7,9 +7,7 @@ import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; -/** - * Created by ikalyvas on 1/5/2018. - */ + @Service("mailService") public class MailServiceImpl implements MailService{ @Autowired diff --git a/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java b/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java index d14d8356f..ccbfb798d 100644 --- a/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java +++ b/dmp-backend/src/main/java/eu/eudat/types/ApiMessageCode.java @@ -2,9 +2,7 @@ package eu.eudat.types; import eu.eudat.entities.Project; -/** - * Created by ikalyvas on 1/23/2018. - */ + public enum ApiMessageCode { NO_MESSAGE(0),SUCCESS_MESSAGE(200), WARN_MESSAGE(300), ERROR_MESSAGE(400), DEFAULT_ERROR_MESSAGE(444); diff --git a/dmp-backend/src/main/java/eu/eudat/types/Authorities.java b/dmp-backend/src/main/java/eu/eudat/types/Authorities.java index 6fb07fdc7..b4bca49ae 100644 --- a/dmp-backend/src/main/java/eu/eudat/types/Authorities.java +++ b/dmp-backend/src/main/java/eu/eudat/types/Authorities.java @@ -3,9 +3,7 @@ package eu.eudat.types; import java.util.Arrays; import java.util.List; -/** - * Created by ikalyvas on 1/30/2018. - */ + public enum Authorities { USER(0), MANAGER(1), ADMIN(2); diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/DatabaseDefinition.java b/dmp-backend/src/main/java/eu/eudat/utilities/DatabaseDefinition.java index f75b38a51..1faceb554 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/DatabaseDefinition.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/DatabaseDefinition.java @@ -1,7 +1,5 @@ package eu.eudat.utilities; -/** - * Created by ikalyvas on 12/15/2017. - */ + public interface DatabaseDefinition { } diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/ModelSerializer.java b/dmp-backend/src/main/java/eu/eudat/utilities/ModelSerializer.java index 363b63d37..c1913030b 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/ModelSerializer.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/ModelSerializer.java @@ -1,8 +1,6 @@ package eu.eudat.utilities; -/** - * Created by ikalyvas on 12/15/2017. - */ + import eu.eudat.entities.xmlmodels.modeldefinition.DatabaseModelDefinition; import eu.eudat.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition; diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/ViewStyleDefinition.java b/dmp-backend/src/main/java/eu/eudat/utilities/ViewStyleDefinition.java index 78323a741..27e9c1529 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/ViewStyleDefinition.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/ViewStyleDefinition.java @@ -1,8 +1,6 @@ package eu.eudat.utilities; -/** - * Created by ikalyvas on 12/15/2017. - */ + import eu.eudat.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition; diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/XmlSerializable.java b/dmp-backend/src/main/java/eu/eudat/utilities/XmlSerializable.java index c3189d992..8aa5b304f 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/XmlSerializable.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/XmlSerializable.java @@ -1,8 +1,6 @@ package eu.eudat.utilities; -/** - * Created by ikalyvas on 12/15/2017. - */ + import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/builders/DomainModelConverter.java b/dmp-backend/src/main/java/eu/eudat/utilities/builders/DomainModelConverter.java index c4d45e742..c11df8e95 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/builders/DomainModelConverter.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/builders/DomainModelConverter.java @@ -1,8 +1,6 @@ package eu.eudat.utilities.builders; -/** - * Created by ikalyvas on 12/15/2017. - */ + import eu.eudat.entities.DataEntity; import eu.eudat.models.DataModel; diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java index 136d65b42..e8e3b0996 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelBuilder.java @@ -2,9 +2,7 @@ package eu.eudat.utilities.helpers; import java.util.List; -/** - * Created by ikalyvas on 12/19/2017. - */ + public class LabelBuilder { private static String generateLabel(List items){ String label=""; diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java index 0754d0e6e..638454c0a 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/LabelGenerator.java @@ -1,8 +1,6 @@ package eu.eudat.utilities.helpers; -/** - * Created by ikalyvas on 12/19/2017. - */ + public interface LabelGenerator { String generateLabel(); } diff --git a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java index bc9d151dc..22523a62f 100644 --- a/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java +++ b/dmp-backend/src/main/java/eu/eudat/utilities/helpers/ModelSerializer.java @@ -1,8 +1,6 @@ package eu.eudat.utilities.helpers; -/** - * Created by ikalyvas on 12/15/2017. - */ + import eu.eudat.entities.xmlmodels.modeldefinition.DatabaseModelDefinition; import eu.eudat.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition; diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java b/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java index fa0832f9b..af48741e1 100644 --- a/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/validators/DataManagementPlanTableRequestValidator.java @@ -5,9 +5,7 @@ import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -/** - * Created by ikalyvas on 12/22/2017. - */ + @Component("dataManagementPlanTableRequestValidator") public class DataManagementPlanTableRequestValidator implements Validator { @Override diff --git a/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java b/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java index 5898411bc..a230c06fb 100644 --- a/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/validators/DatasetProfileValidator.java @@ -6,9 +6,7 @@ import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -/** - * Created by ikalyvas on 1/3/2018. - */ + @Component("datasetProfileValidator") public class DatasetProfileValidator implements Validator { @Override diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java b/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java index 2bd6849ef..f74a5b7e9 100644 --- a/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/validators/ProjectModelValidator.java @@ -5,9 +5,7 @@ import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -/** - * Created by ikalyvas on 1/3/2018. - */ + @Component("projectModelValidator") public class ProjectModelValidator implements Validator { @Override diff --git a/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java b/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java index ba02d269e..dabdac218 100644 --- a/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java +++ b/dmp-backend/src/main/java/eu/eudat/validators/ProjectTableRequestValidator.java @@ -6,9 +6,7 @@ import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -/** - * Created by ikalyvas on 1/2/2018. - */ + @Component("projectTableRequestValidator") public class ProjectTableRequestValidator implements Validator { @Override