Skip to content

Commit a5fd33c

Browse files
committed
WIP
1 parent be23c29 commit a5fd33c

File tree

13 files changed

+304
-195
lines changed

13 files changed

+304
-195
lines changed

commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AbstractDirectoryBean.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,7 @@ public abstract class AbstractDirectoryBean {
5959
@XmlElement
6060
private Date updatedDate;
6161

62+
@XmlElement
63+
private Boolean testConnection;
64+
6265
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.deftdevs.bootstrapi.commons.model.type;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.NoArgsConstructor;
6+
7+
import javax.ws.rs.core.Response;
8+
import javax.xml.bind.annotation.XmlElement;
9+
import javax.xml.bind.annotation.XmlRootElement;
10+
11+
@Data
12+
@NoArgsConstructor
13+
@AllArgsConstructor
14+
@XmlRootElement(name = "status")
15+
public class _AllBeanStatus {
16+
17+
@XmlElement
18+
private int status;
19+
20+
@XmlElement
21+
private String message;
22+
23+
@XmlElement
24+
private String details;
25+
26+
public static _AllBeanStatus success() {
27+
return new _AllBeanStatus(Response.Status.OK.getStatusCode(), "Success", null);
28+
}
29+
30+
public static _AllBeanStatus error(Response.Status status, String message, String details) {
31+
return new _AllBeanStatus(status.getStatusCode(), message, details);
32+
}
33+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.deftdevs.bootstrapi.commons.service;
2+
3+
import com.deftdevs.bootstrapi.commons.service.api._AllService;
4+
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.function.Function;
8+
9+
public abstract class _AbstractAllServiceImpl<_A> implements _AllService<_A> {
10+
11+
protected <T> void setEntity(
12+
final T entity,
13+
final Function<T, T> updateFunction) {
14+
15+
16+
}
17+
18+
protected <T> void setEntities(
19+
final Map<String, T> entityMap,
20+
final Function<T, String> getIdentifier,
21+
final Function<List<T>, List<T>> updateFunction) {
22+
23+
if (entityMap == null || entityMap.isEmpty()) {
24+
return;
25+
}
26+
27+
}
28+
29+
}

commons/src/main/java/com/deftdevs/bootstrapi/commons/service/api/DirectoriesService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ AbstractDirectoryBean getDirectory(
2929
/**
3030
* Adds or Updates directory configurations. Any existing configurations with the same 'name' property is updated.
3131
*
32-
* @param directories the directories
33-
* @param testConnection whether to test connection
32+
* @param directories the directories
3433
* @return the directories
3534
*/
3635
List<AbstractDirectoryBean> setDirectories(
37-
@NotNull List<AbstractDirectoryBean> directories,
38-
boolean testConnection);
36+
@NotNull List<AbstractDirectoryBean> directories);
3937

4038
/**
4139
* Updates a single directory configuration. Any existing configuration with the same 'name' property is updated.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.deftdevs.bootstrapi.confluence.model;
2+
3+
import com.deftdevs.bootstrapi.commons.model.GroupBean;
4+
import com.deftdevs.bootstrapi.commons.model.SettingsBean;
5+
import com.deftdevs.bootstrapi.commons.model.UserBean;
6+
import com.deftdevs.bootstrapi.commons.model.type._AllBeanStatus;
7+
import lombok.AllArgsConstructor;
8+
import lombok.Data;
9+
import lombok.NoArgsConstructor;
10+
11+
import javax.xml.bind.annotation.XmlElement;
12+
import javax.xml.bind.annotation.XmlRootElement;
13+
import java.util.Map;
14+
15+
@Data
16+
@NoArgsConstructor
17+
@AllArgsConstructor
18+
@XmlRootElement(name = "all")
19+
public class _AllBean {
20+
21+
@XmlElement
22+
private SettingsBean settings;
23+
24+
@XmlElement
25+
private Map<String, UserBean> users;
26+
27+
@XmlElement
28+
private Map<String, GroupBean> groups;
29+
30+
@XmlElement
31+
private Map<String, _AllBeanStatus> status;
32+
33+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.deftdevs.bootstrapi.confluence.rest;
2+
3+
import com.atlassian.plugins.rest.common.security.SystemAdminOnly;
4+
import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
5+
import com.deftdevs.bootstrapi.commons.rest._AbstractAllResourceImpl;
6+
import com.deftdevs.bootstrapi.commons.service.api._AllService;
7+
import com.deftdevs.bootstrapi.jira.model._AllBean;
8+
import io.swagger.v3.oas.annotations.tags.Tag;
9+
import org.springframework.stereotype.Component;
10+
11+
import javax.inject.Inject;
12+
import javax.ws.rs.Consumes;
13+
import javax.ws.rs.Path;
14+
import javax.ws.rs.Produces;
15+
import javax.ws.rs.core.MediaType;
16+
17+
@Path("/")
18+
@Tag(name = BootstrAPI._ALL)
19+
@Consumes(MediaType.APPLICATION_JSON)
20+
@Produces(MediaType.APPLICATION_JSON)
21+
@SystemAdminOnly
22+
@Component
23+
public class _AllResourceImpl extends _AbstractAllResourceImpl<_AllBean> {
24+
25+
@Inject
26+
public _AllResourceImpl(
27+
final _AllService<_AllBean> allService) {
28+
29+
super(allService);
30+
}
31+
32+
}
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.deftdevs.bootstrapi.crowd.model;
22

3-
import com.deftdevs.bootstrapi.commons.model.GroupBean;
3+
import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
4+
import com.deftdevs.bootstrapi.commons.model.AbstractDirectoryBean;
45
import com.deftdevs.bootstrapi.commons.model.SettingsBean;
5-
import com.deftdevs.bootstrapi.commons.model.UserBean;
6+
import com.deftdevs.bootstrapi.commons.model.type._AllBeanStatus;
67
import lombok.AllArgsConstructor;
78
import lombok.Data;
89
import lombok.NoArgsConstructor;
@@ -14,21 +15,18 @@
1415
@Data
1516
@NoArgsConstructor
1617
@AllArgsConstructor
17-
@XmlRootElement(name = "all")
18+
@XmlRootElement(name = BootstrAPI._ALL)
1819
public class _AllBean {
1920

2021
@XmlElement
2122
private SettingsBean settings;
2223

2324
@XmlElement
24-
private Map<String, UserBean> users;
25-
26-
@XmlElement
27-
private Map<String, GroupBean> groups;
25+
private Map<String, AbstractDirectoryBean> directories;
2826

2927
@XmlElement
3028
private Map<String, ApplicationBean> applications;
3129

3230
@XmlElement
33-
private Map<String, _AllBeanConfigStatus> status;
31+
private Map<String, _AllBeanStatus> status;
3432
}

crowd/src/main/java/com/deftdevs/bootstrapi/crowd/model/_AllBeanConfigStatus.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

crowd/src/main/java/com/deftdevs/bootstrapi/crowd/service/DirectoriesServiceImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ public AbstractDirectoryBean getDirectory(
7676

7777
@Override
7878
public List<AbstractDirectoryBean> setDirectories(
79-
@NotNull final List<AbstractDirectoryBean> directoryBeans,
80-
final boolean testConnection) {
79+
@NotNull final List<AbstractDirectoryBean> directoryBeans) {
8180

8281
final Map<String, Directory> existingDirectoriesByName = findAllDirectories().stream()
8382
.collect(Collectors.toMap(Directory::getName, Function.identity()));
@@ -86,9 +85,9 @@ public List<AbstractDirectoryBean> setDirectories(
8685

8786
for (AbstractDirectoryBean directoryBean : directoryBeans) {
8887
if (existingDirectoriesByName.containsKey(directoryBean.getName())) {
89-
resultDirectories.add(setDirectory(existingDirectoriesByName.get(directoryBean.getName()).getId(), directoryBean, testConnection));
88+
resultDirectories.add(setDirectory(existingDirectoriesByName.get(directoryBean.getName()).getId(), directoryBean, false));
9089
} else {
91-
resultDirectories.add(addDirectory(directoryBean, testConnection));
90+
resultDirectories.add(addDirectory(directoryBean, false));
9291
}
9392
}
9493

0 commit comments

Comments
 (0)