renamed package org.fairdatapoint to org.fairdatateam.fairdatapoint

for consistence with group id and other fairdatateam packages
FAIRDataTeam · Jan 22, 2025 · aa09cda · aa09cda
1 parent e7ba3db
commit aa09cda
Show file tree

Hide file tree

Showing 477 changed files with 2,054 additions and 2,045 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
         <version>3.2.12</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>org.fairdatapoint</groupId>
+    <groupId>org.fairdatateam.fairdatapoint</groupId>
     <artifactId>fairdatapoint</artifactId>
     <version>1.17.3</version>
     <packaging>jar</packaging>
@@ -330,7 +330,7 @@
                         </goals>
                         <configuration>
                             <classifier>spring-boot</classifier>
-                            <mainClass>org.fairdatapoint.Application</mainClass>
+                            <mainClass>org.fairdatateam.fairdatapoint.Application</mainClass>
                         </configuration>
                     </execution>
                     <execution>
@@ -431,7 +431,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <package>org.fairdatapoint.vocabulary</package>
+                    <package>org.fairdatateam.fairdatapoint.vocabulary</package>
                     <addGeneratedAnnotation>false</addGeneratedAnnotation>
                     <vocabularies>
                         <vocabulary>

diff --git a/...n/java/org/fairdatapoint/Application.java → ...irdatateam/fairdatapoint/Application.java b/...n/java/org/fairdatapoint/Application.java → ...irdatateam/fairdatapoint/Application.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -31,7 +31,7 @@
 @SpringBootApplication
 @EnableWebMvc
 @EnableAsync
