Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.nio.file.StandardOpenOption;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.configuration.ConfigurationFile;
import org.frankframework.flow.configuration.ConfigurationXmlDTO;
import org.frankframework.flow.exception.ApiException;
Expand All @@ -25,7 +25,7 @@
import org.w3c.dom.Node;
import org.xml.sax.SAXException;

@Slf4j
@Log4j2
@Service
public class AdapterService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.exception.ApiException;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -16,7 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.xml.sax.SAXException;

@Slf4j
@Log4j2
@RestController
@RequestMapping("/projects/{projectName}/configuration")
public class ConfigurationController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.nio.file.Path;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.exception.ApiException;
import org.frankframework.flow.file.FileTreeService;
import org.frankframework.flow.filesystem.FileSystemStorage;
Expand All @@ -26,7 +26,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

@Slf4j
@Log4j2
@Service
public class ConfigurationService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import java.nio.file.Files;
import java.nio.file.Path;
import javax.xml.transform.stream.StreamSource;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import net.sf.saxon.s9api.*;
import org.frankframework.flow.exception.ApiException;
import org.frankframework.flow.file.FileTreeService;
import org.frankframework.flow.filesystem.FileSystemStorage;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;

@Slf4j
@Log4j2
@Service
public class DatamapperGeneratorService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
import java.util.Collections;
import java.util.List;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.common.config.ClientSession;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;

@Service
@Profile("cloud")
@Slf4j
@Log4j2
public class CloudFileSystemStorageService implements FileSystemStorage {
@Value("${frankflow.workspace.root:/tmp/frankflow/workspace}")
private String baseWorkspacePath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.FileSystemUtils;

@Slf4j
@Log4j2
@Service
@Profile("cloud")
public class WorkspaceCleanupService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.frankframework.flow.frankconfig;

import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@Log4j2
@RestController
@RequestMapping("/xsd/frankconfig")
public class FrankConfigXsdController {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.frankframework.flow.frankconfig;

import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.exception.ApiException;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;

@Log4j2
@Service
@Slf4j
public class FrankConfigXsdService {
private static final String FRANKCONFIG_XSD_URL = "https://schemas.frankframework.org/FrankConfig.xsd";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.frankframework.flow.frankdoc;

import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@Log4j2
@RestController
@RequestMapping("/json/frankdoc")
public class FrankDocController {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.frankframework.flow.frankdoc;

import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.exception.ApiException;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;

@Log4j2
@Service
@Slf4j
public class FrankDocService {
private static final String FRANKDOC_JSON_URL = "https://frankdoc.frankframework.org/js/frankdoc.json";

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/frankframework/flow/git/GitController.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.frankframework.flow.git;

import java.io.IOException;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.exception.ApiException;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@Log4j2
@RestController
@RequestMapping("/projects/{projectName}/git")
public class GitController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;

@Slf4j
@Log4j2
public final class GitCredentialHelper {

private static final long PROCESS_TIMEOUT_SECONDS = 10;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/frankframework/flow/git/GitService.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.stream.IntStream;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.PullCommand;
Expand Down Expand Up @@ -52,7 +52,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;

@Slf4j
@Log4j2
@Service
public class GitService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.common.AllowAllFrankUserRoles;
import org.frankframework.flow.common.FrankFrameworkService;
import org.frankframework.flow.common.config.ClientSession;
Expand All @@ -28,7 +28,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

@Slf4j
@Log4j2
@RestController
@RequestMapping("/projects")
public class ConfigurationProjectController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
Expand All @@ -31,7 +31,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

@Slf4j
@Log4j2
@Service
public class ConfigurationProjectService {
private static final String CONFIGURATIONS_DIR = "src/main/configurations";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.log4j.Log4j2;
import org.frankframework.flow.filesystem.FileSystemStorage;
import org.springframework.stereotype.Service;

@Slf4j
@Log4j2
@Service
public class RecentProjectsService {

Expand Down
Loading