From: vasary.daniel <TFS\vasary.daniel>
Date: Wed, 16 Mar 2022 12:16:09 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=8d57a5c3ec9160178c6ed1be26a5d360a02e1084;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33040
---

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
index 725bca4f..c055c489 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PathItemsCollectorStep.java
@@ -16,9 +16,8 @@ import org.apache.logging.log4j.Logger;
 
 import com.ibm.nosql.json.api.BasicDBObject;
 
-/* DO NOT REMOVE!
-import user.jobengine.server.steps.FileSearchFilterOptions;
-*/
+import user.jobengine.server.steps.shared.FileSearchFilterOptions;
+
 public class PathItemsCollectorStep extends JobStep {
 	private static final Logger logger = LogManager.getLogger();
 
@@ -32,7 +31,7 @@ public class PathItemsCollectorStep extends JobStep {
 
 		List<String> files = new ArrayList<>();
 
-		//teljes rekurzivitas szuressel
+		// teljes rekurzivitas szuressel
 		FileSearchFilterOptions filterOptions = createFileFilter(filter);
 		FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {
 			@Override
@@ -60,7 +59,8 @@ public class PathItemsCollectorStep extends JobStep {
 		try {
 			Files.walkFileTree(sourcePath, visitor);
 		} catch (Exception e) {
-			logger.error(getSessionMarker(), "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());
+			logger.error(getSessionMarker(), "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}",
+					sourcePath, e.getMessage());
 			logger.catching(e);
 			throw e;
 		} finally {
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
index 8b104d9b..fa6fd427 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RundownFilesCollectorStep.java
@@ -9,9 +9,8 @@ import org.apache.logging.log4j.Logger;
 
 import com.ibm.nosql.json.api.BasicDBObject;
 
-/* DO NOT REMOVE!
-import user.jobengine.server.steps.FileSearchFilterOptions;
-*/
+import user.jobengine.server.steps.shared.FileSearchFilterOptions;
+
 public class RundownFilesCollectorStep extends PathItemsCollectorStep {
 	private static final Logger logger = LogManager.getLogger();
 
@@ -25,7 +24,8 @@ public class RundownFilesCollectorStep extends PathItemsCollectorStep {
 		FileSearchFilterOptions result = new FileSearchFilterOptions(filter) {
 			@Override
 			public boolean acceptFile(Path file) {
-				if (file.toString().contains(df.format(thisMonthCal.getTime())) || file.toString().contains(df.format(nextMonthCal.getTime())))
+				if (file.toString().contains(df.format(thisMonthCal.getTime()))
+						|| file.toString().contains(df.format(nextMonthCal.getTime())))
 					return super.acceptFile(file);
 
 				return false;
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
similarity index 91%
rename from server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java
rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
index 436c3be0..b5a8d0e8 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileSearchFilterOptions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FileSearchFilterOptions.java
@@ -1,4 +1,4 @@
-package user.jobengine.server.steps;
+package user.jobengine.server.steps.shared;
 
 import java.nio.file.Path;
 import java.util.regex.Matcher;