2.8.0 verziovaltas htv groovy problemak javitasa

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
index c7b2f5990f5e416cfee933da916bc50a673cbf60..941b65c62e73eaef71b51251097e557d372e4446 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
@@ -267,7 +267,8 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep {
                        current++;\r
                        if (current == limit)\r
                                break;\r
-                       setProgress(current * 100 / limit);\r
+                       int progress = current * 100 / limit;\r
+                       setProgress(progress);\r
                }\r
        }\r
 \r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java
index f1df9e946a8ecb08a9c9e8c292ffbf21e30705e8..f2216a33fdb86b0fc1d8b9cbd29301c37104952e 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java
@@ -58,8 +58,9 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.TIME_TO_AIR, result);\r
                storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DURATION, result);\r
                storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.TITLE, result);\r
-               //              storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DEVICE_ID, result);\r
-               //              storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.REASON, result);\r
+               // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DEVICE_ID,\r
+               // result);\r
+               // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.REASON, result);\r
                return result;\r
        }\r
 \r
@@ -77,14 +78,14 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                        processPathItems(filePaths);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
-                       logger.error(jobRuntime.getSessionMarker(), "Hiba a végrehajtás során. A rendszer üzenete: {}", e.getMessage());\r
+                       logger.error(getSessionMarker(), "Hiba a végrehajtás során. A rendszer üzenete: {}", e.getMessage());\r
                }\r
                return null;\r
        }\r
 \r
        private void moveProcessedCSV(Path csvFilePath) throws IOException {\r
                EscortFiles.ensureUNCFolder(csvFilePath.getParent().toString(), processedFolder);\r
-               String fileName = csvFilePath.getFileName() + "." + EscortFiles.composeKillDate(0);\r
+               String fileName = csvFilePath.getFileName().toString() + "." + EscortFiles.composeKillDate(0);\r
                Path targetPath = Paths.get(csvFilePath.getParent().toString(), processedFolder, fileName);\r
                Files.move(csvFilePath, targetPath);\r
        }\r
@@ -95,8 +96,8 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                String duration = data[metadatas.get(MorpheusStrings.DURATION)];\r
                String materialID = data[metadatas.get(MorpheusStrings.MATERIAL_ID)];\r
                String title = data[metadatas.get(MorpheusStrings.TITLE)];\r
-               //              String deviceID = data[metadatas.get(MorpheusStrings.DEVICE_ID)];\r
-               //              String reason = data[metadatas.get(MorpheusStrings.REASON)];\r
+               // String deviceID = data[metadatas.get(MorpheusStrings.DEVICE_ID)];\r
+               // String reason = data[metadatas.get(MorpheusStrings.REASON)];\r
 \r
                DBObject query = QueryBuilder.start()\r
                                .and(QueryBuilder.start(MorpheusStrings.MATERIALID).is(materialID).get(), QueryBuilder.start(MorpheusStrings.TIMETOAIR).is(timeToAir).get())\r
@@ -104,7 +105,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                DBCollection collection = db.getCollection(MorpheusStrings.COLLECTION_NAME);\r
                BasicDBObject existingObject = (BasicDBObject) collection.findOne(query);\r
                if (existingObject != null) {\r
-                       logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag már feldolgozásra került az {} időpontban.", materialID,\r
+                       logger.warn(getSessionMarker(), "Az '{}' anyag már feldolgozásra került az {} időpontban.", materialID,\r
                                        existingObject.getDate(MorpheusStrings.IMPORTED));\r
                        return;\r
                }\r
@@ -115,26 +116,26 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                dbObject.put(MorpheusStrings.DURATION, duration);\r
                dbObject.put(MorpheusStrings.MATERIALID, materialID);\r
                dbObject.put(MorpheusStrings.TITLE, title);\r
-               //              dbObject.put(MorpheusStrings.DEVICEID, deviceID);\r
-               //              dbObject.put(MorpheusStrings.REASON, reason);\r
+               // dbObject.put(MorpheusStrings.DEVICEID, deviceID);\r
+               // dbObject.put(MorpheusStrings.REASON, reason);\r
 \r
                String fileName = materialID + MXF_EXT;\r
 \r
                Path targetFilePath = Paths.get(targetPath, fileName);\r
                boolean exists = Files.exists(targetFilePath);\r
                if (exists && targetFilePath.toFile().length() > 0) {\r
-                       logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag már be van töltve.", materialID);\r
+                       logger.warn(getSessionMarker(), "Az '{}' anyag már be van töltve.", materialID);\r
                        dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_SKIPPED);\r
                } else {\r
                        List<IEntityBase> medias = dao.getByHouseId(fileName);\r
                        if (medias == null || medias.size() == 0) {\r
-                               logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag nem található az archívumban.", materialID);\r
+                               logger.warn(getSessionMarker(), "Az '{}' anyag nem található az archívumban.", materialID);\r
                                dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_UNAVAILABLE);\r
                        } else if (medias.size() > 1) {\r
-                               logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyagból egynél több található az archívumban.", materialID);\r
+                               logger.warn(getSessionMarker(), "Az '{}' anyagból egynél több található az archívumban.", materialID);\r
                                dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_MULTIPLE);\r
                        } else {\r
-                               logger.info(jobRuntime.getSessionMarker(), "Az '{}' anyag megtalálható az archívumban.", materialID);\r
+                               logger.info(getSessionMarker(), "Az '{}' anyag megtalálható az archívumban.", materialID);\r
                                dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_RESTORABLE);\r
 \r
                                MediaFile mf = (MediaFile) medias.get(0);\r