-@ConfigurationPropertiesScan("org.fairdatapoint.config.*")
+@ConfigurationPropertiesScan("org.fairdatateam.fairdatapoint.config.*")
 public class Application {
 
     private static final String PROFILES_PROPERTY = "spring.profiles.active";

diff --git a/...main/java/org/fairdatapoint/Profiles.java → .../fairdatateam/fairdatapoint/Profiles.java b/...main/java/org/fairdatapoint/Profiles.java → .../fairdatateam/fairdatapoint/Profiles.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint;
+package org.fairdatateam.fairdatapoint;
 
 public class Profiles {
 

diff --git a/...i/controller/apikey/ApiKeyController.java → ...i/controller/apikey/ApiKeyController.java b/...i/controller/apikey/ApiKeyController.java → ...i/controller/apikey/ApiKeyController.java
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.apikey;
+package org.fairdatateam.fairdatapoint.api.controller.apikey;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import org.fairdatapoint.entity.exception.ResourceNotFoundException;
-import org.fairdatapoint.service.apikey.ApiKeyService;
+import org.fairdatateam.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatateam.fairdatapoint.service.apikey.ApiKeyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...i/controller/config/ConfigController.java → ...i/controller/config/ConfigController.java b/...i/controller/config/ConfigController.java → ...i/controller/config/ConfigController.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.config;
+package org.fairdatateam.fairdatapoint.api.controller.config;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import org.fairdatapoint.service.config.ConfigService;
+import org.fairdatateam.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatateam.fairdatapoint.service.config.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...roller/dashboard/DashboardController.java → ...roller/dashboard/DashboardController.java b/...roller/dashboard/DashboardController.java → ...roller/dashboard/DashboardController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.dashboard;
+package org.fairdatateam.fairdatapoint.api.controller.dashboard;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
-import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import org.fairdatapoint.service.dashboard.DashboardService;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatateam.fairdatapoint.service.dashboard.DashboardService;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -39,9 +39,9 @@
 
 import java.util.List;
 
-import static org.fairdatapoint.util.HttpUtil.getRequestURL;
-import static org.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController

diff --git a/.../exception/ExceptionControllerAdvice.java → .../exception/ExceptionControllerAdvice.java b/.../exception/ExceptionControllerAdvice.java → .../exception/ExceptionControllerAdvice.java
@@ -25,17 +25,18 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.fairdatapoint.api.controller.exception;
+package org.fairdatateam.fairdatapoint.api.controller.exception;
 
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.error.ErrorDTO;
-import org.fairdatapoint.entity.exception.*;
-import org.fairdatapoint.entity.index.exception.AbstractIndexException;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.api.dto.error.ErrorDTO;
+import org.fairdatateam.fairdatapoint.entity.exception.*;
+import org.fairdatateam.fairdatapoint.entity.exception.*;
+import org.fairdatateam.fairdatapoint.entity.index.exception.AbstractIndexException;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -57,8 +58,8 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.RdfIOUtil.getWriterConfig;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.getWriterConfig;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @ControllerAdvice
 @Slf4j

diff --git a/...ller/form/FormAutocompleteController.java → ...ller/form/FormAutocompleteController.java b/...ller/form/FormAutocompleteController.java → ...ller/form/FormAutocompleteController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.form;
+package org.fairdatateam.fairdatapoint.api.controller.form;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import org.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import org.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatateam.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
+import org.fairdatateam.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...ontroller/index/IndexAdminController.java → ...ontroller/index/IndexAdminController.java b/...ontroller/index/IndexAdminController.java → ...ontroller/index/IndexAdminController.java
@@ -20,20 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.event.EventService;
-import org.fairdatapoint.service.index.harvester.HarvesterService;
-import org.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.event.EventService;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;

diff --git a/...ontroller/index/IndexEntryController.java → ...ontroller/index/IndexEntryController.java b/...ontroller/index/IndexEntryController.java → ...ontroller/index/IndexEntryController.java
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import org.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.service.index.entry.IndexEntryService;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

diff --git a/...controller/index/IndexPingController.java → ...controller/index/IndexPingController.java b/...controller/index/IndexPingController.java → ...controller/index/IndexPingController.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -31,13 +31,13 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.fairdatapoint.api.dto.index.ping.PingDTO;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.entity.index.event.Event;
-import org.fairdatapoint.service.UtilityService;
-import org.fairdatapoint.service.index.event.EventService;
-import org.fairdatapoint.service.index.harvester.HarvesterService;
-import org.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatateam.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.entity.index.event.Event;
+import org.fairdatateam.fairdatapoint.service.UtilityService;
+import org.fairdatateam.fairdatapoint.service.index.event.EventService;
+import org.fairdatateam.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatateam.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...roller/index/IndexSettingsController.java → ...roller/index/IndexSettingsController.java b/...roller/index/IndexSettingsController.java → ...roller/index/IndexSettingsController.java
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.index;
+package org.fairdatateam.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
-import org.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
-import org.fairdatapoint.service.index.settings.IndexSettingsService;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
+import org.fairdatateam.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
+import org.fairdatateam.fairdatapoint.service.index.settings.IndexSettingsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;

diff --git a/...api/controller/label/LabelController.java → ...api/controller/label/LabelController.java b/...api/controller/label/LabelController.java → ...api/controller/label/LabelController.java
@@ -20,10 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.label;
+package org.fairdatateam.fairdatapoint.api.controller.label;
 
-import org.fairdatapoint.api.dto.label.LabelDTO;
-import org.fairdatapoint.service.label.LabelService;
+import org.fairdatateam.fairdatapoint.api.dto.label.LabelDTO;
+import org.fairdatateam.fairdatapoint.service.label.LabelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...ller/membership/MembershipController.java → ...ller/membership/MembershipController.java b/...ller/membership/MembershipController.java → ...ller/membership/MembershipController.java
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.membership;
+package org.fairdatateam.fairdatapoint.api.controller.membership;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.api.dto.membership.MembershipDTO;
-import org.fairdatapoint.service.membership.MembershipService;
+import org.fairdatateam.fairdatapoint.api.dto.membership.MembershipDTO;
+import org.fairdatateam.fairdatapoint.service.membership.MembershipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/...ontroller/metadata/GenericController.java → ...ontroller/metadata/GenericController.java b/...ontroller/metadata/GenericController.java → ...ontroller/metadata/GenericController.java
@@ -20,28 +20,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.fairdatapoint.api.controller.metadata;
+package org.fairdatateam.fairdatapoint.api.controller.metadata;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import org.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
-import org.fairdatapoint.entity.exception.ForbiddenException;
-import org.fairdatapoint.entity.exception.ValidationException;
-import org.fairdatapoint.entity.metadata.Metadata;
-import org.fairdatapoint.entity.metadata.MetadataState;
-import org.fairdatapoint.entity.resource.ResourceDefinition;
-import org.fairdatapoint.entity.resource.ResourceDefinitionChild;
-import org.fairdatapoint.entity.user.User;
-import org.fairdatapoint.service.metadata.common.MetadataService;
-import org.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
-import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
-import org.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
-import org.fairdatapoint.service.metadata.state.MetadataStateService;
-import org.fairdatapoint.service.resource.ResourceDefinitionService;
-import org.fairdatapoint.service.schema.MetadataSchemaService;
-import org.fairdatapoint.service.search.SearchFilterCache;
-import org.fairdatapoint.service.user.CurrentUserService;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatateam.fairdatapoint.database.rdf.repository.generic.GenericMetadataRepository;
+import org.fairdatateam.fairdatapoint.entity.exception.ForbiddenException;
+import org.fairdatateam.fairdatapoint.entity.exception.ValidationException;
+import org.fairdatateam.fairdatapoint.entity.metadata.Metadata;
+import org.fairdatateam.fairdatapoint.entity.metadata.MetadataState;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinition;
+import org.fairdatateam.fairdatapoint.entity.resource.ResourceDefinitionChild;
+import org.fairdatateam.fairdatapoint.entity.user.User;
+import org.fairdatateam.fairdatapoint.service.metadata.common.MetadataService;
+import org.fairdatateam.fairdatapoint.service.metadata.enhance.MetadataEnhancer;
+import org.fairdatateam.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatateam.fairdatapoint.service.metadata.factory.MetadataServiceFactory;
+import org.fairdatateam.fairdatapoint.service.metadata.state.MetadataStateService;
+import org.fairdatateam.fairdatapoint.service.resource.ResourceDefinitionService;
+import org.fairdatateam.fairdatapoint.service.schema.MetadataSchemaService;
+import org.fairdatateam.fairdatapoint.service.search.SearchFilterCache;
+import org.fairdatateam.fairdatapoint.service.user.CurrentUserService;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Value;
@@ -62,11 +62,11 @@
 import java.util.Optional;
 
 import static java.lang.String.format;
-import static org.fairdatapoint.util.HttpUtil.*;
-import static org.fairdatapoint.util.RdfIOUtil.changeBaseUri;
-import static org.fairdatapoint.util.RdfIOUtil.read;
-import static org.fairdatapoint.util.RdfUtil.*;
-import static org.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatateam.fairdatapoint.util.HttpUtil.*;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.changeBaseUri;
+import static org.fairdatateam.fairdatapoint.util.RdfIOUtil.read;
+import static org.fairdatateam.fairdatapoint.util.RdfUtil.*;
+import static org.fairdatateam.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Metadata")
 @RestController