January 2010 - Mapstoragemanager-commits - mailman.cloud.codelutin.com

Re: [Mapstoragemanager-commits] Mapstoragemanager-commits Digest, Vol 1, Issue 9
by Dorian Langlais 28 Jan '10

28 Jan '10

Salut, J'ai l'impression qu'il y a un soucis avec les fichiers de "test" MainTestCore et TestServiceLoader... Chez moi, que ce soit avec netbeans ou eclipse, je n'arrive pas à les lancer avec succès... Gilles, pourrais-tu confirmer ou infirmer que cela est "normal". Sinon, il serait préférable de faire des classes de Test JUnit comme dans le source folder src/test/java.. (ou un truc du genre) au lieu de main. Autre question concernant les "PluginLoader" : concernant les paths/url à donner, doit-on fonctionner en chemin relatif, absolu ? par rapport à la racine du projets... ? Dans l'attente de ta réponse.

1 0

r29 - trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-28 01:35:08 +0100 (Thu, 28 Jan 2010) New Revision: 29 Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java Log: ... Oubli de commit le fichier RowTest ... Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowTest.java 2010-01-28 00:35:08 UTC (rev 29) @@ -0,0 +1,150 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import junit.framework.TestCase; + +public class RowTest extends TestCase { + + Structure structure; + Map<String,Object> content; + Row r; + + public void testToString() { + { + structure = new StructureImpl(); + content = new HashMap<String, Object>(); + r = new RowImpl(structure, content); + + assertEquals(r.toString(), content.values().toString()); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test", String.class); + content = new HashMap<String, Object>(); + content.put("Test", "StringDeTest"); + r = new RowImpl(structure, content); + + assertEquals(r.toString(), content.values().toString()); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test1", String.class); + structure.addColumn("Test2", Integer.class); + structure.addColumn("Test3", Double.class); + content = new HashMap<String, Object>(); + content.put("Test1", "StringDeTest"); + content.put("Test2", new Integer(1)); + content.put("Test3", new Double(0.07)); + r = new RowImpl(structure, content); + + assertEquals(r.toString(), content.values().toString()); + } + } + + public void testGetRowContent() { + { + structure = new StructureImpl(); + content = new HashMap<String, Object>(); + r = new RowImpl(structure, content); + + assertEquals(r.getRowContent(), content); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test", String.class); + content = new HashMap<String, Object>(); + content.put("Test", "StringDeTest"); + r = new RowImpl(structure, content); + + assertEquals(r.getRowContent(), content); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test1", String.class); + structure.addColumn("Test2", Integer.class); + structure.addColumn("Test3", Double.class); + content = new HashMap<String, Object>(); + content.put("Test1", "StringDeTest"); + content.put("Test2", new Integer(1)); + content.put("Test3", new Double(0.07)); + r = new RowImpl(structure, content); + + assertEquals(r.getRowContent(), content); + } + } + + public void testGetRowStructure() { + { + structure = new StructureImpl(); + content = new HashMap<String, Object>(); + r = new RowImpl(structure, content); + + assertEquals(r.getRowStructure(), structure); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test", String.class); + content = new HashMap<String, Object>(); + content.put("Test", "StringDeTest"); + r = new RowImpl(structure, content); + + assertEquals(r.getRowStructure(), structure); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test1", String.class); + structure.addColumn("Test2", Integer.class); + structure.addColumn("Test3", Double.class); + content = new HashMap<String, Object>(); + content.put("Test1", "StringDeTest"); + content.put("Test2", new Integer(1)); + content.put("Test3", new Double(0.07)); + r = new RowImpl(structure, content); + + assertEquals(r.getRowStructure(), structure); + } + } + + public void testGetContent() { + { + structure = new StructureImpl(); + content = new HashMap<String, Object>(); + r = new RowImpl(structure, content); + + assertEquals(r.getContent(""), null); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test", String.class); + content = new HashMap<String, Object>(); + content.put("Test", "StringDeTest"); + r = new RowImpl(structure, content); + + assertEquals(r.getContent("Test"), "StringDeTest"); + } + + { + structure = new StructureImpl(); + structure.addColumn("Test1", String.class); + structure.addColumn("Test2", Integer.class); + structure.addColumn("Test3", Double.class); + content = new HashMap<String, Object>(); + content.put("Test1", "StringDeTest"); + content.put("Test2", new Integer(1)); + content.put("Test3", new Double(0.07)); + r = new RowImpl(structure, content); + + assertEquals(r.getContent("Test1"), "StringDeTest"); + assertEquals(r.getContent("Test2"), new Integer(1)); + assertEquals(r.getContent("Test3"), new Double(0.07)); + } + } +}

1 0

r28 - trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 28 Jan '10

28 Jan '10

Author: dlanglais Date: 2010-01-28 01:24:21 +0100 (Thu, 28 Jan 2010) New Revision: 28 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java Log: Row et RowImpl -> ajout de fonctionnalit?\195?\169, mise en anglais de la javadoc. Test de la classe. Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-27 23:45:23 UTC (rev 27) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-28 00:24:21 UTC (rev 28) @@ -1,15 +1,36 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; +import java.util.Map; + /** - * Interface lisant les méthodes nécéssaires sur une ligne. + * Interface to present the methods on a Row * @author Dorian Langlais * */ public interface Row { /** - * Méthode permettant un affichage du contenu de la ligne. - * @return contenu de la ligne sous forme textuel. + * to string a row. + * @return the row in textual format. */ String toString(); + + /** + * Get row structure. + * @return the row structure + */ + Structure getRowStructure(); + + /** + * Get row content. + * @return the row content + */ + Map<String, Object> getRowContent(); + + /** + * Get an element of the row. + * @param columnName the column name. + * @return the content of the "cell". + */ + Object getContent(String columnName); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-27 23:45:23 UTC (rev 27) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-28 00:24:21 UTC (rev 28) @@ -4,28 +4,27 @@ import java.util.Map; /** - * Classe Row. - * Représente une ligne d'une table. - * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. - * @licence GPL. + * Class RowImpl. + * A row of a table. + * @author Dorian Langlais. */ public class RowImpl implements Row { /** - * Structure de la ligne. + * Structure of the row. */ - private StructureImpl rowStructure; + private Structure rowStructure; /** - * Contenu de la ligne. + * Content of the row. */ private Map < String, Object > rowContent; /** - * Constructeur de Row. - * @param struct structure de la ligne. - * @param content contenu de la ligne. + * Row constructor. + * @param struct the row structure + * @param content the row content */ - public RowImpl(final StructureImpl struct, + public RowImpl(final Structure struct, final Map < String, Object > content) { this.rowStructure = struct; this.rowContent = new HashMap < String, Object > (); @@ -37,9 +36,30 @@ /** * {@inheritDoc} */ + public Structure getRowStructure() { + return rowStructure; + } + + /** + * {@inheritDoc} + */ + public Map<String, Object> getRowContent() { + return rowContent; + } + + /** + * {@inheritDoc} + */ public final String toString() { String ret; ret = rowContent.values().toString(); return ret; } + + /** + * {@inheritDoc} + */ + public Object getContent(String columnName) { + return rowContent.get(columnName); + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-27 23:45:23 UTC (rev 27) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-28 00:24:21 UTC (rev 28) @@ -15,7 +15,7 @@ * Table. * hashMap ayant pour clé le nom des colonnes et pour valeur une colonne. */ - private Map < String, ColumnImpl < ? > > tableContent; + private Map < String, Column < ? > > tableContent; /** * Structure de la Table. */ @@ -25,7 +25,7 @@ * Constructeur par défaut. */ public TableImpl() { - this.tableContent = new HashMap < String, ColumnImpl < ? > > (); + this.tableContent = new HashMap < String, Column < ? > > (); this.tableStructure = new StructureImpl(); }

1 0

r27 - trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 27 Jan '10

27 Jan '10

Author: dlanglais Date: 2010-01-28 00:45:23 +0100 (Thu, 28 Jan 2010) New Revision: 27 Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java Log: Tests de la classe StructureImpl termin?\195?\169s. Modified: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-27 23:23:49 UTC (rev 26) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-27 23:45:23 UTC (rev 27) @@ -2,6 +2,7 @@ import java.lang.reflect.Field; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.logging.Level; @@ -26,32 +27,96 @@ Map < String, Class < ? > > structureExpected = new HashMap<String, Class<?>>(); - + try { Structure s = new StructureImpl(); - + Field fStructure = s.getClass().getDeclaredField("structure"); fStructure.setAccessible(true); Map < String, Class < ? > > structureActual = (Map < String, Class < ? > >) fStructure.get(s); - s.addColumn("Test", String.class); - structureExpected.put("Test", String.class); + s.addColumn("Test1", String.class); + structureExpected.put("Test1", String.class); assertEquals(structureExpected, structureActual); - s.addColumn("Test2", Object.class); structureExpected.put("Test2", Object.class); + assertEquals(structureExpected, structureActual); + s.addColumn("Test3", Map.class); + structureExpected.put("Test3", Map.class); assertEquals(structureExpected, structureActual); - + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + * We remove column, and we continue to verify that the map of the structure + * is always good. + */ + public void testRemoveColumn() { + + Map < String, Class < ? > > structureExpected = + new HashMap<String, Class<?>>(); + + try { + Structure s = new StructureImpl(); + + Field fStructure = s.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map < String, Class < ? > > structureActual = + (Map < String, Class < ? > >) fStructure.get(s); + + + s.addColumn("Test1", String.class); + structureExpected.put("Test1", String.class); + s.addColumn("Test2", Object.class); + structureExpected.put("Test2", Object.class); s.addColumn("Test3", Map.class); structureExpected.put("Test3", Map.class); + assertEquals(structureExpected, structureActual); + s.removeColumn("Test1"); + structureExpected.remove("Test1"); assertEquals(structureExpected, structureActual); - + + /** + * the key "Test1TOTO" is not in the structure. + */ + s.removeColumn("Test1TOTO"); + structureExpected.remove("Test1TOTO"); + assertEquals(structureExpected, structureActual); + + s.removeColumn("Test2"); + structureExpected.remove("Test2"); + assertEquals(structureExpected, structureActual); + + s.removeColumn("Test3"); + structureExpected.remove("Test3"); + assertEquals(structureExpected, structureActual); + + /** + * We try to remove an other key, but the map is empty. + */ + s.removeColumn("Test4"); + structureExpected.remove("Test4"); + + assertEquals(structureExpected, structureActual); + + } catch (IllegalArgumentException ex) { Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); } catch (IllegalAccessException ex) { @@ -62,4 +127,149 @@ Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); } } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnsNames() { + + Structure s = new StructureImpl(); + + Set<String> columsNamesExpected = new HashSet<String>(); + Set<String> columnsNamesActual = s.getColumnsNames(); + + + s.addColumn("Test1", String.class); + columsNamesExpected.add("Test1"); + assertEquals(columsNamesExpected, columnsNamesActual); + + s.addColumn("Test2", Object.class); + columsNamesExpected.add("Test2"); + assertEquals(columsNamesExpected, columnsNamesActual); + + s.addColumn("Test3", Map.class); + columsNamesExpected.add("Test3"); + assertEquals(columsNamesExpected, columnsNamesActual); + + s.removeColumn("Test1"); + columsNamesExpected.remove("Test1"); + assertEquals(columsNamesExpected, columnsNamesActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + s.removeColumn("Test1TOTO"); + columsNamesExpected.remove("Test1TOTO"); + assertEquals(columsNamesExpected, columnsNamesActual); + + s.removeColumn("Test2"); + columsNamesExpected.remove("Test2"); + assertEquals(columsNamesExpected, columnsNamesActual); + + s.removeColumn("Test3"); + columsNamesExpected.remove("Test3"); + assertEquals(columsNamesExpected, columnsNamesActual); + + /** + * We try to remove an other key, but the map is empty. + */ + s.removeColumn("Test4"); + columsNamesExpected.remove("Test4"); + + assertEquals(columsNamesExpected, columnsNamesActual); + + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the columsNames returned are goods. + * We remove column, and we continue to verify that the columsNames is + * always good. + */ + public void testGetColumnClass() { + + Structure s = new StructureImpl(); + + Class<?> columsClassExpected; + Class<?> columsClassActual; + + + s.addColumn("Test1", String.class); + columsClassActual = s.getColumnClass("Test1"); + columsClassExpected = String.class; + assertEquals(columsClassExpected, columsClassActual); + + s.addColumn("Test2", Object.class); + columsClassActual = s.getColumnClass("Test1"); + columsClassExpected = String.class; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test2"); + columsClassExpected = Object.class; + assertEquals(columsClassExpected, columsClassActual); + + s.addColumn("Test3", Map.class); + columsClassActual = s.getColumnClass("Test1"); + columsClassExpected = String.class; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test2"); + columsClassExpected = Object.class; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test3"); + columsClassExpected = Map.class; + assertEquals(columsClassExpected, columsClassActual); + + s.removeColumn("Test1"); + columsClassActual = s.getColumnClass("Test1"); + columsClassExpected = null; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test2"); + columsClassExpected = Object.class; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test3"); + columsClassExpected = Map.class; + assertEquals(columsClassExpected, columsClassActual); + + /** + * the key "Test1TOTO" is not in the structure. + */ + s.removeColumn("Test1TOTO"); + columsClassActual = s.getColumnClass("Test1TOTO"); + columsClassExpected = null; + assertEquals(columsClassExpected, columsClassActual); + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test2"); + columsClassExpected = Object.class; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test3"); + columsClassExpected = Map.class; + assertEquals(columsClassExpected, columsClassActual); + + s.removeColumn("Test2"); + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test2"); + columsClassExpected = null; + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test3"); + columsClassExpected = Map.class; + assertEquals(columsClassExpected, columsClassActual); + + s.removeColumn("Test3"); + assertEquals(columsClassExpected, columsClassActual); + columsClassActual = s.getColumnClass("Test3"); + columsClassExpected = null; + assertEquals(columsClassExpected, columsClassActual); + + /** + * We try to remove an other key, but the map is empty. + */ + s.removeColumn("Test4"); + columsClassActual = s.getColumnClass("Test4"); + columsClassExpected = null; + + assertEquals(columsClassExpected, columsClassActual); + + } }

1 0

r26 - in trunk/src: main/java/org/nuiton/mapstoragemanager/plugins/bighashmap test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 27 Jan '10

27 Jan '10

Author: dlanglais Date: 2010-01-28 00:23:49 +0100 (Thu, 28 Jan 2010) New Revision: 26 Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java Log: Passage ?\195?\160 l'anglais de certain commentaire javadoc. Cr?\195?\169ation de test sur la classe StructureImpl. Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-27 23:23:49 UTC (rev 26) @@ -1,21 +1,29 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; /** - * Interface listant les opérations nécéssaires sur une cellule. + * Interface to present the method an a Cell. * @author Dorian Langlais * - * @param <T> type d'objet contenu dans les cellules. + * @param <T> Class of the object stored in the cells. */ public interface Cell < T > { /** - * Récupère le contenu le plus récent de la cellule. - * @return retourne l'objet le plus récent stocké dans la cellule. + * Get the most recent object put in the cell. + * @return The most recent object stored in the cell. */ T get(); + /** - * Ajout de contenu dans la cellule. - * @param t objet de type < T > à stocker dans la cellule. + * Put a new object in the cell. + * @param t Objet to store in the cell. */ void put(T t); + + /** + * Get an object from its "version". + * @param t the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". + */ + T get(Long t); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-27 23:23:49 UTC (rev 26) @@ -5,31 +5,31 @@ import java.util.NoSuchElementException; /** - * Classe Cell. - * Une cellule (selon la spec bigtable de google) est une Map entre un - * timestamp et un contenu. - * @param <T> Une cellule est paramétrée selon son type de contenu. + * Class Cell. + * A cell contain different version of a content. + * So a cell store objects and its version. + * @param <T> The type of the stored objects. * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. * @licence GPL. */ public class CellImpl < T /**extends Serializable*/ > implements Cell < T > { /** - * Cellule. - * hashMap ayant pour clé le timestamp et pour valeur un objet de type T. + * cell. + * hashMap with key as timestamp and value, as object of T class. */ private Map < Long, T > cell; /** - * Constructeur par défaut. + * Default constructor. */ public CellImpl() { this.cell = new HashMap < Long, T > (); } - + /** - * Constructeur avec un objet. - * @param t objet à mettre dans la cellule à construire. + * Constructor with object. + * @param t The object to store. */ public CellImpl(T t) { this.cell = new HashMap < Long, T > (); @@ -44,10 +44,7 @@ } /** - * get(Long timestamp). - * fonction d'accès au contenu d'une cellule en fonction de son timestamp. - * @param timestamp Timestamps d'une cellule. - * @return retourne le contenu de la cellule. + * {@inheritDoc} */ public final T get(final Long timestamp) { return cell.get(timestamp); Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-27 23:23:49 UTC (rev 26) @@ -1,23 +1,38 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; /** - * Interface représentant les méthodes nécéssaires sur une colonne. + * Interface to present the method to implement for en Column. * @author Dorian Langlais * - * @param <T> type d'objet contenu dans la colonne. + * @param <T> Class of the object stored in the columns. */ public interface Column < T > { /** - * Récupère le contenu de la cellule ayant pour clé key. - * @param key clé de la ligne. - * @return objet stocké dans la celulle ayant pour clé key. + * Get the object which has key <b>key</key>. + * @param key the key. + * @return the object stored at the line identified by <b>key</b> */ T get(String key); + /** - * Ajoute l'objet t à la ligne de clé key. - * @param key clé de la ligne. - * @param t objet à stocker. + * Get the object which has key <b>key</key> and version <b>version</b>. + * @param key + * @param version the version wanted (it can be timestamp, number..). + * @return The object corresponding to the "version". */ + T get(String key, Long version); + + /** + * Put object <b>t</b> with the key <b>key</b>. + * @param key the key + * @param t object to store + */ void put(String key, T t); + + /** + * Delete an object by its key. + * @param key the key + */ + void delete(String key); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-27 23:23:49 UTC (rev 26) @@ -13,14 +13,13 @@ public class ColumnImpl < T /**extends Serializable*/ > implements Column < T > { /** - * Colonne. - * hashMap ayant pour clé la "clé" de la "ligne" de la table et pour - * valeur le contenu de la cellule. + * column. + * hashMap with key the key of the line, and value a column. */ private Map < String, CellImpl < T > > column; /** - * Constructeur par défaut. + * Default constructor. */ public ColumnImpl() { column = new HashMap < String, CellImpl < T > > (); @@ -28,11 +27,7 @@ /** - * get(Long timestamp). - * fonction d'accès au contenu d'une cellule en fonction de son timestamp. - * @param key clé de la ligne. - * @param timestamp désiré. - * @return retourne le contenu de la cellule. + * {@inheritDoc} */ public final T get(final String key, final Long timestamp) { return this.column.get(key).get(timestamp); @@ -58,4 +53,11 @@ this.column.put(key, new CellImpl < T > (content)); } } + + /** + * {@inheritDoc} + */ + public final void delete(final String key) { + this.column.remove(key); + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-27 23:23:49 UTC (rev 26) @@ -3,33 +3,33 @@ import java.util.Set; /** - * Interface listant les méthodes nécéssaires sur une structure. - * Une Structure est une description d'une Table. + * Interface to present the method on a structure. + * A structure is a description of a table. * @author Dorian Langlais * */ public interface Structure { /** - * Méthode permettant l'ajout d'une colonne à une structure de table. - * @param columnName nom de la colonne. - * @param columnClass type d'objet contenu dans la colonne. + * Add a new column in the structure. + * @param columnName the column name + * @param columnClass the column class */ void addColumn(String columnName, Class < ? > columnClass); /** - * Méthode permettant de récupérer le nom des colonnes. - * @return retourne le nom de colonnes. + * Get the columns' names. + * @return return a set containing the name of the columns. */ Set < String > getColumnsNames(); /** - * Méthode permettant de récupérer le type d'objet d'une colonne. - * @param columnName nom de la colonne. - * @return retourne le type d'objet de la colonne columnName. + * Get the class of object of the column <b>columnName</b>. + * @param columnName the column name + * @return return the column class */ Class < ? > getColumnClass(String columnName); /** - * Méthode permettant la suppression d'une colonne à la structure. - * @param columnName nom de la colonne à supprimer. + * Remove a column of the structure by its name. + * @param columnName the column name */ void removeColumn(String columnName); } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-27 21:59:17 UTC (rev 25) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-27 23:23:49 UTC (rev 26) @@ -5,25 +5,24 @@ import java.util.Set; /** - * Classe Structure. - * Représente le mapping d'une ligne, les types des colonnes + * Class Structure. + * Represente the mapping between a row and the column of a table. * @author Dorian Langlais * */ public class StructureImpl implements Structure { /** - * Structure de la table. - * Contient le nom de la colonne comme clé, - * et le type de la colonne pour valeur. + * structure. + * hashMap with key the column name, and value the column class. */ - private Map < String, Class < ? /**extends Serializable*/ > > struct; + private Map < String, Class < ? /**extends Serializable*/ > > structure; /** - * Constructeur par défaut. + * Default constructor. */ public StructureImpl() { - this.struct = + this.structure = new HashMap < String, Class < ? /**extends Serializable*/ > > (); } @@ -32,14 +31,14 @@ */ public final void addColumn(final String columnName, final Class < ? /**extends Serializable*/ > columnClass) { - this.struct.put(columnName, columnClass); + this.structure.put(columnName, columnClass); } /** * {@inheritDoc} */ public final void removeColumn(final String columnName) { - this.struct.remove(columnName); + this.structure.remove(columnName); } /** @@ -47,13 +46,13 @@ */ public final Class < ? /**extends Serializable*/ > getColumnClass( final String columnName) { - return this.struct.get(columnName); + return this.structure.get(columnName); } /** * {@inheritDoc} */ public final Set < String > getColumnsNames() { - return this.struct.keySet(); + return this.structure.keySet(); } } Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureTest.java 2010-01-27 23:23:49 UTC (rev 26) @@ -0,0 +1,65 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import junit.framework.TestCase; + +public class StructureTest extends TestCase { + + public void testGetColumnsNamesVoid() { + Structure s = new StructureImpl(); + Set < String > columnNames = s.getColumnsNames(); + assertEquals(0, columnNames.size()); + } + + /** + * we add a column with name and class. + * We use reflexivity to verify that the map of the structure is like we + * want. + */ + public void testAddColumn() { + + Map < String, Class < ? > > structureExpected = + new HashMap<String, Class<?>>(); + + try { + Structure s = new StructureImpl(); + + Field fStructure = s.getClass().getDeclaredField("structure"); + fStructure.setAccessible(true); + Map < String, Class < ? > > structureActual = + (Map < String, Class < ? > >) fStructure.get(s); + + s.addColumn("Test", String.class); + structureExpected.put("Test", String.class); + + assertEquals(structureExpected, structureActual); + + + s.addColumn("Test2", Object.class); + structureExpected.put("Test2", Object.class); + + assertEquals(structureExpected, structureActual); + + + s.addColumn("Test3", Map.class); + structureExpected.put("Test3", Map.class); + + assertEquals(structureExpected, structureActual); + + } catch (IllegalArgumentException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (NoSuchFieldException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(StructureTest.class.getName()).log(Level.SEVERE, null, ex); + } + } +}

1 0

r25 - in trunk/src: main/java/org/nuiton/mapstoragemanager/core test test/java test/java/org test/java/org/nuiton test/java/org/nuiton/mapstoragemanager test/java/org/nuiton/mapstoragemanager/core test/java/org/nuiton/mapstoragemanager/plugins test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org 27 Jan '10

27 Jan '10

Author: dlanglais Date: 2010-01-27 22:59:17 +0100 (Wed, 27 Jan 2010) New Revision: 25 Added: trunk/src/test/java/ trunk/src/test/java/org/ trunk/src/test/java/org/nuiton/ trunk/src/test/java/org/nuiton/mapstoragemanager/ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: Ajout de classe de test, Correction checkstyle sur BigTableLoader et TestServiceLoader (je tente de passer les classes de test en classe de test JUnit). Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-27 12:20:57 UTC (rev 24) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-27 21:59:17 UTC (rev 25) @@ -9,30 +9,29 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; /** - * * @author Crieloue Gilles * */ -public class BigTableLoader extends URLClassLoader{ +public class BigTableLoader extends URLClassLoader { - /** - * The BigTable Set Loader. - */ - private ServiceLoader<BigTable> bigTableSetLoader; + /** + * The BigTable Set Loader. + */ + private ServiceLoader < BigTable > bigTableSetLoader; - /** - * Class constructor. - * @param pluginsFolderPath the plugins folder path - * @param classLoader the parent classloader - * @throws MalformedURLException if the plugin folder is not found - */ - public BigTableLoader(final String pluginsFolderPath, - final ClassLoader classLoader) throws MalformedURLException { + /** + * Class constructor. + * @param pluginsFolderPath the plugins folder path + * @param classLoader the parent classloader + * @throws MalformedURLException if the plugin folder is not found + */ + public BigTableLoader(final String pluginsFolderPath, + final ClassLoader classLoader) throws MalformedURLException { - super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, - classLoader); + super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, + classLoader); - for (File file : new File(pluginsFolderPath).listFiles()) { + for (File file : new File(pluginsFolderPath).listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { try { this.addURL(file.toURI().toURL()); @@ -43,32 +42,30 @@ } bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - } + } - /** - * Returns a string displaying all the available BigTable implementations. - * @return a string displaying all the available BigTable implementations - */ + /** + * Returns a string displaying all the available BigTable implementations. + * @return a string displaying all the available BigTable implementations + */ public final String getBigTable() { - String s = "Available Plugins :\n"; + String s = "Available Plugins :\n"; - s += "\t* "; - if (!bigTableSetLoader.iterator().hasNext()) { - s += "No plugin."; - } - else { - for (BigTable bt : bigTableSetLoader) { - s += bt.getClass().getName(); - bt.put("key", "value"); - if (bt.get("key").equals("value")) { - s += " (working)" + "\n"; - } - else { - s += " (not working)" + "\n"; - } - } - } + s += "\t* "; + if (!bigTableSetLoader.iterator().hasNext()) { + s += "No plugin."; + } else { + for (BigTable bt : bigTableSetLoader) { + s += bt.getClass().getName(); + bt.put("key", "value"); + if (bt.get("key").equals("value")) { + s += " (working)" + "\n"; + } else { + s += " (not working)" + "\n"; + } + } + } return s; } @@ -76,8 +73,8 @@ * Returns the BigTable Set Loader. * @return the BigTable Set Loader */ - public final ServiceLoader<BigTable> getBigTableSetLoader() { - return bigTableSetLoader; - } + public final ServiceLoader < BigTable > getBigTableSetLoader() { + return bigTableSetLoader; + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-27 12:20:57 UTC (rev 24) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-27 21:59:17 UTC (rev 25) @@ -3,18 +3,21 @@ import java.net.MalformedURLException; public class TestServiceLoader { - public TestServiceLoader(){ - try { - BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); - System.out.println(p.getBigTable()); - } catch (MalformedURLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public static void main(String[] args) { - - TestServiceLoader t = new TestServiceLoader(); - } -} + + public TestServiceLoader() { + try { + BigTableLoader p = + new BigTableLoader("plugins", + this.getClass().getClassLoader()); + System.out.println(p.getBigTable()); + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public static void main(final String[] args) { + + TestServiceLoader t = new TestServiceLoader(); + } +} \ No newline at end of file Added: trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,15 @@ +package org.nuiton.mapstoragemanager.core; + +import junit.framework.TestCase; + +/** + * Classe to test the Core class. + * @author Dorian Langlais + * + */ +public class ServiceLoaderTest extends TestCase { + + public void testCore(){ + + } +} Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,85 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import org.nuiton.mapstoragemanager.plugins.bighashmap.Cell; +import java.util.NoSuchElementException; + +import junit.framework.Assert; +import junit.framework.TestCase; + +/** + * Classe de test pour la classe Cell. + * Teste les fonctions de base d'une cellule, put et get. + * @author Dorian Langlais + * + */ +public final class CellTest extends TestCase { + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + Cell < Object > cell = new CellImpl < Object > (); + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + } + + /** + * Test de la fonction put sur une cellule. + * On ajoute un objet obj1, on tente de le récupérer. + */ + public void testPut() { + + Cell < Object > cell = new CellImpl < Object > (); + + Object obj1 = new Object(); + + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + cell.put(obj1); + + assertEquals(cell.get(), obj1); + } + + /** + * Test de la fonction put sur une cellule. + * On ajoute un objet obj1, on tente de le récupérer. + * On ajoute un objet obj2, on tente de le récupérer. + * On ajoute un objet obj3, on tente de le récupérer. + */ + public void testPutReput() { + + Cell < Object > cell = new CellImpl < Object > (); + + Object obj1 = new Object(); + + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + cell.put(obj1); + + assertEquals(cell.get(), obj1); + + Object obj2 = new Object(); + + cell.put(obj2); + + assertEquals(cell.get(), obj2); + + Object obj3 = new Object(); + + cell.put(obj3); + + assertEquals(cell.get(), obj3); + } +} Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,44 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.NoSuchElementException; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public final class ColumnTest extends TestCase { + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + Column < Object > col = new ColumnImpl < Object > (); + try { + col.get("test"); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + } + + /** + * On ajoute un objet avec une clé. + * On tente de récupérer celui-ci. + */ + public void testPut() { + Column < Object > col = new ColumnImpl < Object > (); + + Object obj1 = new Object(); + + try { + col.get("object 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + + col.put("object 1", obj1); + + assertEquals(col.get("object 1"), obj1); + + } +}

1 0

r24 - in trunk/src/main/java/org/nuiton/mapstoragemanager/plugins: . bighashmap
by dlanglais＠users.nuiton.org 27 Jan '10

27 Jan '10

Author: dlanglais Date: 2010-01-27 13:20:57 +0100 (Wed, 27 Jan 2010) New Revision: 24 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java Log: Alors, je commit ce que j'avais commenc?\195?\169 sur une impl?\195?\169mentation de la spec bigtable ?\195?\160 l'aide de hashmap... Bon, je ne sais pas si ?\195?\167a vient de mon netbeans ou pas... Mais il semblerait qu'il y ait un probl?\195?\168me avec le package plugins... Comme s'il n'?\195?\169tait pas vu comme un package... Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-01-27 12:20:57 UTC (rev 24) @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.Set; -import org.nuiton.mapstoragemanager.plugins.BigTable; - public class OurHashMap implements BigTable{ HashMap<String,String> map = new HashMap<String, String>(); Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,21 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les opérations nécéssaires sur une cellule. + * @author Dorian Langlais + * + * @param <T> type d'objet contenu dans les cellules. + */ +public interface Cell < T > { + + /** + * Récupère le contenu le plus récent de la cellule. + * @return retourne l'objet le plus récent stocké dans la cellule. + */ + T get(); + /** + * Ajout de contenu dans la cellule. + * @param t objet de type < T > à stocker dans la cellule. + */ + void put(T t); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,71 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Classe Cell. + * Une cellule (selon la spec bigtable de google) est une Map entre un + * timestamp et un contenu. + * @param <T> Une cellule est paramétrée selon son type de contenu. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class CellImpl < T /**extends Serializable*/ > implements Cell < T > { + + /** + * Cellule. + * hashMap ayant pour clé le timestamp et pour valeur un objet de type T. + */ + private Map < Long, T > cell; + + /** + * Constructeur par défaut. + */ + public CellImpl() { + this.cell = new HashMap < Long, T > (); + } + + /** + * Constructeur avec un objet. + * @param t objet à mettre dans la cellule à construire. + */ + public CellImpl(T t) { + this.cell = new HashMap < Long, T > (); + this.put(t); + } + + /** + * {@inheritDoc} + */ + public final void put(final T t) { + cell.put(System.currentTimeMillis(), t); + } + + /** + * get(Long timestamp). + * fonction d'accès au contenu d'une cellule en fonction de son timestamp. + * @param timestamp Timestamps d'une cellule. + * @return retourne le contenu de la cellule. + */ + public final T get(final Long timestamp) { + return cell.get(timestamp); + } + + /** + * {@inheritDoc} + */ + public final T get() { + if (cell.size() == 0) { + throw new NoSuchElementException(); + } + Long max = cell.keySet().iterator().next(); + for (Long current : cell.keySet()) { + if (max > current) { + max = current; + } + } + return cell.get(max); + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,23 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface représentant les méthodes nécéssaires sur une colonne. + * @author Dorian Langlais + * + * @param <T> type d'objet contenu dans la colonne. + */ +public interface Column < T > { + + /** + * Récupère le contenu de la cellule ayant pour clé key. + * @param key clé de la ligne. + * @return objet stocké dans la celulle ayant pour clé key. + */ + T get(String key); + /** + * Ajoute l'objet t à la ligne de clé key. + * @param key clé de la ligne. + * @param t objet à stocker. + */ + void put(String key, T t); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,61 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Classe Column. + * @param <T> Type de contenu des cellules. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class ColumnImpl < T /**extends Serializable*/ > implements Column < T > { + + /** + * Colonne. + * hashMap ayant pour clé la "clé" de la "ligne" de la table et pour + * valeur le contenu de la cellule. + */ + private Map < String, CellImpl < T > > column; + + /** + * Constructeur par défaut. + */ + public ColumnImpl() { + column = new HashMap < String, CellImpl < T > > (); + } + + + /** + * get(Long timestamp). + * fonction d'accès au contenu d'une cellule en fonction de son timestamp. + * @param key clé de la ligne. + * @param timestamp désiré. + * @return retourne le contenu de la cellule. + */ + public final T get(final String key, final Long timestamp) { + return this.column.get(key).get(timestamp); + } + + /** + * {@inheritDoc} + */ + public final T get(final String key) { + if (this.column.get(key) == null) { + throw new NoSuchElementException(); + } + return this.column.get(key).get(); + } + + /** + * {@inheritDoc} + */ + public final void put(final String key, final T content) { + try { + this.column.get(key).put(content); + } catch (NullPointerException e) { + this.column.put(key, new CellImpl < T > (content)); + } + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,10 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public interface DataBase { + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,15 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface lisant les méthodes nécéssaires sur une ligne. + * @author Dorian Langlais + * + */ +public interface Row { + + /** + * Méthode permettant un affichage du contenu de la ligne. + * @return contenu de la ligne sous forme textuel. + */ + String toString(); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,45 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Classe Row. + * Représente une ligne d'une table. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class RowImpl implements Row { + + /** + * Structure de la ligne. + */ + private StructureImpl rowStructure; + /** + * Contenu de la ligne. + */ + private Map < String, Object > rowContent; + + /** + * Constructeur de Row. + * @param struct structure de la ligne. + * @param content contenu de la ligne. + */ + public RowImpl(final StructureImpl struct, + final Map < String, Object > content) { + this.rowStructure = struct; + this.rowContent = new HashMap < String, Object > (); + for (String columnName : struct.getColumnsNames()) { + rowContent.put(columnName, content.get(columnName)); + } + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret; + ret = rowContent.values().toString(); + return ret; + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,35 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface listant les méthodes nécéssaires sur une structure. + * Une Structure est une description d'une Table. + * @author Dorian Langlais + * + */ +public interface Structure { + + /** + * Méthode permettant l'ajout d'une colonne à une structure de table. + * @param columnName nom de la colonne. + * @param columnClass type d'objet contenu dans la colonne. + */ + void addColumn(String columnName, Class < ? > columnClass); + /** + * Méthode permettant de récupérer le nom des colonnes. + * @return retourne le nom de colonnes. + */ + Set < String > getColumnsNames(); + /** + * Méthode permettant de récupérer le type d'objet d'une colonne. + * @param columnName nom de la colonne. + * @return retourne le type d'objet de la colonne columnName. + */ + Class < ? > getColumnClass(String columnName); + /** + * Méthode permettant la suppression d'une colonne à la structure. + * @param columnName nom de la colonne à supprimer. + */ + void removeColumn(String columnName); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,59 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Classe Structure. + * Représente le mapping d'une ligne, les types des colonnes + * @author Dorian Langlais + * + */ +public class StructureImpl implements Structure { + + /** + * Structure de la table. + * Contient le nom de la colonne comme clé, + * et le type de la colonne pour valeur. + */ + private Map < String, Class < ? /**extends Serializable*/ > > struct; + + /** + * Constructeur par défaut. + */ + public StructureImpl() { + this.struct = + new HashMap < String, Class < ? /**extends Serializable*/ > > (); + } + + /** + * {@inheritDoc} + */ + public final void addColumn(final String columnName, + final Class < ? /**extends Serializable*/ > columnClass) { + this.struct.put(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void removeColumn(final String columnName) { + this.struct.remove(columnName); + } + + /** + * {@inheritDoc} + */ + public final Class < ? /**extends Serializable*/ > getColumnClass( + final String columnName) { + return this.struct.get(columnName); + } + + /** + * {@inheritDoc} + */ + public final Set < String > getColumnsNames() { + return this.struct.keySet(); + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,37 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les opérations nécéssaires sur une table. + * @author Dorian Langlais + */ +public interface Table { + + /** + * Méthode permettant l'ajout d'une colonne à la table. + * @param columnName nom de la colonne à ajouter. + * @param columnClass type des objets contenu dans la colonne. + * @param <columnClass> méthode générique paramétrer par le type + * columnClass. + */ + < columnClass > void addColumn(final String columnName, + final Class < ? > columnClass); + + /** + * Méthode de suppression de colonne. + * @param columnName nom de la colonne à suprimer. + */ + void removeColumn(final String columnName); + + /** + * Méthode permettant de récupérer le contenu d'une ligne par sa clé. + * @param key clé de la ligne à récupérer. + * @return retourne la ligne ayant pour clé key. + */ + Row getRow(final String key); + + /** + * Méthode permettant la suppression d'une ligne par sa clé. + * @param key clé de la ligne à supprimer. + */ + void removeRow(final String key); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,69 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Classe Table. + * Représente une table bigtable. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class TableImpl implements Table { + + /** + * Table. + * hashMap ayant pour clé le nom des colonnes et pour valeur une colonne. + */ + private Map < String, ColumnImpl < ? > > tableContent; + /** + * Structure de la Table. + */ + private StructureImpl tableStructure; + + /** + * Constructeur par défaut. + */ + public TableImpl() { + this.tableContent = new HashMap < String, ColumnImpl < ? > > (); + this.tableStructure = new StructureImpl(); + } + + /** + * {@inheritDoc} + */ + public final < columnClass /**extends Serializable*/ > void addColumn( + final String columnName, final Class < ? > columnClass) { + ColumnImpl < columnClass > column = new ColumnImpl < columnClass > (); + this.tableContent.put(columnName, column); + this.tableStructure.addColumn(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void removeColumn(final String columnName) { + this.tableContent.remove(columnName); + this.tableStructure.removeColumn(columnName); + } + + /** + * {@inheritDoc} + */ + public final Row getRow(final String key) { + Map < String, Object > rowContent = + new HashMap < String, Object > (); + for (String columnName : tableStructure.getColumnsNames()) { + rowContent.put(columnName, + tableContent.get(columnName).get(key)); + } + return new RowImpl(tableStructure, rowContent); + } + + /** + * {@inheritDoc} + */ + public void removeRow(final String key) { + // TODO Auto-generated method stub + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,6 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; +/** + * package BigHashMap. + * permet la représentation sous forme de hashMap d'une base de données selon + * la spécification bigTable. + */ \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-27 12:20:57 UTC (rev 24) @@ -1,3 +1,4 @@ +package org.nuiton.mapstoragemanager.plugins; import java.util.Map; import java.util.Set; @@ -2,7 +3,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - /** Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-01-27 12:20:57 UTC (rev 24) @@ -1,5 +1,5 @@ +package org.nuiton.mapstoragemanager.plugins; /** * The plugins interfaces. */ -package org.nuiton.mapstoragemanager.plugins;

1 0

r23 - trunk/src/main/java/org/nuiton/mapstoragemanager/ui
by dlanglais＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: dlanglais Date: 2010-01-26 23:45:17 +0100 (Tue, 26 Jan 2010) New Revision: 23 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: Correction du commentaire. Les commentaires dans les blocs <![CDATA[ ]]> ne peuvent pas sous forme <xml /> -> boom au build ! Ils ne peuvent pas non plus ?\195?\170tre en mode javadoc -> boom au build ! Donc, par convention, je pense que l'on devrait coller les commentaires avant les balises de code java... Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:04:20 UTC (rev 22) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:45:17 UTC (rev 23) @@ -5,22 +5,22 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> -<script><![CDATA[ +  + <script> + <![CDATA[ + import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -  - import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - - ApplicationEngine engine = new ApplicationEngine(); - ApplicationConstants constants = new ApplicationConstants(); + ApplicationEngine engine = new ApplicationEngine(); + ApplicationConstants constants = new ApplicationConstants(); ]]> -</script> + </script> - -<style source='MainUI.css'/> +  + <style source='MainUI.css'/> + +  - - <JMenuBar> <JMenu text="File"> <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/>

1 0

r22 - / trunk/src/main/java/org/nuiton/mapstoragemanager/ui
by fgilet＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: fgilet Date: 2010-01-26 23:04:20 +0100 (Tue, 26 Jan 2010) New Revision: 22 Added: .project Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: leger changement de commentaire jaxx Added: .project =================================================================== --- .project (rev 0) +++ .project 2010-01-26 22:04:20 UTC (rev 22) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>mapstoragemanager</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 21:21:45 UTC (rev 21) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:04:20 UTC (rev 22) @@ -5,18 +5,19 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> - <script><![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -ApplicationEngine engine = new ApplicationEngine(); -ApplicationConstants constants = new ApplicationConstants(); -]]> - </script> +<script><![CDATA[ - -<style source='MainUI.css'/> +  + import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + + ApplicationEngine engine = new ApplicationEngine(); + ApplicationConstants constants = new ApplicationConstants(); + ]]> +</script> - + +<style source='MainUI.css'/>  @@ -37,11 +38,6 @@ <java.awt.BorderLayout id='BorderLayout'/> <JPanel layout='{BorderLayout}'> <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - -  - -  - <JLabel text='name base :' styleClass='boldUnderline' /> <JAXXComboBox> <item value='{null}' label='Select a base name' /> @@ -68,17 +64,11 @@ </JPanel> </JScrollPane> <JScrollPane> - -  - -  - <VBox horizontalAlignment='center'> <JPanel> </JPanel> <JLabel text="TABLE NAME : TODO"/> </VBox> - </JScrollPane> </JSplitPane> </JPanel>

2 1

r21 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:21:45 +0100 (Tue, 26 Jan 2010) New Revision: 21 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redline 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:16:50 UTC (rev 20) +++ trunk/pom.xml 2010-01-26 21:21:45 UTC (rev 21) @@ -19,7 +19,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> </parent> <version>0.1-SNAPSHOT</version>

1 0