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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
index a37e8cd8b35ee0ff8f88dcea884a529725a3dd02..a3f45946b98127c48c18f1025255fe247f9ebe4b 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java
@@ -1,7 +1,5 @@
 package user.jobengine.server.steps.shared;\r
 \r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.HashMap;\r
@@ -54,8 +52,8 @@ public class OctopusDataMiner {
        private static final String FIELDS_STORYFOLDER = "id,name,modified";\r
        private static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id";\r
        private static final String RUNDOWN = "Rundown";\r
-       //      private static final String OCTOPUS_DEVICE_NAME = "Octopus-Device-Name";\r
-       //      private static final String OCTOPUS_DEVICE_ID = "Octopus-Device-Id";\r
+       // private static final String OCTOPUS_DEVICE_NAME = "Octopus-Device-Name";\r
+       // private static final String OCTOPUS_DEVICE_ID = "Octopus-Device-Id";\r
        private static final String FIELDS = "fields";\r
        private static final String EXIT = "Exit";\r
        private static final String RESULT = "result";\r
@@ -66,9 +64,12 @@ public class OctopusDataMiner {
        private static final String MOSLABEL = "MOS: ";\r
        private static final Object STORY = "Story";\r
 \r
-       //      private static String OCTOPUS_API_ADDRESS = SystemConfiguration.getInstance().value("services.octopus.api.address");\r
-       //      private static String OCTOPUS_API_USER = SystemConfiguration.getInstance().value("services.octopus.api.user");\r
-       //      private static String OCTOPUS_API_PASSWORD = SystemConfiguration.getInstance().value("services.octopus.api.password");\r
+       // private static String OCTOPUS_API_ADDRESS =\r
+       // SystemConfiguration.getInstance().value("services.octopus.api.address");\r
+       // private static String OCTOPUS_API_USER =\r
+       // SystemConfiguration.getInstance().value("services.octopus.api.user");\r
+       // private static String OCTOPUS_API_PASSWORD =\r
+       // SystemConfiguration.getInstance().value("services.octopus.api.password");\r
        private DB db;\r
        private ResteasyWebTarget webTarget;\r
        private HashSet<Long> storyIDs = new HashSet<>();\r
@@ -124,7 +125,8 @@ public class OctopusDataMiner {
                                        references = new BasicDBList();\r
                                        result.put(storyId, references);\r
                                }\r
-                               references.add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++));\r
+                               references\r
+                                               .add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++));\r
                        }\r
                }\r
                return result;\r
