Skip to content

Commit 85e5fa6

Browse files
committed
move toString() to RepositoryInfo
(higher up the class hierarchy)
1 parent 303dba3 commit 85e5fa6

File tree

2 files changed

+21
-28
lines changed

2 files changed

+21
-28
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/Repository.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,33 +97,6 @@ public abstract class Repository extends RepositoryInfo {
9797
*/
9898
abstract boolean hasHistoryForDirectories();
9999

100-
@Override
101-
public String toString() {
102-
StringBuilder stringBuilder = new StringBuilder();
103-
stringBuilder.append("{");
104-
stringBuilder.append("dir=");
105-
stringBuilder.append(this.getDirectoryName());
106-
stringBuilder.append(",");
107-
stringBuilder.append("type=");
108-
stringBuilder.append(getType());
109-
stringBuilder.append(",");
110-
111-
if (!isHistoryEnabled()) {
112-
stringBuilder.append("history=off");
113-
} else {
114-
stringBuilder.append("renamed=");
115-
stringBuilder.append(this.isHandleRenamedFiles());
116-
stringBuilder.append(",");
117-
stringBuilder.append("merge=");
118-
stringBuilder.append(this.isMergeCommitsEnabled());
119-
stringBuilder.append(",");
120-
stringBuilder.append("historyBased=");
121-
stringBuilder.append(this.isHistoryBasedReindex());
122-
}
123-
stringBuilder.append("}");
124-
return stringBuilder.toString();
125-
}
126-
127100
/**
128101
* Get the history for the specified file or directory.
129102
* It is expected that {@link History#getRenamedFiles()} and {@link HistoryEntry#getFiles()} are empty for files.

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoryInfo.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,26 @@ public int hashCode() {
366366

367367
@Override
368368
public String toString() {
369-
return type + ":" + directoryNameRelative;
369+
StringBuilder stringBuilder = new StringBuilder();
370+
stringBuilder.append("{");
371+
stringBuilder.append("dir=");
372+
stringBuilder.append(this.getDirectoryName());
373+
stringBuilder.append(",");
374+
stringBuilder.append("type=");
375+
stringBuilder.append(getType());
376+
stringBuilder.append(",");
377+
378+
if (!isHistoryEnabled()) {
379+
stringBuilder.append("history=off");
380+
} else {
381+
stringBuilder.append("history=on,");
382+
stringBuilder.append("renamed=");
383+
stringBuilder.append(this.isHandleRenamedFiles());
384+
stringBuilder.append(",");
385+
stringBuilder.append("merge=");
386+
stringBuilder.append(this.isMergeCommitsEnabled());
387+
}
388+
stringBuilder.append("}");
389+
return stringBuilder.toString();
370390
}
371391
}

0 commit comments

Comments
 (0)