Author: dlanglais Date: 2010-03-03 13:06:20 +0100 (Wed, 03 Mar 2010) New Revision: 168 Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java Log: Correction mineure (retourne String au lieu de Object sur deux m?\195?\169thodes de Table). Modified: trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java =================================================================== --- trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-03 11:32:16 UTC (rev 167) +++ trunk/msm-bighashmap/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableTest.java 2010-03-03 12:06:20 UTC (rev 168) @@ -285,8 +285,12 @@ */ assertEquals(expectedString1, tableActual.get("String", "string1")); assertEquals(expectedString2, tableActual.get("String", "string2")); +// assertEquals(null, tableActual.get("String", "integer1")); +// assertEquals(null, tableActual.get("String", "integer2")); assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); +// assertEquals(null, tableActual.get("String", "integer1")); +// assertEquals(null, tableActual.get("String", "integer2")); } /** Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 11:32:16 UTC (rev 167) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-03 12:06:20 UTC (rev 168) @@ -111,7 +111,7 @@ @Override public final String get(final String table, final String column, final String key) { - return this.tables.get(table).get(column, key).toString(); + return this.tables.get(table).get(column, key); } /** @@ -120,7 +120,7 @@ @Override public final String get(final String table, final String column, final String key, final int version) { - return this.tables.get(table).get(column, key, version).toString(); + return this.tables.get(table).get(column, key, version); } /** Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-03 11:32:16 UTC (rev 167) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/Table.java 2010-03-03 12:06:20 UTC (rev 168) @@ -59,7 +59,7 @@ * @param key the key * @return return the object stored */ - Object get(final String columnName, final String key); + String get(final String columnName, final String key); /** * Get an object from the table. @@ -70,7 +70,7 @@ * @param version the version wanted * @return return the object stored */ - Object get(final String columnName, final String key, final long version); + String get(final String columnName, final String key, final long version); /** * Get the keys of the table. Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-03 11:32:16 UTC (rev 167) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableImpl.java 2010-03-03 12:06:20 UTC (rev 168) @@ -98,14 +98,14 @@ /** * {@inheritDoc} */ - public final Object get(final String columnName, final String key) { + public final String get(final String columnName, final String key) { return this.tableColumns.get(columnName).get(key); } /** * {@inheritDoc} */ - public final Object get(final String columnName, final String key, + public final String get(final String columnName, final String key, final long version) { return this.tableColumns.get(columnName).get(key, version); } Modified: trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java =================================================================== --- trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 11:32:16 UTC (rev 167) +++ trunk/msm-bighashmapV2/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/TableTest.java 2010-03-03 12:06:20 UTC (rev 168) @@ -295,8 +295,12 @@ */ assertEquals(expectedString1, tableActual.get("String", "string1")); assertEquals(expectedString2, tableActual.get("String", "string2")); +// assertEquals(null, tableActual.get("String", "integer1")); +// assertEquals(null, tableActual.get("String", "integer2")); assertEquals(expectedInteger1, tableActual.get("Integer", "integer1")); assertEquals(expectedInteger2, tableActual.get("Integer", "integer2")); +// assertEquals(null, tableActual.get("String", "integer1")); +// assertEquals(null, tableActual.get("String", "integer2")); } /**