From: vasary.daniel Date: Mon, 11 Apr 2022 15:42:20 +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=bb09d394e6d53b7572097286039130fd4c348ffc;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33146 --- diff --git a/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF b/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF index 9935785c..6d29324f 100644 --- a/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF +++ b/server/hu.user.mediacube.executors.tests/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Fragment-Host: user.jobengine.executors;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.commons.io.filefilter;version="2.2.0", org.apache.commons.io.output;version="2.2.0", + org.apache.commons.logging, org.apache.commons.net.ftp;version="3.6.0", org.apache.ibatis.jdbc;version="3.5.2", org.codehaus.groovy.control;version="3.0.3", diff --git a/server/hu.user.mediacube.executors.tests/settings/application.yaml b/server/hu.user.mediacube.executors.tests/settings/application.yaml index f86325fe..020389ea 100644 --- a/server/hu.user.mediacube.executors.tests/settings/application.yaml +++ b/server/hu.user.mediacube.executors.tests/settings/application.yaml @@ -30,7 +30,7 @@ services: octopus: api: address: http://192.168.224.128:91/api/v1 - user: mama + user: mam password: napocska # rundowns-collection-name: rundowns # stories-collection-name: stories diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java index be865b6f..c94baa3b 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OctopusTests.java @@ -1,26 +1,49 @@ package hu.user.mediacube.executors.tests; -import java.util.Date; import java.util.List; import org.junit.Test; -import com.ibm.nosql.json.api.DBObject; +import com.ibm.nosql.json.api.BasicDBObject; +import user.commons.configuration.SystemConfiguration; +import user.commons.nosql.NoSQLUtils; import user.commons.octopus.IOctopusAPI; -import user.commons.octopus.OctopusAPI; +import user.jobengine.server.steps.shared.OctopusDataMiner; public class OctopusTests { + private OctopusDataMiner sut = null; + @Test public void test0() throws Exception { - IOctopusAPI api = new OctopusAPI(); - List rundowns = api.getRundowns(new Date()); + String address = SystemConfiguration.getInstance().value("services.octopus.api.address"); + String user = SystemConfiguration.getInstance().value("services.octopus.api.user"); + String pwd = SystemConfiguration.getInstance().value("services.octopus.api.password"); + + sut = new OctopusDataMiner(address, user, pwd); + List rundowns = NoSQLUtils.asList(sut.queryRundowns()); rundowns.forEach(r -> processRundown(r)); } - private void processRundown(DBObject r) { + private void processRundown(BasicDBObject r) { // NoSQLUtils.asString(r, null)) - System.out.println(r); + String rundownId = r.getString(IOctopusAPI.ID); + Object rundownName = r.get(IOctopusAPI.NAME); + System.out.println(rundownId + " - " + rundownName); + + List slugs = NoSQLUtils.asList(sut.queryRundown(r, OctopusDataMiner.FIELDS_RUNDOWN_STORYIDS), + OctopusDataMiner.SLUGS); + if (slugs != null) + slugs.forEach(s -> processSlug(s)); + } + + private void processSlug(BasicDBObject s) { + long storyId = s.getLong(IOctopusAPI.STORYID); + BasicDBObject story = sut.queryStory(storyId); + sut.normalizeStory(story); + String location = story.getString(IOctopusAPI.LOCATION); + if (location != null) + System.out.println(story.toPrettyString("")); } } diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java index 2b11696c..62d39221 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java @@ -74,7 +74,6 @@ import user.jobengine.db.Media; import user.jobengine.server.steps.ArchiveItem; import user.jobengine.server.steps.TSMExtendedRetrieveStep; import user.jobengine.server.steps.shared.EscortFiles; -import user.jobengine.server.steps.shared.ExternalCommandExecutor; import user.jobengine.server.steps.shared.FFMpeg; import user.jobengine.server.steps.shared.MediaCubeClient; @@ -1401,26 +1400,30 @@ public class SmallTests { @Test public void test999995() throws Exception { + // (InformOption_HTML( long progress[] = { 0, 0 }; - System.setProperty("user.dir", "c:\\temp"); - System.setProperty("jna.library.path", "c:\\temp"); - System.setProperty("java.library.path", "c:\\temp"); - MediaArea ma = new MediaArea(Paths.get("c:\\_workspace\\data\\video\\1.mxf")); - System.out.println(ma.inform()); - ma.process(); - System.out.println(ma.getFrameCount()); - - ExternalCommandExecutor executor = new ExternalCommandExecutor(); - executor.execute("profile1", "c:\\_workspace\\data\\video\\1.mxf", "c:\\_video\\test1.mp4", e -> { - String[] values = e.split("="); - if ("frame".equals(values[0])) { - progress[1] = Integer.parseInt(values[1]); - - long p = (int) (progress[1] * 100) / progress[0]; - if (p > 0) - System.out.println(p); - } - }); + System.setProperty("user.dir", "c:/apps/MediaInfo"); + System.setProperty("jna.library.path", "c:/apps/MediaInfo"); + System.setProperty("java.library.path", "c:/apps/MediaInfo"); + MediaArea ma = new MediaArea(Paths.get("d:/output.mov")); + BasicDBObject informJSON = ma.informJSON(); + + System.out.println(informJSON.toPrettyString("")); + +// ma.process(); +// System.out.println(ma.getFrameCount()); +// +// ExternalCommandExecutor executor = new ExternalCommandExecutor(); +// executor.execute("profile1", "c:\\_workspace\\data\\video\\1.mxf", "c:\\_video\\test1.mp4", e -> { +// String[] values = e.split("="); +// if ("frame".equals(values[0])) { +// progress[1] = Integer.parseInt(values[1]); +// +// long p = (int) (progress[1] * 100) / progress[0]; +// if (p > 0) +// System.out.println(p); +// } +// }); } @Test diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java index e2050508..d4778320 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ValidateProResStep.java @@ -11,6 +11,7 @@ import user.commons.mediaarea.MediaArea; public class ValidateProResStep extends JobStep { private static final double FRAMERATE = 23.976; private static final String PRORES = "PRORES"; + private static final String _422_HQ = "422 HQ"; private static final Logger logger = LogManager.getLogger(); @StepEntry @@ -23,9 +24,9 @@ public class ValidateProResStep extends JobStep { Map result = inputFiles.entrySet().stream().filter(fileEntry -> { String fileLocation = fileEntry.getKey(); MediaArea mediaArea = inputFiles.get(fileLocation); - String videoFormat = mediaArea.getFormat(); - boolean isProRes = mediaArea.getFrameRate() == FRAMERATE && videoFormat != null - && videoFormat.toUpperCase().equals(PRORES); + + boolean isProRes = isProRes(mediaArea); + logger.info(getMarker(), "{} is PRORES {}", fileLocation, isProRes); i[0]++; progress[0] = i[0] * 100 / inputFiles.size(); @@ -38,4 +39,11 @@ public class ValidateProResStep extends JobStep { return new Object[] { result }; } + + private boolean isProRes(MediaArea mediaArea) { + boolean isProRes = mediaArea.getFrameRate() == FRAMERATE; + isProRes = PRORES.equals(mediaArea.getFormat()) && isProRes; + isProRes = _422_HQ.equals(mediaArea.getFormatProfileName()) && isProRes; + return isProRes; + } } 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 2beaa5be..32f61ec8 100644 --- 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 @@ -48,7 +48,8 @@ public class OctopusDataMiner { private static final String SAVING_STORY_ID = "Saving story {}"; private static final String FIELDS_STORIES = "id,name,modified,type,format,mosObjects,script,scheduleFrom,scheduleTo,customColumns,CustomColumn.label,CustomColumn.value,reporters,User.longName,User.userName,descriptions,StoryDescription.text"; private static final String FIELDS_RUNDOWN = "id,name,modified,scheduledStart,channel,Channel.name,rundownType,RundownType.name"; - private static final String FIELDS_RUNDOWN_STORYIDS = "id,slugs,Slug.storyId,Slug.position"; + public static final String FIELDS_RUNDOWN_STORYIDS = "id,slugs,Slug.storyId,Slug.position"; + public static final String SLUGS = "slugs"; private static final String FIELDS_STORYFOLDER = "id,name,modified"; private static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id"; private static final String RUNDOWN = "Rundown"; @@ -315,7 +316,7 @@ public class OctopusDataMiner { if (objId == null) continue; - logger.info("MOS ID: {}", objId); + // logger.info("MOS ID: {}", objId); MetadataType metadataType = MetadataTypeDetector.GuessMetadataType(objId); if (!MetadataType.OctopusPlaceholder.equals(metadataType) @@ -481,7 +482,7 @@ public class OctopusDataMiner { return rundowns; } - private BasicDBObject queryRundown(BasicDBObject rundown, String fields) { + public BasicDBObject queryRundown(BasicDBObject rundown, String fields) { logger.trace(ENTER); BasicDBObject result = null; long id = NoSQLUtils.asLong(rundown, IOctopusAPI.ID); @@ -496,7 +497,7 @@ public class OctopusDataMiner { return result; } - private BasicDBList queryRundowns() { + public BasicDBList queryRundowns() { logger.trace(ENTER); BasicDBList result = null; Builder query = query(RUNDOWN, FIELDS_RUNDOWN); @@ -515,7 +516,7 @@ public class OctopusDataMiner { return result; } - private BasicDBObject queryStory(long storyID) { + public BasicDBObject queryStory(long storyID) { logger.trace(ENTER); BasicDBObject result = null; Response response = query(String.format("%s/%d", STORY, storyID), FIELDS_STORIES).get(); @@ -633,49 +634,59 @@ public class OctopusDataMiner { logger.error("Missing id in story {}", story.toPrettyString(null)); return; } - long storyID = story.getLong(IOctopusAPI.ID); - story.put(IOctopusAPI.MODIFIED, toDate(story, IOctopusAPI.MODIFIED)); - story.put(IOctopusAPI.SCHEDULEFROM, toDate(story, IOctopusAPI.SCHEDULEFROM)); - story.put(IOctopusAPI.SCHEDULETO, toDate(story, IOctopusAPI.SCHEDULETO)); + normalizeStory(story); + + long storyID = story.getLong(IOctopusAPI.ID); BasicDBList rundownRef = storyRundowns.get(storyID); BasicDBList storyFolderRef = storyStoryFolders.get(storyID); - BasicDBList modifiedMOS = extractRelevantMOSObjects(story); DBCollection collection = db.getCollection(IOctopusAPI.STORY_COLLECTION); - if (rundownRef != null) story.put(IOctopusAPI.REF_RUNDOWN, rundownRef); if (storyFolderRef != null) story.put(IOctopusAPI.REF_STORYFOLDER, storyFolderRef); + logger.debug(SAVING_STORY_ID, storyID); + setObjectID(currentStories, storyID, story); + if (!disableWrite) + collection.save(story); + logger.trace(EXIT); + } + + public void normalizeStory(BasicDBObject story) { + story.put(IOctopusAPI.MODIFIED, toDate(story, IOctopusAPI.MODIFIED)); + story.put(IOctopusAPI.SCHEDULEFROM, toDate(story, IOctopusAPI.SCHEDULEFROM)); + story.put(IOctopusAPI.SCHEDULETO, toDate(story, IOctopusAPI.SCHEDULETO)); + String scriptContent = extractScriptContent(story); story.put(IOctopusAPI.SCRIPT_CONTENT, scriptContent); - story.remove(IOctopusAPI.SCRIPT); + BasicDBList modifiedMOS = extractRelevantMOSObjects(story); if (modifiedMOS == null || modifiedMOS.isEmpty()) story.remove(IOctopusAPI.MOS_OBJECTS); else story.put(IOctopusAPI.MOS_OBJECTS, modifiedMOS); BasicDBObject customColumns = getCustomColumns(story); + logger.info(customColumns.toPrettyString("")); String parentStoryId = NoSQLUtils.asString(customColumns, IOctopusAPI.PARENT_STORY_ID); if (parentStoryId == null) { - logger.warn("Missing {} in story", IOctopusAPI.PARENT_STORY_ID, story.toPrettyString(null)); - story.append(IOctopusAPI.PARENT_STORY_ID, storyID); - } else - story.append(IOctopusAPI.PARENT_STORY_ID, parentStoryId); - + // logger.warn("Missing {} in story", IOctopusAPI.PARENT_STORY_ID, + // story.toPrettyString(null)); + parentStoryId = story.getString(IOctopusAPI.ID); + } + story.append(IOctopusAPI.PARENT_STORY_ID, parentStoryId); String location = NoSQLUtils.asString(customColumns, IOctopusAPI.LOCATION_HU); - story.append(IOctopusAPI.LOCATION, location); - story.append(IOctopusAPI.DESCRIPTIONS, getDescriptions(story)); + if (location != null && location.trim().length() > 0) + story.append(IOctopusAPI.LOCATION, location); - story.remove(IOctopusAPI.CUSTOM_COLUMNS); + String descriptions = getDescriptions(story); + if (descriptions != null && descriptions.trim().length() > 0) + story.append(IOctopusAPI.DESCRIPTIONS, descriptions); - logger.debug(SAVING_STORY_ID, storyID); - setObjectID(currentStories, storyID, story); - if (!disableWrite) - collection.save(story); - logger.trace(EXIT); + story.remove(IOctopusAPI.CUSTOM_COLUMNS); + story.remove(IOctopusAPI.SCRIPT); + story.remove(IOctopusAPI.DESCRIPTIONS); } private void storeStoryFolder(BasicDBObject storyFolder) { diff --git a/server/user.jobengine.osgi.commons/src/user/commons/mediaarea/MediaArea.java b/server/user.jobengine.osgi.commons/src/user/commons/mediaarea/MediaArea.java index 46fcfcb3..ee7d6deb 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/mediaarea/MediaArea.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/mediaarea/MediaArea.java @@ -1,6 +1,10 @@ package user.commons.mediaarea; import java.nio.file.Path; +import java.util.Collections; +import java.util.Map; + +import com.ibm.nosql.json.api.BasicDBObject; public class MediaArea { @@ -11,7 +15,7 @@ public class MediaArea { private String formatProfile = ""; private long frameCount; private double frameRate; - private String format; + private String format = ""; public MediaArea(Path filePath) { this.filePath = filePath; @@ -60,6 +64,24 @@ public class MediaArea { return result; } + public BasicDBObject informJSON() { + BasicDBObject result = null; + // auto closable + try (MediaInfo mi = new MediaInfo(filePath.toAbsolutePath().toString())) { + Map data = InformParser.parse(mi.inform()); + + result = new BasicDBObject(); + for (MediaMetadata md : data.values()) { + result.append(md.getType(), + new BasicDBObject(Collections.unmodifiableMap(md.getMetaData()))); + } + + } catch (Exception ex) { + throw new RuntimeException(ex); + } + return result; + } + public void process() throws Exception { // auto closable try (MediaInfo mi = new MediaInfo(filePath.toAbsolutePath().toString())) { diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java index 703d0413..2af80fe1 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java @@ -19,7 +19,7 @@ import user.commons.CalendarUtils; import user.commons.nosql.NoSQLUtils; public class OctopusAPI implements IOctopusAPI { - //private static final Logger logger = LogManager.getLogger(); + // private static final Logger logger = LogManager.getLogger(); public OctopusAPI() throws SQLException { @@ -41,7 +41,8 @@ public class OctopusAPI implements IOctopusAPI { } } - private List getReferencedObjects(List stories, String referenceCollectionName, String referenceField) { + private List getReferencedObjects(List stories, String referenceCollectionName, + String referenceField) { List ids = null; for (DBObject story : stories) { if (story == null) @@ -128,13 +129,8 @@ public class OctopusAPI implements IOctopusAPI { @Override public String getRundownContent(long id) { - BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1) - .append(NAME, 1) - .append(MODIFIED, 1) - .append(REF_RUNDOWN, 1) - .append(FORMAT, 1) - .append(MOS_OBJECTS, 1) - .append(SCRIPT_CONTENT, 1); + BasicDBObject fields = new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) + .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1).append(SCRIPT_CONTENT, 1); List stories = getRundownStories(id, fields); return getRundownContent(stories); } @@ -144,7 +140,8 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) + DBCursor find = collection + .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) { result = find.toArray(); @@ -169,7 +166,7 @@ public class OctopusAPI implements IOctopusAPI { @Override public List getRundowns(Date scheduledDate) { List result = null; - //ensureDB(); + // ensureDB(); DB db1 = NoSQLUtils.getNoSQLDB(); DBCollection collection = db1.getCollection(RUNDOWN_COLLECTION); @@ -182,13 +179,11 @@ public class OctopusAPI implements IOctopusAPI { if (scheduledDate == null) { query = builder.get(); } else { - query = builder - .and(QueryBuilder.start(SCHEDULED_START).greaterThanEquals(calStart.getTime()).get(), - QueryBuilder.start(SCHEDULED_START).lessThan(calStop.getTime()).get()) - .get(); + query = builder.and(QueryBuilder.start(SCHEDULED_START).greaterThanEquals(calStart.getTime()).get(), + QueryBuilder.start(SCHEDULED_START).lessThan(calStop.getTime()).get()).get(); } - //logger.info(query); + // logger.info(query); DBCursor find = collection.find(query).sort(new BasicDBObject(SCHEDULED_START, new BasicDBList(1, $DATE))); if (find.hasNext()) result = find.toArray(); @@ -207,12 +202,14 @@ public class OctopusAPI implements IOctopusAPI { @Override public List getRundownsByPlaceHolderID(String id) { - //db.testStoryCollection.find({"mosObjects": {$elemMatch: {"globalId": "OCTOPUS-ECHOTV-2429902"}}}) + // db.testStoryCollection.find({"mosObjects": {$elemMatch: {"globalId": + // "OCTOPUS-ECHOTV-2429902"}}}) DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, + new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_RUNDOWN, 1)); - //List rundowns = NoSQLUtils.asList(find); + // List rundowns = NoSQLUtils.asList(find); if (!find.hasNext()) { find.close(); return null; @@ -231,12 +228,8 @@ public class OctopusAPI implements IOctopusAPI { DBCollection collection = db.getCollection(STORY_COLLECTION); DBCursor find = collection .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))), - new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1) - .append(NAME, 1) - .append(MODIFIED, 1) - .append(REF_RUNDOWN, 1) - .append(FORMAT, 1) - .append(MOS_OBJECTS, 1)) + new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) + .append(REF_RUNDOWN, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) result = find.toArray(); @@ -249,7 +242,8 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) + DBCursor find = collection + .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id)))) .sort(new BasicDBObject("name", 1)); if (find.hasNext()) result = find.toArray(); @@ -283,7 +277,8 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)).limit(1000); + DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)) + .limit(1000); if (find.hasNext()) result = find.toArray(); return result; @@ -304,8 +299,8 @@ public class OctopusAPI implements IOctopusAPI { @Override public List getStoriesByParentStoryID(String id) { - //Pattern regex = Pattern.compile(id, Pattern.CASE_INSENSITIVE); - //BasicDBObject query = new BasicDBObject("id", Pattern.compile(id)); + // Pattern regex = Pattern.compile(id, Pattern.CASE_INSENSITIVE); + // BasicDBObject query = new BasicDBObject("id", Pattern.compile(id)); List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); @@ -322,7 +317,8 @@ public class OctopusAPI implements IOctopusAPI { List result = new ArrayList<>(); DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, + new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria); if (find.hasNext()) { result = find.toArray(); @@ -346,7 +342,8 @@ public class OctopusAPI implements IOctopusAPI { public List getStoryFoldersByParentStoryID(String id) { DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), new BasicDBObject(REF_STORYFOLDER, 1)); + DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), + new BasicDBObject(REF_STORYFOLDER, 1)); if (!find.hasNext()) return null; return getReferencedObjects(find.toArray(), FOLDER_COLLECTION, REF_STORYFOLDER); @@ -356,7 +353,8 @@ public class OctopusAPI implements IOctopusAPI { public List getStoryFoldersByPlaceHolderID(String id) { DB db = NoSQLUtils.getNoSQLDB(); DBCollection storyCollection = db.getCollection(STORY_COLLECTION); - BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); + BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, + new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id))); DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_STORYFOLDER, 1)); if (!find.hasNext()) return null; @@ -368,14 +366,10 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection - .find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), - new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1) - .append(NAME, 1) - .append(MODIFIED, 1) - .append(REF_STORYFOLDER, 1) - .append(FORMAT, 1) - .append(MOS_OBJECTS, 1)) + DBCursor find = collection.find( + new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), + new BasicDBObject(ID, 1).append(PARENT_STORY_ID, 1).append(NAME, 1).append(MODIFIED, 1) + .append(REF_STORYFOLDER, 1).append(FORMAT, 1).append(MOS_OBJECTS, 1)) .sort(new BasicDBObject(NAME, 1)); if (find.hasNext()) result = find.toArray(); @@ -387,7 +381,9 @@ public class OctopusAPI implements IOctopusAPI { List result = null; DB db = NoSQLUtils.getNoSQLDB(); DBCollection collection = db.getCollection(STORY_COLLECTION); - DBCursor find = collection.find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields) + DBCursor find = collection + .find(new BasicDBObject(REF_STORYFOLDER, + new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields) .sort(new BasicDBObject(NAME, 1)); if (find.hasNext()) result = find.toArray();