Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve key handling in IdMap #22

Merged
merged 2 commits into from
Sep 27, 2020
Merged

Improve key handling in IdMap #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96054dd
fix: Improve key handling in IdMap
Clashsoft Sep 27, 2020
580ce0d
test: Add test case for empty ID in TestYamlIdMap.testUserObjectIds
Clashsoft Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 10 additions & 27 deletions src/main/java/org/fulib/yaml/IdMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.fulib.yaml;

import java.lang.reflect.Method;
import java.util.Collection;
import java.util.LinkedHashMap;

Expand Down Expand Up @@ -199,26 +198,28 @@ private String generateUniqueKey(Object obj)
return yamlObj.getId();
}

String key = getIntrinsicKey(obj);
key = StrUtil.downFirstChar(key);
String key = this.getIntrinsicKey(obj);
key = key.replaceAll("\\W+", "_");
key = key.isEmpty() ? "_" : StrUtil.downFirstChar(key);
key = this.makeUnique(key);
key = this.addUserId(key);
return key;
}

private static String getIntrinsicKey(Object obj)
private String getIntrinsicKey(Object obj)
{
final Class<?> clazz = obj.getClass();
final String id = getKeyFromProperty(obj, clazz, "getId");
final Reflector reflector = this.getReflector(obj);

final Object id = reflector.getValue(obj, "id");
if (id != null)
{
return id;
return id.toString();
}

final String name = getKeyFromProperty(obj, clazz, "getName");
final Object name = reflector.getValue(obj, "name");
if (name != null)
{
return name;
return name.toString();
}

return obj.getClass().getSimpleName().substring(0, 1);
Expand All @@ -244,22 +245,4 @@ private String addUserId(String key)
}
return key;
}

private static String getKeyFromProperty(Object obj, Class<?> clazz, String getterName)
{
try
{
Method getter = clazz.getMethod(getterName);
Object result = getter.invoke(obj);
if (result != null)
{
return result.toString().replaceAll("\\W+", "_");
}
}
catch (Exception ignored)
{
// go with old key
}
return null;
}
}
13 changes: 11 additions & 2 deletions src/test/java/org/fulib/yaml/TestYamlIdMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,23 @@ public void testUserObjectIds()
Room arts = new Room().setId("arts");
Room other = new Room().setId("other");
Room other2 = new Room().setId("other");
Room empty = new Room().setId("");
Room empty2 = new Room().setId("");

uni.withRooms(math).withRooms(arts).withRooms(other).withRooms(other2);
uni.withRooms(math);
uni.withRooms(arts);
uni.withRooms(other);
uni.withRooms(other2);
uni.withRooms(empty);
uni.withRooms(empty2);

YamlIdMap idMap = new YamlIdMap(uni.getClass().getPackage().getName());
String encode = idMap.encode(uni);
idMap.encode(uni);
assertThat(idMap.getId(math), is("math"));
assertThat(idMap.getId(other), is("other"));
assertThat(idMap.getId(other2), is("other1"));
assertThat(idMap.getId(empty), is("_"));
assertThat(idMap.getId(empty2), is("_2"));
}

@Test
Expand Down