Skip to content

chore: remove unused spring dependency and usage #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeanBerrieHRI merged 1 commit into from
Jun 25, 2026
Merged

chore: remove unused spring dependency and usage #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/main/java/nl/healthri/fdp/uploadschema/integrations/FdpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
package nl.healthri.fdp.uploadschema.integrations;

import com.fasterxml.jackson.databind.ObjectMapper;

import nl.healthri.fdp.uploadschema.domain.ResourceTask;
import nl.healthri.fdp.uploadschema.domain.ShapeTask;
import nl.healthri.fdp.uploadschema.dto.auth.LoginRequestDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginResponseDto;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceRequestDto;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.ReleaseSchemaRequestDto;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.UpdateSchemaRequestDto;
import nl.healthri.fdp.uploadschema.dto.settings.SettingsRequestDto;
import nl.healthri.fdp.uploadschema.dto.settings.SettingsResponseDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginRequestDto;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginResponseDto;
import nl.healthri.fdp.uploadschema.integrations.exceptions.FdpClientException;
import nl.healthri.fdp.uploadschema.utils.HttpRequestUtils;

import org.apache.http.HttpHeaders;
import org.apache.http.entity.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.*;
import java.util.List;
import java.util.Objects;

@Component
public class FdpClient implements FdpClientInterface {
private final HttpClient client;
private final URI hostname;
Expand Down
22 changes: 10 additions & 12 deletions src/main/java/nl/healthri/fdp/uploadschema/services/FdpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
package nl.healthri.fdp.uploadschema.services;

import nl.healthri.fdp.uploadschema.config.fdp.Settings;
import nl.healthri.fdp.uploadschema.domain.Version;
import nl.healthri.fdp.uploadschema.domain.ResourceTask;
import nl.healthri.fdp.uploadschema.domain.ShapeTask;
import nl.healthri.fdp.uploadschema.domain.Version;
import nl.healthri.fdp.uploadschema.dto.auth.LoginRequestDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginResponseDto;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceRequestDto;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.ReleaseSchemaRequestDto;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.UpdateSchemaRequestDto;
import nl.healthri.fdp.uploadschema.dto.settings.SettingsRequestDto;
import nl.healthri.fdp.uploadschema.dto.settings.SettingsResponseDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginRequestDto;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.dto.auth.LoginResponseDto;
import nl.healthri.fdp.uploadschema.integrations.FdpClientInterface;
import nl.healthri.fdp.uploadschema.integrations.exceptions.FdpClientException;
import nl.healthri.fdp.uploadschema.utils.SchemaInfo;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceResponseDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;

import static nl.healthri.fdp.uploadschema.config.fdp.Settings.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static nl.healthri.fdp.uploadschema.config.fdp.Settings.convertToEntity;

@Service
public class FdpService implements FdpServiceInterface {
private final FdpClientInterface fdpClient;

private static final Logger logger = LoggerFactory.getLogger(FdpService.class);

@Autowired
public FdpService(FdpClientInterface fdpClient) {
this.fdpClient = fdpClient;
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/nl/healthri/fdp/uploadschema/services/ResourceTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
package nl.healthri.fdp.uploadschema.services;

import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.domain.ResourceTask;
import nl.healthri.fdp.uploadschema.dto.resource.ResourceResponseDto;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.utils.ResourceInfo;
import nl.healthri.fdp.uploadschema.utils.SchemaInfo;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

import static nl.healthri.fdp.uploadschema.utils.ResourceInfo.createResourceInfoMap;
import static nl.healthri.fdp.uploadschema.utils.SchemaInfo.createSchemaInfoMap;

@Service
public class ResourceTaskService implements ResourceTaskServiceInterface {
public FdpServiceInterface fdpService;
public Properties properties;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/nl/healthri/fdp/uploadschema/services/SchemaToolService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package nl.healthri.fdp.uploadschema.services;

import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.domain.ResourceTask;
import nl.healthri.fdp.uploadschema.domain.ShapeTask;
import nl.healthri.fdp.uploadschema.utils.FileHandler;
import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.utils.RdfUtils;
import nl.healthri.fdp.uploadschema.utils.XlsToRdfUtils;
import org.eclipse.rdf4j.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -19,7 +18,6 @@

import static java.util.function.Predicate.not;

@Service
public class SchemaToolService implements SchemaToolServiceInterface {
public FdpServiceInterface fdpService;
public ResourceTaskServiceInterface resourceTaskService;
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/nl/healthri/fdp/uploadschema/services/ShapeTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package nl.healthri.fdp.uploadschema.services;

import nl.healthri.fdp.uploadschema.domain.Version;
import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.domain.ShapeTask;
import nl.healthri.fdp.uploadschema.domain.Version;
import nl.healthri.fdp.uploadschema.domain.enums.ShapeStatus;
import nl.healthri.fdp.uploadschema.dto.schema.SchemaDataResponseDto;
import nl.healthri.fdp.uploadschema.utils.*;
import nl.healthri.fdp.uploadschema.config.fdp.Properties;
import nl.healthri.fdp.uploadschema.utils.FileHandler;
import nl.healthri.fdp.uploadschema.utils.RdfUtils;
import nl.healthri.fdp.uploadschema.utils.SchemaInfo;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.util.Models;
import org.springframework.stereotype.Service;

import java.net.URI;
import java.util.*;
import java.util.List;

import static nl.healthri.fdp.uploadschema.utils.SchemaInfo.createSchemaInfoMap;

@Service
public class ShapeTaskService implements ShapeTaskServiceInterface {
public FdpServiceInterface fdpService;
public FileHandler fileHandler;
Expand Down