OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused javax.inject annotations (#3827) 

AFAIK these annotations are not used when using declarative services.

I stubled upon these annotations when feature validation failed while creating #3817.
Xtext now uses Guice 7 which is using jakarta.inject imports.

Only si.uom:si-units:2.1 still imports javax.inject but it will also switch to jakarta.inject when 2.2 gets released.

Signed-off-by: Wouter Born <github@maindrain.net>
pull/3828/head
Wouter Born 2023-10-04 22:10:53 +02:00 committed by GitHub
parent 02f6c5c3e3
commit 93d80e36b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
View File

@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import javax.inject.Singleton;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.POST; import javax.ws.rs.POST;
@ -92,7 +91,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
@Path(SseResource.PATH_EVENTS) @Path(SseResource.PATH_EVENTS)
@RolesAllowed({ Role.USER, Role.ADMIN }) @RolesAllowed({ Role.USER, Role.ADMIN })
@Tag(name = SseResource.PATH_EVENTS) @Tag(name = SseResource.PATH_EVENTS)
@Singleton
@NonNullByDefault @NonNullByDefault
public class SseResource implements RESTResource, SsePublisher { public class SseResource implements RESTResource, SsePublisher {

2
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserBackingEngine.java
View File

@ -36,7 +36,7 @@ import org.openhab.core.auth.UserRegistry;
*/ */
public class ManagedUserBackingEngine implements BackingEngine { public class ManagedUserBackingEngine implements BackingEngine {
UserRegistry userRegistry; private final UserRegistry userRegistry;
public ManagedUserBackingEngine(UserRegistry userRegistry) { public ManagedUserBackingEngine(UserRegistry userRegistry) {
this.userRegistry = userRegistry; this.userRegistry = userRegistry;

5
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserBackingEngineFactory.java
View File

@ -14,8 +14,6 @@ package org.openhab.core.karaf.internal.jaas;
import java.util.Map; import java.util.Map;
import javax.inject.Singleton;
import org.apache.karaf.jaas.modules.BackingEngine; import org.apache.karaf.jaas.modules.BackingEngine;
import org.apache.karaf.jaas.modules.BackingEngineFactory; import org.apache.karaf.jaas.modules.BackingEngineFactory;
import org.openhab.core.auth.UserRegistry; import org.openhab.core.auth.UserRegistry;
@ -28,11 +26,10 @@ import org.osgi.service.component.annotations.Reference;
* *
* @author Yannick Schaus - initial contribution * @author Yannick Schaus - initial contribution
*/ */
@Singleton
@Component(service = BackingEngineFactory.class) @Component(service = BackingEngineFactory.class)
public class ManagedUserBackingEngineFactory implements BackingEngineFactory { public class ManagedUserBackingEngineFactory implements BackingEngineFactory {
UserRegistry userRegistry; private final UserRegistry userRegistry;
@Activate @Activate
public ManagedUserBackingEngineFactory(@Reference UserRegistry userRegistry) { public ManagedUserBackingEngineFactory(@Reference UserRegistry userRegistry) {

2
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserRealm.java
View File

@ -15,7 +15,6 @@ package org.openhab.core.karaf.internal.jaas;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.inject.Singleton;
import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
@ -30,7 +29,6 @@ import org.osgi.service.component.annotations.Component;
* *
* @author Yannick Schaus - initial contribution * @author Yannick Schaus - initial contribution
*/ */
@Singleton
@Component(service = JaasRealm.class) @Component(service = JaasRealm.class)
@Service @Service
public class ManagedUserRealm implements JaasRealm { public class ManagedUserRealm implements JaasRealm {