You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/31 08:56:33 UTC
[incubator-dlab] branch develop updated: DLAB-966 changed tags for
resources
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new feca5c9 DLAB-966 changed tags for resources
feca5c9 is described below
commit feca5c9aa2733c914510ab4d1f6ae2f92806c57b
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Jul 31 11:56:22 2019 +0300
DLAB-966 changed tags for resources
---
.../dlab/backendapi/service/TagServiceImpl.java | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java
index c601815..5f1504c 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagServiceImpl.java
@@ -1,11 +1,6 @@
package com.epam.dlab.backendapi.service;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.dao.EndpointDAO;
-import com.epam.dlab.backendapi.dao.ProjectDAO;
-import com.epam.dlab.backendapi.domain.EndpointDTO;
-import com.epam.dlab.backendapi.domain.ProjectDTO;
-import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashMap;
@@ -14,26 +9,14 @@ import java.util.Optional;
@Singleton
public class TagServiceImpl implements TagService {
- private final EndpointDAO endpointDAO;
- private final ProjectDAO projectDAO;
-
- @Inject
- public TagServiceImpl(EndpointDAO endpointDAO, ProjectDAO projectDAO) {
- this.endpointDAO = endpointDAO;
- this.projectDAO = projectDAO;
- }
@Override
public Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project,
String customTag) {
Map<String, String> tags = new HashMap<>();
tags.put("user_tag", userInfo.getName());
- endpointDAO.get(endpoint)
- .map(EndpointDTO::getTag)
- .ifPresent(tag -> tags.put("endpoint_tag", tag));
- projectDAO.get(project)
- .map(ProjectDTO::getTag)
- .ifPresent(tag -> tags.put("project_tag", tag));
+ tags.put("endpoint_tag", endpoint);
+ tags.put("project_tag", project);
Optional.ofNullable(customTag).ifPresent(t -> tags.put("custom_tag", t));
return tags;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org