Use longer unique identifiers

archimatetool · Nov 17, 2016 · 4549c6e · 4549c6e
1 parent da8a54f
commit 4549c6e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/com.archimatetool.csv/src/com/archimatetool/csv/importer/CSVImporter.java b/com.archimatetool.csv/src/com/archimatetool/csv/importer/CSVImporter.java
@@ -613,7 +613,7 @@ private boolean isHeaderRecord(CSVRecord csvRecord, String[] fields) {
     String generateID() {
         String id;
         do {
-            id = UUID.randomUUID().toString().split("-")[0]; //$NON-NLS-1$
+            id = UUID.randomUUID().toString();
         }
         while(newConcepts.containsKey(id));
 

diff --git a/com.archimatetool.model/src/com/archimatetool/model/util/IDAdapter.java b/com.archimatetool.model/src/com/archimatetool/model/util/IDAdapter.java
@@ -68,7 +68,7 @@ public void registerID(String id) {
     public String getNewID() {
         String id;
         do {
-            id = UUID.randomUUID().toString().split("-")[0]; //$NON-NLS-1$
+            id = UUID.randomUUID().toString();
         }
         while(fUsedIDs.contains(id));
 

diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/model/AbstractTemplate.java b/com.archimatetool.templates/src/com/archimatetool/templates/model/AbstractTemplate.java
@@ -55,7 +55,7 @@ public AbstractTemplate() {
      */
     public AbstractTemplate(String id) {
         if(id == null) {
-            id = UUID.randomUUID().toString().split("-")[0]; //$NON-NLS-1$
+            id = UUID.randomUUID().toString();
         }
         fID = id;
     }

diff --git a/...s/com.archimatetool.model.tests/src/com/archimatetool/model/impl/ArchimateModelTests.java b/...s/com.archimatetool.model.tests/src/com/archimatetool/model/impl/ArchimateModelTests.java
@@ -212,7 +212,7 @@ public void testGetID() {
         model.setDefaults();
         id = model.getId();
         assertNotNull(id);
-        assertEquals(8, id.length());
+        assertEquals(36, id.length());
     }
 
     @Test
@@ -283,7 +283,7 @@ public void testIDAddedToElement() {
         model.getDefaultFolderForObject(element).getElements().add(element);
         String id = element.getId();
         assertNotNull(id);
-        assertEquals(8, id.length());
+        assertEquals(36, id.length());
     }
 
 }
diff --git a/tests/com.archimatetool.model.tests/src/com/archimatetool/model/util/IDAdapterTests.java b/tests/com.archimatetool.model.tests/src/com/archimatetool/model/util/IDAdapterTests.java
@@ -68,7 +68,7 @@ public void testRegisterID() throws Exception {
     public void testGetNewID() throws Exception {
         IDAdapter adapter = new IDAdapter();
         String id = adapter.getNewID();
-        assertEquals(8, id.length());
+        assertEquals(36, id.length());
 
         List<String> usedIDs = getPrivateIDList(adapter);
         assertTrue(usedIDs.contains(id));