Update namespace and license

Dockerfile

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright © 2017 DTL
+# Copyright © 2024 FAIR Data Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Dockerfile.build

@@ -1,6 +1,6 @@
 #
 # The MIT License
-# Copyright © 2017 DTL
+# Copyright © 2024 FAIR Data Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 FAIR Data Team
+Copyright (c) 2024 FAIR Data Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pom.xml

@@ -8,7 +8,7 @@
         <version>3.2.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>nl.dtls</groupId>
+    <groupId>org</groupId>
     <artifactId>fairdatapoint</artifactId>
     <version>1.17.1</version>
     <packaging>jar</packaging>
@@ -276,7 +276,8 @@
                 <configuration>
                     <header>com/mycila/maven/plugin/license/templates/MIT.txt</header>
                     <properties>
-                        <owner>DTL</owner>
+                        <owner>FAIR Data Team</owner>
+                        <year>2024</year>
                     </properties>
                     <mapping>
                         <java>JAVADOC_STYLE</java>
@@ -331,7 +332,7 @@
                         </goals>
                         <configuration>
                             <classifier>spring-boot</classifier>
-                            <mainClass>nl.dtls.fairdatapoint.Application</mainClass>
+                            <mainClass>org.fairdatapoint.Application</mainClass>
                         </configuration>
                     </execution>
                     <execution>
@@ -416,7 +417,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <package>nl.dtls.fairdatapoint.vocabulary</package>
+                    <package>org.fairdatapoint.vocabulary</package>
                     <addGeneratedAnnotation>false</addGeneratedAnnotation>
                     <vocabularies>
                         <vocabulary>

src/main/java/nl/dtls/fairdatapoint/Application.java → src/main/java/org/fairdatapoint/Application.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -32,8 +32,8 @@
 @SpringBootApplication
 @EnableWebMvc
 @EnableAsync
-@ComponentScan(basePackages = "nl.dtls.fairdatapoint.*")
-@ConfigurationPropertiesScan("nl.dtls.fairdatapoint.config.*")
+@ComponentScan(basePackages = "org.fairdatapoint.*")
+@ConfigurationPropertiesScan("org.fairdatapoint.config.*")
 public class Application {
 
     private static final String PROFILES_PROPERTY = "spring.profiles.active";

src/main/java/nl/dtls/fairdatapoint/Profiles.java → src/main/java/org/fairdatapoint/Profiles.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint;
+package org.fairdatapoint;
 
 public class Profiles {
 

src/main/java/nl/dtls/fairdatapoint/api/controller/apikey/ApiKeyController.java → src/main/java/org/fairdatapoint/api/controller/apikey/ApiKeyController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.apikey;
+package org.fairdatapoint.api.controller.apikey;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.apikey.ApiKeyDTO;
-import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
-import nl.dtls.fairdatapoint.service.apikey.ApiKeyService;
+import org.fairdatapoint.api.dto.apikey.ApiKeyDTO;
+import org.fairdatapoint.entity.exception.ResourceNotFoundException;
+import org.fairdatapoint.service.apikey.ApiKeyService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/nl/dtls/fairdatapoint/api/controller/config/ConfigController.java → src/main/java/org/fairdatapoint/api/controller/config/ConfigController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.config;
+package org.fairdatapoint.api.controller.config;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.config.BootstrapConfigDTO;
-import nl.dtls.fairdatapoint.service.config.ConfigService;
+import org.fairdatapoint.api.dto.config.BootstrapConfigDTO;
+import org.fairdatapoint.service.config.ConfigService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java → src/main/java/org/fairdatapoint/api/controller/dashboard/DashboardController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.dashboard;
+package org.fairdatapoint.api.controller.dashboard;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
-import nl.dtls.fairdatapoint.service.dashboard.DashboardService;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+import org.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
+import org.fairdatapoint.service.dashboard.DashboardService;
+import org.fairdatapoint.service.metadata.exception.MetadataServiceException;
 import org.eclipse.rdf4j.model.IRI;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -38,9 +38,9 @@
 
 import java.util.List;
 
-import static nl.dtls.fairdatapoint.util.HttpUtil.getRequestURL;
-import static nl.dtls.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.HttpUtil.getRequestURL;
+import static org.fairdatapoint.util.RdfUtil.removeLastPartOfIRI;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @Tag(name = "Client")
 @RestController

src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java → src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,17 +25,17 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package nl.dtls.fairdatapoint.api.controller.exception;
+package org.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 nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
-import nl.dtls.fairdatapoint.entity.exception.*;
-import nl.dtls.fairdatapoint.entity.index.exception.AbstractIndexException;
-import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
+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.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.query.MalformedQueryException;
@@ -57,8 +57,8 @@
 import java.util.Map;
 
 import static java.lang.String.format;
-import static nl.dtls.fairdatapoint.util.RdfIOUtil.getWriterConfig;
-import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i;
+import static org.fairdatapoint.util.RdfIOUtil.getWriterConfig;
+import static org.fairdatapoint.util.ValueFactoryHelper.i;
 
 @ControllerAdvice
 @Slf4j

src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java → src/main/java/org/fairdatapoint/api/controller/form/FormAutocompleteController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.form;
+package org.fairdatapoint.api.controller.form;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
-import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
-import nl.dtls.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
+import org.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
+import org.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
+import org.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java → src/main/java/org/fairdatapoint/api/controller/index/IndexAdminController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,21 +20,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.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.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexEntryController.java → src/main/java/org/fairdatapoint/api/controller/index/IndexEntryController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,23 +20,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryInfoDTO;
-import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryUpdateDTO;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.entry.IndexEntryPermit;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.harvester.HarvesterService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+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.api.dto.index.entry.IndexEntryUpdateDTO;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.entry.IndexEntryPermit;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.harvester.HarvesterService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.eclipse.rdf4j.model.Model;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java → src/main/java/org/fairdatapoint/api/controller/index/IndexPingController.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License
- * Copyright © 2017 DTL
+ * Copyright © 2024 FAIR Data Team
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package nl.dtls.fairdatapoint.api.controller.index;
+package org.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -32,13 +32,13 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
-import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
-import nl.dtls.fairdatapoint.entity.index.event.IndexEvent;
-import nl.dtls.fairdatapoint.service.UtilityService;
-import nl.dtls.fairdatapoint.service.index.entry.IndexEntryService;
-import nl.dtls.fairdatapoint.service.index.event.EventService;
-import nl.dtls.fairdatapoint.service.index.webhook.WebhookService;
+import org.fairdatapoint.api.dto.index.ping.PingDTO;
+import org.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
+import org.fairdatapoint.entity.index.event.IndexEvent;
+import org.fairdatapoint.service.UtilityService;
+import org.fairdatapoint.service.index.entry.IndexEntryService;
+import org.fairdatapoint.service.index.event.EventService;
+import org.fairdatapoint.service.index.webhook.WebhookService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;