From: Vásáry Dániel Date: Tue, 24 Sep 2019 12:51:38 +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=a000c45b4971d0d3570a2e921dc5c3e8c2bf128f;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31544 --- diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java index 2824fe2c..6d4ae689 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java @@ -419,8 +419,13 @@ public class ItemManager extends MemoryCache implements IItemManager { decorator.decorate(st); rs = st.executeQuery(); while (rs.next()) { - if (!consumer.process(rs)) + + if (!consumer.process(rs)) { + //ha nem megyunk vevig pool exception a tranzakcio miatt + connection.rollback(); break; + } + } connection.commit(); diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java new file mode 100644 index 00000000..3a645608 --- /dev/null +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportCheckItem.java @@ -0,0 +1,66 @@ +package user.jobengine.server.IT; + +import java.sql.Timestamp; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import user.commons.logging.LogUtils; +import user.jobengine.db.IItemManager; +import user.jobengine.db.ItemManager; +import user.jobengine.osgi.server.ComponentBinder; +import user.mediacube.metadata.interfaces.IMetadataProvider; +import user.mediacube.metadata.interfaces.IMetadataProviderFactory; +import user.mediacube.metadata.interfaces.MetadataProviderType; + +public class SupportCheckItem { + protected static IItemManager manager = null; + private static final String LOWRES_ROOT = "//10.10.1.27/mclowres/www/video"; + private static final long[] duplicateLength = { 0 }; + + @BeforeClass + static public void setUpConnection() { + // System.setProperty("jobengine.octopus.rundowns.name", "test_rundowns"); + // System.setProperty("jobengine.octopus.stories.name", "test_stories"); + // System.setProperty("jobengine.octopus.storyfolders.name", "test_storyfolders"); + System.setProperty("jobengine.octopus.rundowns.name", "rundowns180620"); + System.setProperty("jobengine.octopus.stories.name", "stories180620"); + System.setProperty("jobengine.octopus.storyfolders.name", "storyfolders180620"); + + System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;"); + System.setProperty("jobengine.nosql.db.user", "db2admin"); + System.setProperty("jobengine.nosql.db.password", "password"); + System.setProperty(ItemManager.DBURL, "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;"); + System.setProperty(ItemManager.DBUSERNAME, "db2admin"); + System.setProperty(ItemManager.DBPASSWORD, "password"); + System.setProperty(LogUtils.LOGLEVEL, "INFO"); + // System.setProperty(ItemManager.DBURL, + + manager = new ItemManager(); + manager.connect(); + } + + @AfterClass + static public void tearDownConnection() { + manager.disconnect(); + } + + @Test + public void process() { + + IMetadataProviderFactory factory = ComponentBinder.getMetadataProviderFactory(); + IMetadataProvider provider = factory.getProvider(MetadataProviderType.PLANAIR); + manager.executeQuery( + "select itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated from vw_items where mediatype = 'Műsor' order by mediacreated desc", + rs -> { + String itemHouseId = rs.getString("itemHouseId"); + String itemTitle = rs.getString("itemTitle"); + String mediaFileHouseId = rs.getString("mediaFileHouseId"); + Timestamp mediaCreated = rs.getTimestamp("mediaCreated"); + System.out.println(mediaCreated + ", " + itemHouseId + ", " + itemTitle); + return false; + }, null); + } + +} diff --git a/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java index e875eead..08cf880d 100644 --- a/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/MetadataProviderFactory.java @@ -3,10 +3,10 @@ package user.mediacube.metadata; import java.util.HashMap; import java.util.Map; -import user.mediabube.metadata.planair.PlanAirMetadataProvider; import user.mediacube.metadata.interfaces.IMetadataProvider; import user.mediacube.metadata.interfaces.IMetadataProviderFactory; import user.mediacube.metadata.interfaces.MetadataProviderType; +import user.mediacube.metadata.planair.PlanAirMetadataProvider; public class MetadataProviderFactory implements IMetadataProviderFactory { diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirADMapper.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirADMapper.java similarity index 95% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirADMapper.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirADMapper.java index 06a78538..3bb30c72 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirADMapper.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirADMapper.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Date; import java.util.List; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirMaterialMapper.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirMaterialMapper.java similarity index 96% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirMaterialMapper.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirMaterialMapper.java index 8fd52356..791e7905 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirMaterialMapper.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirMaterialMapper.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Date; import java.util.List; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirPromoMapper.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirPromoMapper.java similarity index 96% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirPromoMapper.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirPromoMapper.java index 15585dd8..0c6902e4 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/IPlanAirPromoMapper.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/IPlanAirPromoMapper.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Date; import java.util.List; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java similarity index 89% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java index 96937b99..1394ee2f 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirAD.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirAD.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import user.mediacube.metadata.interfaces.IMetadata; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java similarity index 93% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java index 6d68dc92..55980c21 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMaterial.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMaterial.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Date; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMetadataProvider.java similarity index 96% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMetadataProvider.java index 54ddda63..c6543841 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirMetadataProvider.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirMetadataProvider.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Arrays; import java.util.List; diff --git a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirPromo.java b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java similarity index 91% rename from server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirPromo.java rename to server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java index 52296780..fb30bfd1 100644 --- a/server/user.mediacube.metadata/src/user/mediabube/metadata/planair/PlanAirPromo.java +++ b/server/user.mediacube.metadata/src/user/mediacube/metadata/planair/PlanAirPromo.java @@ -1,4 +1,4 @@ -package user.mediabube.metadata.planair; +package user.mediacube.metadata.planair; import java.util.Date;