Skip to content

Commit 263a048

Browse files
committed
bump: plugin-api 4.1.11
1 parent e84cf83 commit 263a048

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.ligoj.api</groupId>
66
<artifactId>plugin-parent</artifactId>
7-
<version>4.1.10</version>
7+
<version>4.1.11</version>
88
<relativePath />
99
</parent>
1010

src/main/java/org/ligoj/app/plugin/inbox/sql/resource/MessageResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.ligoj.app.plugin.inbox.sql.model.MessageTargetType;
3838
import org.ligoj.app.resource.node.NodeResource;
3939
import org.ligoj.app.resource.project.BasicProjectVo;
40-
import org.ligoj.app.resource.project.ProjectResource;
40+
import org.ligoj.app.resource.project.ProjectHelper;
4141
import org.ligoj.bootstrap.core.AuditedBean;
4242
import org.ligoj.bootstrap.core.INamableBean;
4343
import org.ligoj.bootstrap.core.json.PaginationJson;
@@ -86,7 +86,7 @@ public class MessageResource implements InitializingBean, ISessionSettingsProvid
8686
protected CompanyResource companyResource;
8787

8888
@Autowired
89-
protected ProjectResource projectResource;
89+
protected ProjectHelper projectHelper;
9090

9191
@Autowired
9292
protected NodeResource nodeResource;
@@ -303,7 +303,7 @@ private TableItem<MessageVo> findAllProvider(final UriInfo uriInfo, final BiFunc
303303
private void fillTarget(final Message message, final MessageVo vo) {
304304
switch (message.getTargetType()) {
305305
case PROJECT:
306-
vo.setProject(projectResource.findByPKey(message.getTarget()));
306+
vo.setProject(projectHelper.findByPKey(message.getTarget()));
307307
break;
308308
case COMPANY:
309309
vo.setCompany(companyResource.findByName(message.getTarget()));
@@ -339,7 +339,7 @@ public int countUnread() {
339339
public void afterPropertiesSet() {
340340
checker.put(MessageTargetType.COMPANY, companyResource::findByIdExpected);
341341
checker.put(MessageTargetType.GROUP, groupResource::findByIdExpected);
342-
checker.put(MessageTargetType.PROJECT, projectResource::findByPKey);
342+
checker.put(MessageTargetType.PROJECT, projectHelper::findByPKey);
343343
checker.put(MessageTargetType.NODE, nodeResource::findById);
344344
checker.put(MessageTargetType.USER, userResource::findById);
345345
}

src/test/java/org/ligoj/app/plugin/inbox/sql/resource/MessageResourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class MessageResourceTest extends AbstractAppTest {
5555
@BeforeEach
5656
void prepare() throws IOException {
5757
persistEntities("csv",
58-
new Class[]{Node.class, Parameter.class, Project.class, Subscription.class, ParameterValue.class,
58+
new Class<?>[]{Node.class, Parameter.class, Project.class, Subscription.class, ParameterValue.class,
5959
Message.class, DelegateNode.class, DelegateOrg.class, CacheCompany.class, CacheUser.class,
6060
CacheGroup.class, CacheMembership.class, CacheProjectGroup.class},
6161
StandardCharsets.UTF_8);

0 commit comments

Comments
 (0)