Skip to content

Commit deb1fe6

Browse files
Copilotlaeubi
andcommitted
Add @deprecated annotations and move formatLogMessage to Message.toString()
Co-authored-by: laeubi <[email protected]>
1 parent 99115dd commit deb1fe6

File tree

3 files changed

+42
-39
lines changed

3 files changed

+42
-39
lines changed

src/main/java/org/codehaus/plexus/build/BuildContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ public interface BuildContext {
211211
* @param message a {@link java.lang.String} object.
212212
* @deprecated Use {@link org.codehaus.plexus.build.messages.Messages} API instead
213213
*/
214+
@Deprecated
214215
void addMessage(File file, int line, int column, String message, int severity, Throwable cause);
215216

216217
/**
@@ -221,6 +222,7 @@ public interface BuildContext {
221222
* @param file a {@link java.io.File} object.
222223
* @deprecated Use {@link org.codehaus.plexus.build.messages.Messages#clear(java.nio.file.Path)} instead
223224
*/
225+
@Deprecated
224226
void removeMessages(File file);
225227

226228
/**

src/main/java/org/codehaus/plexus/build/messages/DefaultMessages.java

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public MessageBuilder build(MessageType type, Path path) {
8686
*/
8787
private void handleMessage(Message message) {
8888
// Log the message
89-
String logMessage = formatLogMessage(message);
89+
String logMessage = message.toString();
9090

9191
switch (message.getType()) {
9292
case ERROR:
@@ -113,44 +113,6 @@ private void handleMessage(Message message) {
113113
}
114114
}
115115

116-
/**
117-
* Formats a message for logging.
118-
*
119-
* @param message the message to format
120-
* @return the formatted log message
121-
*/
122-
private String formatLogMessage(Message message) {
123-
StringBuilder sb = new StringBuilder();
124-
125-
if (message.getPath() != null) {
126-
sb.append(message.getPath().toAbsolutePath());
127-
}
128-
129-
if (message.getLine() > 0 && message.getColumn() > 0) {
130-
sb.append(" [");
131-
sb.append(message.getLine());
132-
sb.append(':').append(message.getColumn());
133-
sb.append("]");
134-
} else if (message.getLine() > 0) {
135-
sb.append(" [");
136-
sb.append(message.getLine());
137-
sb.append("]");
138-
} else if (message.getColumn() > 0) {
139-
sb.append(" [:");
140-
sb.append(message.getColumn());
141-
sb.append("]");
142-
}
143-
144-
if (message.getMessage() != null) {
145-
if (sb.length() > 0) {
146-
sb.append(": ");
147-
}
148-
sb.append(message.getMessage());
149-
}
150-
151-
return sb.toString();
152-
}
153-
154116
/**
155117
* Maps a MessageType to a BuildContext severity level.
156118
*

src/main/java/org/codehaus/plexus/build/messages/Message.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,43 @@ public String getMessage() {
8484
public Throwable getCause() {
8585
return cause;
8686
}
87+
88+
/**
89+
* Returns a string representation of this message.
90+
* The format is: path [line:column]: message
91+
*
92+
* @return the formatted message string
93+
*/
94+
@Override
95+
public String toString() {
96+
StringBuilder sb = new StringBuilder();
97+
98+
if (path != null) {
99+
sb.append(path.toAbsolutePath());
100+
}
101+
102+
if (line > 0 && column > 0) {
103+
sb.append(" [");
104+
sb.append(line);
105+
sb.append(':').append(column);
106+
sb.append("]");
107+
} else if (line > 0) {
108+
sb.append(" [");
109+
sb.append(line);
110+
sb.append("]");
111+
} else if (column > 0) {
112+
sb.append(" [:");
113+
sb.append(column);
114+
sb.append("]");
115+
}
116+
117+
if (message != null) {
118+
if (sb.length() > 0) {
119+
sb.append(": ");
120+
}
121+
sb.append(message);
122+
}
123+
124+
return sb.toString();
125+
}
87126
}

0 commit comments

Comments
 (0)