@@ -146,8 +147,9 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                collection.insert(dbObject);\r
        }\r
 \r
-       //      Channel,Time to Air,Duration,Material ID,Title,Device ID,Reason,\r
-       //      TX02,10-JAN-2018 13:25:21:08,00:05:00:00,M009572A,Tiéd a pálya/26. - 1. seg - Eredeti ** mc ,ICELE-02,On Domain (ISILON, ICELE-01, ICELE-05) ,\r
+       // Channel,Time to Air,Duration,Material ID,Title,Device ID,Reason,\r
+       // TX02,10-JAN-2018 13:25:21:08,00:05:00:00,M009572A,Tiéd a pálya/26. - 1. seg -\r
+       // Eredeti ** mc ,ICELE-02,On Domain (ISILON, ICELE-01, ICELE-05) ,\r
        private void processMissingMaterialCSV(Path csvFilePath, List<String> lines) throws Exception {\r
                if (lines == null | lines.size() == 0) {\r
                        return;\r
@@ -165,7 +167,8 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                                processLine(data, metadatas);\r
 \r
                        current++;\r
-                       setProgress(current * 100 / overall);\r
+                       int progress = current * 100 / overall;\r
+                       setProgress(progress);\r
                }\r
 \r
        }\r
@@ -178,7 +181,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                        moveProcessedCSV(csvFilePath);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
-                       logger.error(jobRuntime.getSessionMarker(), "A {} MORPHEUS állomány mozgatásakor hiba történt. A rendszer hibaüzenete: {}.", csvFile.getName(),\r
+                       logger.error(getSessionMarker(), "A {} MORPHEUS állomány mozgatásakor hiba történt. A rendszer hibaüzenete: {}.", csvFile.getName(),\r
                                        e.getMessage());\r
                }\r
        }\r
@@ -190,6 +193,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                        File csvFile = filePath.toFile();\r
                        if (csvFile.isDirectory() || !csvFile.getName().toLowerCase().endsWith(CSV_EXT.toLowerCase()))\r
                                continue;\r
+                       logger.info(getSessionMarker(), "Processing {}", filePath);\r
                        List<String> lines = Files.readAllLines(filePath, Charset.forName("UTF-8"));\r
                        overall += lines.size();\r
                        contents.put(filePath, lines);\r
@@ -203,39 +207,39 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
 \r
        private void setAndCheck(String sourcePath, String processedFolder, String targetPath, IJobEngine jobEngine) {\r
                if (jobEngine == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "Az folyamatkezelő réteg nem elérhető.");\r
+                       logger.error(getSessionMarker(), "Az folyamatkezelő réteg nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing JobEngine reference.");\r
                }\r
 \r
                IItemManager manager = jobEngine.getItemManager();\r
                if (manager == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "Az adatbáziskezelő réteg nem elérhető.");\r
+                       logger.error(getSessionMarker(), "Az adatbáziskezelő réteg nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing ItemManager reference.");\r
                }\r
                dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);\r
                if (dao == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "Az adatbáziskezelő réteg MediaFile kezelöje nem elérhető.");\r
+                       logger.error(getSessionMarker(), "Az adatbáziskezelő réteg MediaFile kezelöje nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing MediaFile DAO reference.");\r
                }\r
                if (sourcePath == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres.");\r
+                       logger.error(getSessionMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, 'sourcePath' input parameter missing.");\r
                }\r
                if (processedFolder == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "A folyamat 'processedFolder' bemeneti paramétere üres.");\r
+                       logger.error(getSessionMarker(), "A folyamat 'processedFolder' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, 'processedFolder' input parameter missing.");\r
                }\r
                this.processedFolder = processedFolder;\r
 \r
                if (targetPath == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "A folyamat 'targetPath' bemeneti paramétere üres.");\r
+                       logger.error(getSessionMarker(), "A folyamat 'targetPath' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing.");\r
                }\r
                this.targetPath = targetPath;\r
 \r
                db = NoSQLUtils.getNoSQLDB();\r
                if (db == null) {\r
-                       logger.error(jobRuntime.getSessionMarker(), "Sikertelen kapcsolódás a NoSQL adatbázishoz.");\r
+                       logger.error(getSessionMarker(), "Sikertelen kapcsolódás a NoSQL adatbázishoz.");\r
                        throw new NullPointerException("Can not connect to NoSQL database.");\r
                }\r
 \r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java
