From ed1417b2ead248da774eb3b665cd8dff12b811db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 22 Jun 2018 08:18:43 +0200 Subject: [PATCH] Replace guice inject with javax --- .../sonia/scm/api/v2/resources/GroupCollectionResource.java | 2 +- .../java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java | 2 +- .../main/java/sonia/scm/api/v2/resources/GroupV2Resource.java | 3 +-- .../sonia/scm/api/v2/resources/UserCollectionResource.java | 2 +- .../java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java | 3 ++- .../src/main/java/sonia/scm/api/v2/resources/UserResource.java | 2 +- .../main/java/sonia/scm/api/v2/resources/UserRootResource.java | 3 +-- .../java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java | 3 ++- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java index 930641d4ce..056938a381 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.ResponseHeader; import com.webcohesion.enunciate.metadata.rs.StatusCodes; @@ -12,6 +11,7 @@ import sonia.scm.group.GroupException; import sonia.scm.group.GroupManager; import sonia.scm.web.VndMediaType; +import javax.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java index 8baafdc2b8..d439a148fa 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; @@ -8,6 +7,7 @@ import org.mapstruct.MappingTarget; import sonia.scm.group.Group; import sonia.scm.group.GroupPermissions; +import javax.inject.Inject; import java.util.List; import java.util.stream.Collectors; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupV2Resource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupV2Resource.java index a56fca3ad5..99227651c4 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupV2Resource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupV2Resource.java @@ -1,7 +1,6 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; - +import javax.inject.Inject; import javax.ws.rs.Path; @Path(GroupV2Resource.GROUPS_PATH_V2) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java index f31c08c6c7..7d6ef89909 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.ResponseHeader; import com.webcohesion.enunciate.metadata.rs.StatusCodes; @@ -12,6 +11,7 @@ import sonia.scm.user.UserException; import sonia.scm.user.UserManager; import sonia.scm.web.VndMediaType; +import javax.inject.Inject; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.POST; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java index 55ae67f22b..115ff3dcd5 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import org.apache.shiro.authc.credential.PasswordService; import org.mapstruct.Context; import org.mapstruct.Mapper; @@ -9,6 +8,8 @@ import org.mapstruct.Mappings; import org.mapstruct.Named; import sonia.scm.user.User; +import javax.inject.Inject; + import static sonia.scm.api.rest.resources.UserResource.DUMMY_PASSWORT; @Mapper diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java index ebfbdda6f1..ed0b8cdc77 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.rs.TypeHint; @@ -10,6 +9,7 @@ import sonia.scm.user.UserException; import sonia.scm.user.UserManager; import sonia.scm.web.VndMediaType; +import javax.inject.Inject; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.PUT; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserRootResource.java index 87b776ca66..7f3972dce2 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserRootResource.java @@ -1,7 +1,6 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; - +import javax.inject.Inject; import javax.inject.Provider; import javax.ws.rs.Path; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java index ed1dbf0e60..66e3d57fb1 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java @@ -1,6 +1,5 @@ package sonia.scm.api.v2.resources; -import com.google.inject.Inject; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; @@ -9,6 +8,8 @@ import sonia.scm.api.rest.resources.UserResource; import sonia.scm.user.User; import sonia.scm.user.UserPermissions; +import javax.inject.Inject; + import static de.otto.edison.hal.Link.link; import static de.otto.edison.hal.Links.linkingTo; import static sonia.scm.api.v2.resources.ResourceLinks.user;