-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR updates the region computation in `Type-Annotator-Scanner` according to latest changes in NullAway following [PR658](uber/NullAway#658). Also in this PR the infrastructure for keeping compatibility with older versions of NullAway (`0.10.4` or less) is implemented.
- Loading branch information
1 parent
ffbefb6
commit e4b482e
Showing
36 changed files
with
788 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
core/src/main/java/edu/ucr/cs/riple/core/adapters/NullAwayV0Adapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2022 Nima Karimipour | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package edu.ucr.cs.riple.core.adapters; | ||
|
|
||
| import com.google.common.base.Preconditions; | ||
| import edu.ucr.cs.riple.core.Config; | ||
| import edu.ucr.cs.riple.core.metadata.index.Error; | ||
| import edu.ucr.cs.riple.core.metadata.index.Fix; | ||
| import edu.ucr.cs.riple.core.metadata.trackers.Region; | ||
| import edu.ucr.cs.riple.core.metadata.trackers.TrackerNode; | ||
| import edu.ucr.cs.riple.injector.changes.AddMarkerAnnotation; | ||
| import edu.ucr.cs.riple.injector.location.Location; | ||
| import edu.ucr.cs.riple.injector.location.OnField; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Adapter working with versions below: | ||
| * | ||
| * <ul> | ||
| * <li>NullAway: Serialization version 0 | ||
| * <li>Type Annotator Scanner: 1.3.3 or below | ||
| * </ul> | ||
| */ | ||
| public class NullAwayV0Adapter implements NullAwayVersionAdapter { | ||
|
|
||
| /** Annotator config. */ | ||
| private final Config config; | ||
|
|
||
| public NullAwayV0Adapter(Config config) { | ||
| this.config = config; | ||
| } | ||
|
|
||
| @Override | ||
| public Fix deserializeFix(Location location, String[] values) { | ||
| Preconditions.checkArgument( | ||
| values.length == 10, | ||
| "Expected 10 values to create Fix instance in NullAway serialization version 0 but found: " | ||
| + values.length); | ||
| Preconditions.checkArgument( | ||
| values[7].equals("nullable"), "unsupported annotation: " + values[7]); | ||
| String encMember = !Region.getType(values[9]).equals(Region.Type.METHOD) ? "null" : values[9]; | ||
| return new Fix( | ||
| new AddMarkerAnnotation(location, config.nullableAnnot), | ||
| values[6], | ||
| new Region(values[8], encMember), | ||
| true); | ||
| } | ||
|
|
||
| @Override | ||
| public Error deserializeError(String[] values) { | ||
| Preconditions.checkArgument( | ||
| values.length == 10, | ||
| "Expected 10 values to create Error instance in NullAway serialization version 0 but found: " | ||
| + values.length); | ||
| String encMember = !Region.getType(values[3]).equals(Region.Type.METHOD) ? "null" : values[3]; | ||
| return new Error( | ||
| values[0], | ||
| values[1], | ||
| new Region(values[2], encMember), | ||
| Location.createLocationFromArrayInfo(Arrays.copyOfRange(values, 4, 10))); | ||
| } | ||
|
|
||
| @Override | ||
| public TrackerNode deserializeTrackerNode(String[] values) { | ||
| Preconditions.checkArgument( | ||
| values.length == 4, | ||
| "Expected 4 values to create TrackerNode instance in NullAway serialization version 0 but found: " | ||
| + values.length); | ||
| String encMember = !Region.getType(values[1]).equals(Region.Type.METHOD) ? "null" : values[1]; | ||
| return new TrackerNode(values[0], encMember, values[2], values[3]); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Region> getFieldRegionScope(OnField onField) { | ||
| return Collections.singleton(new Region(onField.clazz, "null")); | ||
| } | ||
| } |
Oops, something went wrong.