Skip to main content

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

Difference between revisions of "Generify A Java Project"

(Clean Up: Regexes for {@inheritDoc} / (non-Javadoc) comments)
(Setup: BREE change -> increment minor segment)
(6 intermediate revisions by the same user not shown)
Line 18: Line 18:
 
* Run with enough memory (e.g. <tt>-Xmx600M</tt>)
 
* Run with enough memory (e.g. <tt>-Xmx600M</tt>)
 
* Make sure you're in sync with HEAD and that other committers are informed about your plans (you don't want to merge non-trivial changes, since you're going to touch a big percentage of your LOC).
 
* Make sure you're in sync with HEAD and that other committers are informed about your plans (you don't want to merge non-trivial changes, since you're going to touch a big percentage of your LOC).
* In MANIFEST.MF, set <tt>Bundle-RequiredExecutionEnvironment: J2SE-1.5</tt>
+
* In MANIFEST.MF, set <tt>Bundle-RequiredExecutionEnvironment: JavaSE-1.7</tt>
* On the build path, change the "JRE System Library" to "Execution Environment: J2SE-1.5"
+
* On the build path, change the "JRE System Library" to "Execution Environment: JavaSE-1.7"
 
** this will also set the right compliance options on the "Project Properties > Java Compiler" page
 
** this will also set the right compliance options on the "Project Properties > Java Compiler" page
 +
