Skip to content

Commit c80c919

Browse files
Fix TYPE_USE annotated dependencies (#823)
* Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [io.avaje:avaje-config](https://github.com/avaje/avaje-config) and [io.avaje:avaje-jsonb](https://github.com/avaje/avaje-jsonb). Updates `io.avaje:avaje-config` from 4.0 to 4.1 - [Release notes](https://github.com/avaje/avaje-config/releases) - [Commits](avaje/avaje-config@4.0...4.1) Updates `io.avaje:avaje-jsonb` from 3.4 to 3.5 - [Release notes](https://github.com/avaje/avaje-jsonb/releases) - [Commits](avaje/avaje-jsonb@3.4...3.5) --- updated-dependencies: - dependency-name: io.avaje:avaje-config dependency-version: '4.1' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-jsonb dependency-version: '3.5' dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * fix jspecify nullable * Update UtilType.java --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 10a3764 commit c80c919

File tree

13 files changed

+29
-23
lines changed

13 files changed

+29
-23
lines changed

blackbox-test-inject/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
<dependency>
3030
<groupId>io.avaje</groupId>
3131
<artifactId>avaje-jsonb</artifactId>
32-
<version>3.4</version>
32+
<version>3.5</version>
3333
</dependency>
3434

3535
<dependency>
3636
<groupId>io.avaje</groupId>
3737
<artifactId>avaje-config</artifactId>
38-
<version>4.0</version>
38+
<version>4.1</version>
3939
</dependency>
4040

4141
<dependency>

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/ACar.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.List;
44

5+
import org.jspecify.annotations.Nullable;
6+
57
import io.avaje.inject.AssistFactory;
68
import io.avaje.inject.Assisted;
7-
import io.avaje.lang.Nullable;
89
import jakarta.inject.Inject;
910
import jakarta.inject.Named;
1011

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.List;
44

5+
import org.jspecify.annotations.Nullable;
6+
57
import io.avaje.inject.AssistFactory;
68
import io.avaje.inject.Assisted;
7-
import io.avaje.lang.Nullable;
89
import jakarta.inject.Named;
910

1011
@Named("tomato")

blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.example.myapp.config;
22

3+
import org.jspecify.annotations.Nullable;
34
import org.other.one.SomeOptionalDep;
45

56
import io.avaje.inject.Component;
6-
import io.avaje.lang.Nullable;
77

88
@Component
99
public class SomeOptionalUser {

blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser2.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.example.myapp.config;
22

3-
import io.avaje.inject.Component;
4-
import io.avaje.lang.Nullable;
5-
63
import java.util.Optional;
74

85
import org.other.one.SomeOptionalDep;
96

7+
import io.avaje.inject.Component;
8+
109
@Component
1110
public class SomeOptionalUser2 {
1211

blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyBean.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import java.util.concurrent.atomic.AtomicBoolean;
44

5+
import org.jspecify.annotations.Nullable;
6+
57
import io.avaje.inject.BeanScope;
68
import io.avaje.inject.Lazy;
79
import io.avaje.inject.PostConstruct;
8-
import io.avaje.lang.Nullable;
910
import jakarta.inject.Inject;
1011
import jakarta.inject.Named;
1112
import jakarta.inject.Singleton;

blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import java.util.concurrent.atomic.AtomicBoolean;
44

5+
import org.jspecify.annotations.Nullable;
6+
57
import io.avaje.inject.Bean;
68
import io.avaje.inject.Factory;
79
import io.avaje.inject.Lazy;
8-
import io.avaje.lang.Nullable;
910
import jakarta.inject.Named;
1011

1112
@Lazy

inject-aop/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<version>11.6-RC1</version>
99
</parent>
1010
<artifactId>avaje-inject-aop</artifactId>
11+
<name>avaje inject aspect orient programming</name>
1112
<dependencies>
1213
<!-- test dependencies -->
1314
<dependency>

inject-generator/src/main/java/io/avaje/inject/generator/Util.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package io.avaje.inject.generator;
22

3+
import static java.util.function.Predicate.not;
4+
import static java.util.stream.Collectors.toList;
5+
6+
import java.util.List;
7+
import java.util.Optional;
8+
import java.util.regex.Pattern;
9+
import java.util.stream.Stream;
10+
311
import javax.lang.model.element.AnnotationMirror;
412
import javax.lang.model.element.Element;
513
import javax.lang.model.element.ExecutableElement;
@@ -9,14 +17,6 @@
917
import javax.lang.model.type.TypeKind;
1018
import javax.lang.model.type.TypeMirror;
1119

12-
import static java.util.function.Predicate.not;
13-
import static java.util.stream.Collectors.toList;
14-
15-
import java.util.List;
16-
import java.util.Optional;
17-
import java.util.regex.Pattern;
18-
import java.util.stream.Stream;
19-
2020
final class Util {
2121
static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<";
2222
static final String PROVIDER_PREFIX = "jakarta.inject.Provider";
@@ -150,7 +150,7 @@ static String shortName(String fullType) {
150150
char firstChar = part.charAt(0);
151151
if (foundClass
152152
|| Character.isUpperCase(firstChar)
153-
|| (!Character.isAlphabetic(firstChar) && Character.isJavaIdentifierStart(firstChar))) {
153+
|| !Character.isAlphabetic(firstChar) && Character.isJavaIdentifierStart(firstChar)) {
154154
foundClass = true;
155155
result += (result.isEmpty() ? "" : ".") + part;
156156
}
@@ -223,7 +223,7 @@ static String extractMap(String rawType) {
223223
}
224224

225225
static UtilType determineType(TypeMirror rawType, boolean beanMap) {
226-
return UtilType.of(rawType.toString(), beanMap, rawType);
226+
return UtilType.of(beanMap, rawType);
227227
}
228228

229229
/**

inject-generator/src/main/java/io/avaje/inject/generator/UtilType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ private UtilType(Type type, String rawType, UType uType) {
2323
this.uType = uType;
2424
}
2525

26-
static UtilType of(String rawType, boolean beanMap, TypeMirror mirror) {
26+
static UtilType of(boolean beanMap, TypeMirror mirror) {
2727
var uType = UType.parse(mirror);
28+
var rawType = uType.fullWithoutAnnotations().replace(" ", "");
2829
if (rawType.startsWith("java.util.List<")) {
2930
return new UtilType(Type.LIST, rawType, uType.param0());
3031
} else if (rawType.startsWith("java.util.Set<")) {

inject-maven-plugin/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<artifactId>avaje-inject-maven-plugin</artifactId>
1111
<packaging>maven-plugin</packaging>
12+
<name>avaje inject maven plugin</name>
1213

1314
<dependencies>
1415
<dependency>

inject-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>io.avaje</groupId>
113113
<artifactId>avaje-jsonb</artifactId>
114-
<version>3.4</version>
114+
<version>3.5</version>
115115
<scope>test</scope>
116116
</dependency>
117117

inject/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>io.avaje</groupId>
4141
<artifactId>avaje-config</artifactId>
42-
<version>4.0</version>
42+
<version>4.1</version>
4343
<optional>true</optional>
4444
</dependency>
4545

0 commit comments

Comments
 (0)