index 64018f37e4f027ea62762a8bc5edb173952c40e6..dd1246eafec4c27445e07535de2a22bfe034b84d 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java
@@ -6,9 +6,9 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class TranscodeStep extends JobStep {\r
-       private static int TRANSCODER_VERSION = SystemConfiguration.getInstance().value("services.transcoder.version");\r
-       private static String TRANSCODER_API_ADDRESS = SystemConfiguration.getInstance().value("services.transcoder.api.address");\r
-       private static String TRANSCODER_API_TEMPLATE = SystemConfiguration.getInstance().value("services.transcoder.api.template");\r
+       private static int TRANSCODER_VERSION = SystemConfiguration.getInstance().value("services.transcoder.version", 0);\r
+       private static String TRANSCODER_API_ADDRESS = SystemConfiguration.getInstance().value("services.transcoder.api.address", "");\r
+       private static String TRANSCODER_API_TEMPLATE = SystemConfiguration.getInstance().value("services.transcoder.api.template", "");\r
 \r
        @StepEntry\r
        public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, IJobEngine jobEngine,\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
index 129bb6bad7f20682eb7f0ea3b2dc7e73ac93527f..ef86f0a5550a16bf95299c4f739f8171e0a1fb88 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java
@@ -122,18 +122,15 @@ public class PlanAirExtensions {
        private static final String HYPHEN_SPACES = " - ";\r
        private static Connection connection;\r
 \r
-       private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn,\r
-                       Timecode tcOut) {\r
+       private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn, Timecode tcOut) {\r
                node.appendChild(doc.createElement("Long_File_Id")).appendChild(doc.createTextNode(name));\r
                node.appendChild(doc.createElement("Device_Id")).appendChild(doc.createTextNode(deviceID));\r
                node.appendChild(doc.createElement("Timecode_In")).appendChild(doc.createTextNode(tcIn.toString("")));\r
                node.appendChild(doc.createElement("Timecode_Out")).appendChild(doc.createTextNode(tcOut.toString("")));\r
-               node.appendChild(doc.createElement("Quality_Check"))\r
-                               .appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date())));\r
+               node.appendChild(doc.createElement("Quality_Check")).appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date())));\r
        }\r
 \r
-       private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration,\r
-                       String type) {\r
+       private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, String type) {\r
 \r
                node.appendChild(doc.createElement("Material_Id")).appendChild(doc.createTextNode(name));\r
                node.appendChild(doc.createElement("Title")).appendChild(doc.createTextNode(title));\r
@@ -150,7 +147,7 @@ public class PlanAirExtensions {
        }\r
 \r
        public static long getExistingRundownMedia(IItemManager manager, String houseid) {\r
-               final long[] result = { 0 };\r
+               final long[] result = new long[] { 0 };\r
                StringBuilder query = new StringBuilder();\r
                query.append("select mediaid, mediafilehouseid, filename");\r
                query.append(" ");\r
@@ -179,8 +176,7 @@ public class PlanAirExtensions {
         * <Long_File_Id>XMLTEST011</Long_File_Id> </Instance> </ImportItem>\r
         * </ImportItems>\r
         */\r
-       public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password,\r
-                       String name, String deviceID) throws Exception {\r
+       public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, String name, String deviceID) throws Exception {\r
                String result = null;\r
                try {\r
                        Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
@@ -209,7 +205,7 @@ public class PlanAirExtensions {
                                                for (int i = 1; i <= rsmd.getColumnCount(); i++)\r
                                                        System.out.println(rsmd.getColumnName(i) + " " + rsmd.getColumnTypeName(i));\r
 \r
-                                               int[] segment = { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") };\r
+                                               int[] segment = new int[] { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") };\r
                                                segments.add(segment);\r
                                                return true;\r
                                        }, st -> {\r
@@ -218,8 +214,7 @@ public class PlanAirExtensions {
                                        int out = segments.get(segments.size() - 1)[1];\r
                                        int in = segments.get(0)[0];\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "PROGRAMME");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
-                                                       new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -230,8 +225,7 @@ public class PlanAirExtensions {
                                        int in = rs.getInt("t_TcIn");\r
                                        int out = rs.getInt("t_TcOut");\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "COMMERCIAL");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
-                                                       new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -242,8 +236,7 @@ public class PlanAirExtensions {
                                        int in = rs.getInt("t_TcIn");\r
                                        int out = rs.getInt("t_TcOut");\r
                                        appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "JUNCTION");\r
-                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL),\r
-                                                       new Timecode(out, Type.PAL));\r
+                                       appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL));\r
                                        return false;\r
                                }, st -> {\r
                                        st.setString(1, name);\r
@@ -262,9 +255,8 @@ public class PlanAirExtensions {
                return result;\r
        }\r
 \r
-       public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl,\r
-                       String userName, String password, IResultSetConsumer consumer, IStatementDecorator decorator)\r
-                       throws Exception {\r
+       public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl, String userName, String password,\r
+                       IResultSetConsumer consumer, IStatementDecorator decorator) throws Exception {\r
                try {\r
                        Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
 \r