* Make sure the [[Version_Numbering#When_to_change_the_minor_segment|minor segment]] of the bundle version has been incremented.
 
* Make a pass over "Project Properties > Java Compiler > Errors/Warnings" and turn interesting problems for 1.5 language constructs to Warning or Error:
 
* Make a pass over "Project Properties > Java Compiler > Errors/Warnings" and turn interesting problems for 1.5 language constructs to Warning or Error:
 
** Set all options under Annotations to Warning/Enabled, except for the last one (disable "Suppress optional errors...")
 
** Set all options under Annotations to Warning/Enabled, except for the last one (disable "Suppress optional errors...")
Line 26: Line 27:
 
*** there are no false positives (i.e. no "potential" problems)
 
*** there are no false positives (i.e. no "potential" problems)
 
*** we don't have hundreds of instances of the problem and fixing all of them would take too much time
 
*** we don't have hundreds of instances of the problem and fixing all of them would take too much time
*** it's not a local problem that often occurs during editing and where an error would be distracting (unused stuff)
+
*** it's not a local problem that often occurs during editing and where an error would be distracting (e.g. unused stuff)
 
** Before we commit a file, we always try to get rid of all warnings (if possible with reasonable effort)
 
** Before we commit a file, we always try to get rid of all warnings (if possible with reasonable effort)
** If you can't generify all dependencies, the [http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2FwhatsNew%2Fjdt_whatsnew.html&anchor=unavoidable-generic-type-problems Ignore unavoidable generic type problems] compiler option can help you get rid of uninteresting raw type warnings
+
** If you can't generify all dependencies, the [http://help.eclipse.org/index.jsp?topic=/org.eclipse.jdt.doc.user/tips/jdt_tips.html&anchor=unavoidable-generic-type-problems Ignore unavoidable generic type problems] compiler option can help you get rid of uninteresting raw type warnings
*** To disable these warnings in the PDE build, add <tt>javacWarnings..=-unavoidableGenericProblems</tt> to your build.properties file
+
*** To disable these warnings in the PDE build and Tycho, add <tt>javacWarnings..=-unavoidableGenericProblems</tt> to your build.properties file
 
* Adjust code formatter settings for generics and annotations if necessary
 
* Adjust code formatter settings for generics and annotations if necessary
  
Line 41: Line 42:
 
Here are two regular expressions to find boilerplate comments (replace matches with nothing):
 
Here are two regular expressions to find boilerplate comments (replace matches with nothing):
 
  ^[ \t]*/\*\*[\s\*]*\{@inheritDoc\}[\s\*]*\*/\s*\R
 
  ^[ \t]*/\*\*[\s\*]*\{@inheritDoc\}[\s\*]*\*/\s*\R
  ^[ \t]*/\*[\s\*]+\(non-Javadoc\)[\s\*]*@see [^@]+\s*\*/\s*\R
+
  ^[ \t]*/\*[\s\*]*\(non-Javadoc\)[\s\*]*@see [^@/]+(?:@since \d+\.\d+)?\s*\*/\s*\R
 +
Or both in one little monster:
 +
^[ \t]*/\*(?:\*[\s\*]*\{@inheritDoc\}[\s\*]*|[\s\*]*\(non-Javadoc\)[\s\*]*@see [^@/]+(?:@since \d+\.\d+)?\s*)\*/\s*\R
  
As always, make sure you look at the changes before committing them!
+
I also found a few matches with this pattern:
 +
^[ \t]*/\*[\s\*]*\(non-Javadoc\)[\s\*]*Method declared [oi]n \w+\.?[\s\*]*\*/\s*\R
 +
 
 +
As always, make sure you look at the changes before committing them! Some comments started as (non-Javadoc), but accumulated interesting explanations later on.
  
 
= Required Projects =
 
= Required Projects =
Line 87: Line 93:
 
* Manually add type arguments to your subtypes of generic types:
 
* Manually add type arguments to your subtypes of generic types:
 
** Search for implementations of Comparable, Comparator, Iterator, and of the Collection types (Collection, List, Set, Map)
 
** Search for implementations of Comparable, Comparator, Iterator, and of the Collection types (Collection, List, Set, Map)
 +
* Set the Problems view to "Group By > Java Problem Type", open the "Type Safety and Raw Types" group, and look at the "Class is a raw type" problems
 +
** Class types are a bit special, and it usually pays out to generify them manually (<tt>IAdaptable#getAdapter(Class<T>)</tt>, I'm looking at you). 
 
* Generify your own container types (e.g. MultiMaps, adapters for UI list or tree widgets).
 
* Generify your own container types (e.g. MultiMaps, adapters for UI list or tree widgets).
 
* Run "Refactor > Infer Generic Type Arguments" on the whole project (both options checked)
 
* Run "Refactor > Infer Generic Type Arguments" on the whole project (both options checked)

Revision as of 13:59, 24 November 2015

This page gives an overview of how to proceed when you want to generify a Java project (use Java 5 generics). It describes the steps we took to generify the org.eclipse.jdt.ui project. Most of these steps should also be applicable for other projects.

Basics

  • Make sure you understand what you're doing:
  • Generifying APIs requires special care:
    • Communicate to API clients that you're going to generify APIs
    • Perform the work in a branch and only merge back once you've validated the changes by updating several clients of your API.
    • If in doubt, don't add type parameters to types. If really necessary, you can still parameterize types later. But you cannot add/remove/modify type parameters after the initial release! If you add type parameters, all your clients will have to add type arguments all over their code to resolve raw type problems.

Setup

  • Run with enough memory (e.g. -Xmx600M)
  • Make sure you're in sync with HEAD and that other committers are informed about your plans (you don't want to merge non-trivial changes, since you're going to touch a big percentage of your LOC).
  • In MANIFEST.MF, set Bundle-RequiredExecutionEnvironment: JavaSE-1.7
  • On the build path, change the "JRE System Library" to "Execution Environment: JavaSE-1.7"
    • this will also set the right compliance options on the "Project Properties > Java Compiler" page
  • Make sure the minor segment of the bundle version has been incremented.
  • Make a pass over "Project Properties > Java Compiler > Errors/Warnings" and turn interesting problems for 1.5 language constructs to Warning or Error:
    • Set all options under Annotations to Warning/Enabled, except for the last one (disable "Suppress optional errors...")
    • Our general rule (JDT UI team) is that we set options to Error iff:
      • there are no false positives (i.e. no "potential" problems)
      • we don't have hundreds of instances of the problem and fixing all of them would take too much time
      • it's not a local problem that often occurs during editing and where an error would be distracting (e.g. unused stuff)
    • Before we commit a file, we always try to get rid of all warnings (if possible with reasonable effort)
    • If you can't generify all dependencies, the Ignore unavoidable generic type problems compiler option can help you get rid of uninteresting raw type warnings
      • To disable these warnings in the PDE build and Tycho, add javacWarnings..=-unavoidableGenericProblems to your build.properties file
  • Adjust code formatter settings for generics and annotations if necessary

Clean Up

  • Run Clean Ups:
    • Missing Code > Add missing Annotations > @Override
    • Missing Code > Add missing Annotations > @Deprecated
    • Unnecessary Code > Remove unnecessary casts (you can also enable the others in Unnecessary Code)

The @Override annotation will make some comments unnecessary. Here are two regular expressions to find boilerplate comments (replace matches with nothing):

^[ \t]*/\*\*[\s\*]*\{@inheritDoc\}[\s\*]*\*/\s*\R
^[ \t]*/\*[\s\*]*\(non-Javadoc\)[\s\*]*@see [^@/]+(?:@since \d+\.\d+)?\s*\*/\s*\R

Or both in one little monster:

^[ \t]*/\*(?:\*[\s\*]*\{@inheritDoc\}[\s\*]*|[\s\*]*\(non-Javadoc\)[\s\*]*@see [^@/]+(?:@since \d+\.\d+)?\s*)\*/\s*\R

I also found a few matches with this pattern:

^[ \t]*/\*[\s\*]*\(non-Javadoc\)[\s\*]*Method declared [oi]n \w+\.?[\s\*]*\*/\s*\R

As always, make sure you look at the changes before committing them! Some comments started as (non-Javadoc), but accumulated interesting explanations later on.

Required Projects

  • Generify APIs of required projects. If you have non-generified dependencies, the "Infer Generic Type Arguments" refactoring will wrongly infer <Object> in too many cases (since that's the best guess when APIs use raw types).

E.g to generify the org.eclipse.jdt.core.dom APIs, I used this regex search on the whole project:

\(element ?[Tt]ype: \{@link (\w+)\}\)[^/]*\R\t \*/\R\tpublic List

... and then I just replaced the match with:

$0<$1>

This worked quite well because the Javadocs of these APIs are very clean, consistent, and they contain the element type information.

Caveat: After this, client code that calls these APIs and then adds elements to the parameterized list must make sure the elements are of the right type. In some cases, this means that you have to add type parameters to other methods as well.

E.g. in ASTRewrite, the right generic version of:

ASTNode createCopyTarget(ASTNode node)

is:

<T extends ASTNode> T createCopyTarget(T node)

If you can't release these changes, you'll run into trouble when compiling certain client code, e.g.:

	SingleVariableDeclaration p1= xxx;
	SingleVariableDeclaration newParam = (SingleVariableDeclaration) rewrite.createCopyTarget(p1);

The original version of createCopyTarget requires a cast on the second line, but the generified version doesn't. I don't have a good solution for this problem.

Here's another regex I used to generify property descriptors in the DOM AST:

Search: (public static final Child(?:List)?PropertyDescriptor)( [A-Z_]+\s*=\s*new Child(?:List)?PropertyDescriptor)(\(\w+\.class, "\w+", (\w+)\.class)
Replace: \1<\4>\2<\4>\3

Generify your project

  • Manually add type arguments to your subtypes of generic types:
    • Search for implementations of Comparable, Comparator, Iterator, and of the Collection types (Collection, List, Set, Map)
  • Set the Problems view to "Group By > Java Problem Type", open the "Type Safety and Raw Types" group, and look at the "Class is a raw type" problems
    • Class types are a bit special, and it usually pays out to generify them manually (IAdaptable#getAdapter(Class<T>), I'm looking at you).
  • Generify your own container types (e.g. MultiMaps, adapters for UI list or tree widgets).
  • Run "Refactor > Infer Generic Type Arguments" on the whole project (both options checked)
  • Organize Imports
  • Fix remaining compile errors manually.
  • Check that the changes make sense and don't affect APIs:
    • Be aware that the Infer Generic Type Arguments refactoring does not create wildcard type bounds, but in APIs, that would often be the right thing to do.
  • Note that some constructs cannot be automatically generified, e.g. custom map implementations, or code that uses the same slots for E and Collection<E>.
  • Search for commented type arguments that have sometimes been used (e.g. Map/*<String, Integer>*/ fStringToInteger;):
    • If equal to the actual arguments, remove the comments:
Search: \s*/\*\s*(<[^>]+>)\s*\*/\s*\1
Replace: \1
(Caveat: Search expression does not work for nested types like List<List<String>>)
  • If different from the actual arguments, take a closer look:
Search:  \s*/\*\s*(<[^>]+>)\s*\*/\s*(?!\1)<[^>]+>
Search:  \w+\s*/\*\s*[^/]+)\s*\*/\s*<[^>]+>
  • Query for Collection/*String*/<String> (note the missing < > in the comment):
Search: \s*/\*\s*<?\s*([^*]+)\s*>?\s*\*/\s*<\1>
Replace: <\1>
  • Make a last manual pass over types with Object as type argument (could be correct, but is often not):
Search: <Object|Object>
  • Check all APIs to make sure their erasure didn't change and the type arguments have the necessary wildcards (roughly "<? super X>" for containers on which you need to call setters, "<? extends X>" for containers on which you need to call getters, and "<X>" for cases that should be completely restricted). Note that adding type parameters and arguments to APIs is like adding new API: You have exactly one chance to get it right. Changing generics later will be a breaking change most of the time.
  • Run "Clean Up > Enhanced for loop" if you want

Closing remarks

  • Set the Problems view to "Group By > Java Problem Type" and try to get get the "Type Safety and Raw Types" group empty.
  • Collection#toArray(T[]) is not typesafe, see Bug 7023484. Be careful when writing new code, since the compiler will not detect bugs in this case.

Back to the top