Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
61 changes: 61 additions & 0 deletions .editorconfig
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
[*]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add root = true?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definetely, thanks

charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should ensure EOL on last line is present.

Suggested change
insert_final_newline = false
insert_final_newline = true

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

max_line_length = 120
tab_width = 2
ij_continuation_indent_size = 4
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = true
ij_smart_tabs = false
ij_visual_guides =
ij_wrap_on_typing = false

[*.java]
ij_java_indent_case_from_switch = false
ij_java_call_parameters_new_line_after_left_paren = false
ij_java_call_parameters_right_paren_on_new_line = false
ij_java_call_parameters_wrap = normal
ij_java_method_parameters_new_line_after_left_paren = false
ij_java_method_parameters_right_paren_on_new_line = false
ij_java_method_parameters_wrap = normal
ij_java_resource_list_new_line_after_left_paren = false
ij_java_resource_list_right_paren_on_new_line = false
ij_java_resource_list_wrap = normal
ij_java_extends_list_wrap = normal
ij_java_throws_list_wrap = normal
ij_java_extends_keyword_wrap = normal
ij_java_throws_keyword_wrap = normal
ij_java_method_call_chain_wrap = normal
ij_java_binary_operation_wrap = normal
ij_java_ternary_operation_wrap = normal
ij_java_for_statement_wrap = normal
ij_java_array_initializer_wrap = normal
ij_java_assignment_wrap = normal
ij_java_assert_statement_wrap = normal
ij_java_if_brace_force = always
ij_java_do_while_brace_force = always
ij_java_while_brace_force = always
ij_java_for_brace_force = always
ij_java_parameter_annotation_wrap = normal
ij_java_variable_annotation_wrap = normal
ij_java_enum_constants_wrap = normal
ij_java_blank_lines_after_imports = 1
ij_java_blank_lines_before_imports = 1
ij_java_class_count_to_use_import_on_demand = 9999
ij_java_packages_to_use_import_on_demand =
ij_java_imports_layout = $*,|,*
ij_java_layout_static_imports_separately = true
ij_java_use_single_class_imports = true

[.editorconfig]
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
ij_editorconfig_space_after_comma = true
ij_editorconfig_space_before_colon = false
ij_editorconfig_space_before_comma = false
ij_editorconfig_spaces_around_assignment_operators = true

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 10 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,9 @@ Basic code conventions followed by Ozone:

These are checked by tools like Checkstyle and RAT.

For IntelliJ users, it is recommended to import and select the Code Style scheme located at:
Ozone checkstyle is shared via .editorconfig configuration file and will be automatically imported when the project is open.

```
./hadoop-ozone/dev-support/intellij/ozone-style.xml
```

See https://www.jetbrains.com/help/idea/configuring-code-style.html#import-code-style for detailed instructions.
See https://www.jetbrains.com/help/idea/configure-project-settings.html#share-project-through-vcs for detailed instructions.

### Check your contribution

Expand Down Expand Up @@ -166,16 +162,17 @@ As Ozone uses Apache Maven it can be developed from any IDE. IntelliJ IDEA is a

### Run Ozone from IntelliJ

Ozone components depends on maven classpath. We generate classpath descriptor from the maven pom.xml files to use exactly the same classpath at runtime.
Ozone components depend on maven classpath. We generate classpath descriptor from the maven pom.xml files to use exactly the same classpath at runtime.

As a result, it's easy to start _all_ the components from IDE as the right classpath (without provided scope) has already been set.
As a result, it's straightforward to start _all_ the components from IDE as the right classpath (without provided scope) has already been set.

To start Ozone from IntelliJ:
Ozone project already has pre-defined run configurations shared via standard IDE folder for run configurations:

```
./.run
```

1. Stop your IDE
2. Execute the `./hadoop-ozone/dev-support/intellij/install-runconfigs.sh` helper script.
3. Start the IDE
4. New runner definitions are available from the Run menu.
They will be automatically imported into IDE on project import.

You can use the installed Run configurations in the following order:

Expand Down
21 changes: 0 additions & 21 deletions hadoop-ozone/dev-support/intellij/install-runconfigs.sh

This file was deleted.

71 changes: 0 additions & 71 deletions hadoop-ozone/dev-support/intellij/ozone-style.xml

This file was deleted.