Skip to content

Fix comments lost when load() auto-saves new fields #1

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

Open
lt-name wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix comments lost when load() auto-saves new fields #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 51 additions & 14 deletions src/main/java/net/cubespace/Yamler/Config/YamlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public void save(boolean withComments) throws InvalidConfigurationException {
root = new ConfigSection();
}

if (!withComments) clearComments();
clearComments();
if (withComments) collectComments(getClass());

internalSave(getClass());
saveToYaml();
Expand All @@ -38,9 +39,9 @@ public void save() throws InvalidConfigurationException {
this.save(true);
}

private void internalSave(Class clazz) throws InvalidConfigurationException {
private void collectComments(Class clazz) {
if (!clazz.getSuperclass().equals(YamlConfig.class)) {
internalSave(clazz.getSuperclass());
collectComments(clazz.getSuperclass());
}

for (Field field : clazz.getDeclaredFields()) {
Expand Down Expand Up @@ -68,30 +69,64 @@ private void internalSave(Class clazz) throws InvalidConfigurationException {
break;
}

if (field.isAnnotationPresent(Path.class)) {
Path path1 = field.getAnnotation(Path.class);
path = path1.value();
}

ArrayList<String> comments = new ArrayList<>();
for (Annotation annotation : field.getAnnotations()) {
if (annotation instanceof Comment) {
Comment comment = (Comment) annotation;
comments.add(comment.value());

comments.add(((Comment) annotation).value());
}

if (annotation instanceof Comments) {
Comments comment = (Comments) annotation;
comments.addAll(Arrays.asList(comment.value()));
comments.addAll(Arrays.asList(((Comments) annotation).value()));
}
}

if (field.isAnnotationPresent(Path.class)) {
Path path1 = field.getAnnotation(Path.class);
path = path1.value();
}

if (comments.size() > 0) {
if (!comments.isEmpty()) {
for (String comment : comments) {
addComment(path, comment);
}
}
}
}

private void internalSave(Class clazz) throws InvalidConfigurationException {
if (!clazz.getSuperclass().equals(YamlConfig.class)) {
internalSave(clazz.getSuperclass());
}

for (Field field : clazz.getDeclaredFields()) {
if (doSkip(field)) {
continue;
}

String path = "";

switch (CONFIG_MODE) {
case PATH_BY_UNDERSCORE:
path = field.getName().replace("_", ".");
break;
case FIELD_IS_KEY:
path = field.getName();
break;
case DEFAULT:
default:
String fieldName = field.getName();
if (fieldName.contains("_")) {
path = field.getName().replace("_", ".");
} else {
path = field.getName();
}
break;
}

if (field.isAnnotationPresent(Path.class)) {
Path path1 = field.getAnnotation(Path.class);
path = path1.value();
}

if (Modifier.isPrivate(field.getModifiers())) {
field.setAccessible(true);
Expand Down Expand Up @@ -206,6 +241,8 @@ private void internalLoad(Class clazz) throws InvalidConfigurationException {
}

if (save) {
clearComments();
collectComments(getClass());
saveToYaml();
}
}
Expand Down