Skip to content

Commit fe9e2e9

Browse files
author
Vincent Potucek
committed
Add @nullable annotations throughout the codebase
1 parent e885d05 commit fe9e2e9

File tree

96 files changed

+330
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+330
-14
lines changed

api/maven-api-core/src/main/java/org/apache/maven/api/services/Sources.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,13 @@ static class ResolvedPathSource extends PathSource implements ModelSource {
175175
}
176176

177177
@Override
178+
@Nullable
178179
public Path getPath() {
179180
return null;
180181
}
181182

182183
@Override
184+
@Nullable
183185
public Source resolve(String relative) {
184186
return null;
185187
}

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ public Path getRootDirectory() {
207207
}
208208

209209
@Override
210+
@Nullable
210211
public URL getURL() {
211212
return null;
212213
}

api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,11 +473,13 @@ private record Impl(
473473
}
474474

475475
@Override
476+
@Nullable
476477
public String attribute(@Nonnull String name) {
477478
return attributes.get(name);
478479
}
479480

480481
@Override
482+
@Nullable
481483
public XmlNode child(String name) {
482484
if (name != null) {
483485
ListIterator<XmlNode> it = children.listIterator(children.size());

compat/maven-artifact/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ under the License.
4141
<artifactId>junit-jupiter-params</artifactId>
4242
<scope>test</scope>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.apache.maven</groupId>
46+
<artifactId>maven-api-annotations</artifactId>
47+
</dependency>
4448
</dependencies>
4549

4650
<build>

compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Objects;
2727
import java.util.WeakHashMap;
2828

29+
import org.apache.maven.api.annotations.Nullable;
2930
import org.apache.maven.artifact.Artifact;
3031
import org.apache.maven.artifact.DefaultArtifact;
3132

@@ -92,6 +93,7 @@ public VersionRange cloneOf() {
9293
* @return a new {@link VersionRange} object that represents the spec
9394
* @throws InvalidVersionSpecificationException if invalid version specification
9495
*/
96+
@Nullable
9597
public static VersionRange createFromVersionSpec(String spec) throws InvalidVersionSpecificationException {
9698
if (spec == null) {
9799
return null;
@@ -202,6 +204,7 @@ private static Restriction parseRestriction(String spec) throws InvalidVersionSp
202204
return restriction;
203205
}
204206

207+
@Nullable
205208
public static VersionRange createFromVersion(String version) {
206209
if (DefaultArtifact.empty(version)) {
207210
return null;

compat/maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
import java.io.File;
2222
import java.nio.file.Paths;
2323

24+
import org.apache.maven.api.annotations.Nullable;
25+
2426
/**
2527
* Resolve relative file path against the given base directory
2628
*/
2729
@Deprecated
2830
public class ResolveFile {
31+
32+
@Nullable
2933
public static File resolveFile(File file, String baseDirectory) {
3034
if (file == null) {
3135
return null;

compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import java.io.PrintStream;
2222

23+
import org.apache.maven.api.annotations.Nullable;
2324
import org.slf4j.Logger;
2425
import org.slf4j.Marker;
2526

@@ -61,6 +62,7 @@ public void error(String msg, Throwable t) {
6162
//
6263
// Don't need any of this
6364
//
65+
@Nullable
6466
public String getName() {
6567
return null;
6668
}

compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import java.util.Set;
4545
import java.util.function.UnaryOperator;
4646

47+
import org.apache.maven.api.annotations.Nullable;
4748
import org.apache.maven.impl.model.DefaultInterpolator;
4849

4950
/**
@@ -272,6 +273,7 @@ void putAllSubstituted(Map<? extends String, ? extends String> m) {
272273
storage.putAll(m);
273274
}
274275

276+
@Nullable
275277
public String put(String key, List<String> commentLines, List<String> valueLines) {
276278
commentLines = new ArrayList<>(commentLines);
277279
valueLines = new ArrayList<>(valueLines);
@@ -305,6 +307,7 @@ public String put(String key, List<String> commentLines, List<String> valueLines
305307
return storage.put(key, property[1]);
306308
}
307309

310+
@Nullable
308311
public String put(String key, List<String> commentLines, String value) {
309312
commentLines = new ArrayList<>(commentLines);
310313
this.layout.put(key, new Layout(commentLines, null));
@@ -843,6 +846,7 @@ public PropertiesReader(Reader reader, boolean maybeTyped) {
843846
*
844847
* @throws IOException in case of an I/O error
845848
*/
849+
@Nullable
846850
public String readProperty() throws IOException {
847851
commentLines.clear();
848852
valueLines.clear();

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Map;
2525
import java.util.Objects;
2626

27+
import org.apache.maven.api.annotations.Nullable;
2728
import org.apache.maven.model.Model;
2829
import org.apache.maven.model.Profile;
2930

@@ -81,11 +82,13 @@ public DefaultModelBuildingResult addModelId(String modelId) {
8182
}
8283

8384
@Override
85+
@Nullable
8486
public Model getRawModel() {
8587
return rawModels.get(modelIds.get(0));
8688
}
8789

8890
@Override
91+
@Nullable
8992
public Model getRawModel(String modelId) {
9093
return rawModels.get(modelId);
9194
}
@@ -100,6 +103,7 @@ public DefaultModelBuildingResult setRawModel(String modelId, Model rawModel) {
100103
}
101104

102105
@Override
106+
@Nullable
103107
public List<Profile> getActivePomProfiles(String modelId) {
104108
return activePomProfiles.get(modelId);
105109
}

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.nio.file.Files;
2424
import java.nio.file.Path;
2525

26+
import org.apache.maven.api.annotations.Nullable;
2627
import org.apache.maven.building.FileSource;
2728

2829
/**
@@ -58,6 +59,7 @@ public File getPomFile() {
5859
}
5960

6061
@Override
62+
@Nullable
6163
public ModelSource2 getRelatedSource(String relPath) {
6264
relPath = relPath.replace('\\', File.separatorChar).replace('/', File.separatorChar);
6365

0 commit comments

Comments
 (0)