Skip to content

Commit 2176c22

Browse files
authored
Address various compiler warnings and deprecations (#1247)
1 parent 156fdea commit 2176c22

File tree

24 files changed

+78
-63
lines changed

24 files changed

+78
-63
lines changed

api/src/main/java/com/inrupt/client/auth/Authenticator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,4 @@ public interface Authenticator {
5353
* @return the next stage of completion, containing the access token
5454
*/
5555
CompletionStage<Credential> authenticate(Session session, Request request, Set<String> algorithms);
56-
5756
}

api/src/main/java/com/inrupt/client/auth/ReactiveAuthorization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public CompletionStage<Optional<Credential>> negotiate(final Session session, fi
119119
// Use the first authenticator, sorted by priority
120120
authenticators.sort(comparator);
121121
final Authenticator auth = authenticators.get(0);
122-
LOGGER.debug("Using {} authenticator", auth.getName());
122+
LOGGER.debug("Using {} authenticator", auth);
123123
return session.authenticate(auth, request, algorithms);
124124
}
125125
return CompletableFuture.completedFuture(Optional.empty());

api/src/main/java/com/inrupt/client/spi/ClientProviderResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public abstract class ClientProviderResolver {
3232

33-
private static ClientProviderResolver instance = null;
33+
private static ClientProviderResolver instance;
3434

3535
/**
3636
* Get the {@link Client} for this application.

api/src/main/java/com/inrupt/client/spi/RDFFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public final class RDFFactory {
3232

33-
private static RDF instance = null;
33+
private static RDF instance;
3434

3535
/**
3636
* Find and return the RDF instance.

examples/spring-web/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@
9898

9999
<build>
100100
<plugins>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-surefire-plugin</artifactId>
104+
<configuration>
105+
<systemPropertyVariables>
106+
<logging.level.root>WARN</logging.level.root>
107+
</systemPropertyVariables>
108+
</configuration>
109+
</plugin>
101110
<plugin>
102111
<!-- for building a jar -->
103112
<groupId>org.springframework.boot</groupId>

examples/spring-web/src/main/java/com/inrupt/client/examples/spring/web/controller/SolidController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public class SolidController {
5757
HttpSession httpSession;
5858

5959
@GetMapping(value = "/resource", produces = "text/turtle")
60-
public Resource getResource(final @AuthenticationPrincipal OAuth2User user, final @RequestParam URI uri) {
60+
public SolidResource getResource(final @AuthenticationPrincipal OAuth2User user, final @RequestParam URI uri) {
6161
final var session = SessionUtils.asSession(user)
6262
.orElseThrow(() -> new OAuth2AuthenticationException(INVALID_TOKEN));
6363
try (final var resource = client.session(session).read(uri, SolidRDFSource.class)) {
64-
return new Resource(resource);
64+
return new SolidResource(resource);
6565
}
6666
}
6767

examples/spring-web/src/main/java/com/inrupt/client/examples/spring/web/model/Resource.java renamed to examples/spring-web/src/main/java/com/inrupt/client/examples/spring/web/model/SolidResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import org.springframework.http.HttpHeaders;
3030
import org.springframework.http.MediaType;
3131

32-
public class Resource extends HttpEntity<byte[]> {
32+
public class SolidResource extends HttpEntity<byte[]> {
3333

3434
private final HttpHeaders headers = new HttpHeaders();
3535
private final RDFSource resource;
3636

37-
public Resource(final RDFSource resource) {
37+
public SolidResource(final RDFSource resource) {
3838
this.resource = resource;
3939
this.headers.setContentType(MediaType.valueOf(resource.getContentType()));
4040
}

examples/spring-web/src/main/resources/application.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ logging:
22
level:
33
root: info
44
spring:
5+
main:
6+
banner-mode: "off"
57
security:
68
oauth2:
79
client:

examples/spring-web/src/test/java/com/inrupt/client/examples/spring/web/WebApplicationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
4848
import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
4949

50-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
50+
@SpringBootTest(
51+
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
52+
classes = WebApplication.class)
5153
class WebApplicationTests {
5254

5355
static final MockWebServer mockServer = new MockWebServer();

examples/springboot/src/main/java/com/inrupt/client/examples/springboot/ApplicationStartController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public class ApplicationStartController {
5252

5353
private String userName;
5454

55-
5655
@GetMapping("/")
5756
public String index() {
5857
this.userName = null;
@@ -135,4 +134,4 @@ private void setUsernameFrontendState(final Model model) {
135134
model.addAttribute(FRONTEND_USERNAME, this.userName);
136135
}
137136

138-
}
137+
}

0 commit comments

Comments
 (0)