@@ -139,7 +141,7 @@ public class OctopusDataMiner {
 \r
                        logger.info("Processing rundown {}", rundown.get(IOctopusAPI.NAME));\r
                        BasicDBObject rundownWithStoryids = queryRundown(rundown, FIELDS_RUNDOWN_STORYIDS);\r
-                       //TODO ez neha null?\r
+                       // TODO ez neha null?\r
                        long rundownId = rundownWithStoryids.getLong(IOctopusAPI.ID);\r
                        List<BasicDBObject> slugs = NoSQLUtils.asList(rundownWithStoryids, IOctopusAPI.SLUGS);\r
                        if (slugs == null)\r
@@ -194,7 +196,7 @@ public class OctopusDataMiner {
        public void execute(boolean includeArchived) throws Exception {\r
                this.includeArchived = includeArchived;\r
                logger.trace(STARTING);\r
-               //current = korábbi szinkronizálás\r
+               // current = korábbi szinkronizálás\r
                currentRundowns = getCurrentIDs(IOctopusAPI.RUNDOWN_COLLECTION);\r
                currentFolder = getCurrentIDs(IOctopusAPI.FOLDER_COLLECTION);\r
                currentStories = getCurrentIDs(IOctopusAPI.STORY_COLLECTION);\r
@@ -293,7 +295,7 @@ public class OctopusDataMiner {
                        return null;\r
 \r
                Map<String, String> mosLabels = extractScriptMosObjectIDs(story);\r
-               //logger.info(Arrays.deepToString(new ArrayList<>(mosLabels.keySet())));\r
+               // logger.info(Arrays.deepToString(new ArrayList<>(mosLabels.keySet())));\r
                BasicDBList result = null;\r
                for (BasicDBObject mosObject : mosObjects) {\r
                        if (!mosObject.containsKey(IOctopusAPI.MOS_ID))\r
@@ -305,11 +307,11 @@ public class OctopusDataMiner {
                        if (objId == null)\r
                                continue;\r
 \r
-                       \r
                        logger.info("MOS ID: {}", objId);\r
-                       \r
+\r
                        MetadataType metadataType = MetadataTypeDetector.GuessMetadataType(objId);\r
-                       if (!MetadataType.OctopusPlaceholder.equals(metadataType) && !MetadataType.OctopusStory.equals(metadataType))\r
+                       if (!MetadataType.OctopusPlaceholder.equals(metadataType)\r
+                                       && !MetadataType.OctopusStory.equals(metadataType))\r
                                continue;\r
                        if (result == null)\r
                                result = new BasicDBList();\r
@@ -387,7 +389,7 @@ public class OctopusDataMiner {
 \r
        private void fireProgressEvent() {\r
                currentObjectIndex++;\r
-               //logger.info("currentObjectIndex {}", currentObjectIndex);\r
+               // logger.info("currentObjectIndex {}", currentObjectIndex);\r
                int progress = currentObjectIndex * 100 / objectCount;\r
                if (progress != progressEvent.getProgress()) {\r
                        progressEvent.setProgress(progress);\r
@@ -438,14 +440,16 @@ public class OctopusDataMiner {
                        throw new RuntimeException(e.getString("message"));\r
 \r
                }\r
-               //{"exception":{"message":"Invalid credentials.","publicName":"AuthenticationFailedException"}}\r
+               // {"exception":{"message":"Invalid\r
+               // credentials.","publicName":"AuthenticationFailedException"}}\r
 \r
                return result;\r
        }\r
 \r
        private Builder query(String path, String fields) {\r
                ResteasyWebTarget target = webTarget.path(path).queryParam(FIELDS, fields);\r
-               //Builder result = target.request().header(OCTOPUS_DEVICE_ID, OCTOPUS_API_USER).header(OCTOPUS_DEVICE_NAME, OCTOPUS_API_PASSWORD);\r
+               // Builder result = target.request().header(OCTOPUS_DEVICE_ID,\r
+               // OCTOPUS_API_USER).header(OCTOPUS_DEVICE_NAME, OCTOPUS_API_PASSWORD);\r
                Builder result = target.request();\r
                return result;\r
        }\r
@@ -495,7 +499,8 @@ public class OctopusDataMiner {
                Builder query = query(RUNDOWN, FIELDS_RUNDOWN);\r
                Response response = null;\r
                if (includeArchived) {\r
-                       response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(), MediaType.APPLICATION_JSON));\r
+                       response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(),\r
+                                       MediaType.APPLICATION_JSON));\r
                } else\r
                        response = query.get();\r
 \r
@@ -545,14 +550,15 @@ public class OctopusDataMiner {
                if (resultObject != null)\r
                        result = NoSQLUtils.asDBList(resultObject, RESULT);\r
 \r
-               //              /* teszt */\r
-               //              List<BasicDBObject> list = NoSQLUtils.asList(result);\r
-               //              for (BasicDBObject actual : list) {\r
-               //                      String fullName = concatParentsToStoryFolder(actual, actual.getString(IOctopusAPI.NAME));\r
-               //                      //logger.info("Checking StoryFolder {}", fullName);\r
-               //                      actual.remove(IOctopusAPI.NAME);\r
-               //                      actual.append(IOctopusAPI.NAME, fullName);\r
-               //              }\r
+               // /* teszt */\r
+               // List<BasicDBObject> list = NoSQLUtils.asList(result);\r
+               // for (BasicDBObject actual : list) {\r
+               // String fullName = concatParentsToStoryFolder(actual,\r
+               // actual.getString(IOctopusAPI.NAME));\r
+               // //logger.info("Checking StoryFolder {}", fullName);\r
+               // actual.remove(IOctopusAPI.NAME);\r
+               // actual.append(IOctopusAPI.NAME, fullName);\r
+               // }\r
                //\r
                logger.trace(EXIT);\r
                return result;\r
@@ -604,7 +610,7 @@ public class OctopusDataMiner {
        private void storeStories() {\r
                logger.trace(ENTER);\r
                for (long storyID : storyIDs) {\r
-                       //logger.info("Storing story {}", storyID);\r
+                       // logger.info("Storing story {}", storyID);\r
                        try {\r
                                BasicDBObject story = queryStory(storyID);\r
                                if (story != null)\r