kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update codeStyle.xml to fix incompatibility (#8623)

This commit is contained in:
吴晟 Wu Sheng 2022-03-07 07:56:47 +08:00 committed by GitHub
parent ff024ce7a2
commit 4b0504fd5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -27,6 +27,7 @@ Release Notes.
* Upgrade maven-compiler-plugin to 3.10.0.
* Upgrade maven-resources-plugin to 3.2.0.
* Upgrade maven-source-plugin to 3.2.1.
* Update codeStyle.xml to fix incompatibility on M1's IntelliJ IDEA 2021.3.2.
#### OAP Server

8
codeStyle.xml
View File

@ -1,6 +1,4 @@
<code_scheme name="sky-walking" version="173">
<option name="USE_SAME_INDENTS" value="true" />
<option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
@ -12,7 +10,6 @@
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="INSERT_OVERRIDE_ANNOTATION" value="true" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
@ -25,9 +22,6 @@
</option>
<option name="JD_P_AT_EMPTY_LINES" value="false" />
</JavaCodeStyleSettings>
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<ADDITIONAL_INDENT_OPTIONS fileType="haml">
<option name="INDENT_SIZE" value="2" />
</ADDITIONAL_INDENT_OPTIONS>
@ -102,4 +96,4 @@
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</code_scheme>

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
View File

@ -155,7 +155,7 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
*/
public void setParameters(String parameters) {
this.parameters = parameters == null || parameters.length() <= PARAMETER_MAX_LENGTH ?
parameters : parameters.substring(0, PARAMETER_MAX_LENGTH);
parameters : parameters.substring(0, PARAMETER_MAX_LENGTH);
}
@Override