Skip to content

Commit

Permalink
lemon-1.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xuhuisheng committed May 27, 2022
1 parent 276e31a commit 2bf80b6
Show file tree
Hide file tree
Showing 332 changed files with 12,448 additions and 10,745 deletions.
3,324 changes: 1,662 additions & 1,662 deletions pom.xml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/main/java/com/mossle/android/rs/AndroidDeviceResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import com.mossle.api.user.AccountStatus;
import com.mossle.api.user.AuthenticationHandler;
import com.mossle.api.user.UserConnector;
import com.mossle.client.user.UserClient;
import com.mossle.api.user.UserDTO;

import com.mossle.core.mapper.JsonMapper;
Expand All @@ -35,7 +35,7 @@ public class AndroidDeviceResource {
.getLogger(AndroidDeviceResource.class);
private PimDeviceManager pimDeviceManager;
private AuthenticationHandler authenticationHandler;
private UserConnector userConnector;
private UserClient userClient;
private JsonMapper jsonMapper = new JsonMapper();

@POST
Expand Down Expand Up @@ -87,7 +87,7 @@ public BaseDTO login(@FormParam("username") String username,
}

if (pimDevice == null) {
UserDTO userDto = userConnector.findByUsername(username, "1");
UserDTO userDto = userClient.findByUsername(username, "1");

pimDevice = new PimDevice();
pimDevice.setName(name);
Expand All @@ -101,7 +101,7 @@ public BaseDTO login(@FormParam("username") String username,
pimDevice.setSessionId(uuid.toString());
pimDeviceManager.save(pimDevice);
} else {
UserDTO userDto = userConnector.findByUsername(username, "1");
UserDTO userDto = userClient.findByUsername(username, "1");
UUID uuid = UUID.randomUUID();
pimDevice.setSessionId(uuid.toString());
pimDevice.setUserId(userDto.getId());
Expand Down Expand Up @@ -178,7 +178,7 @@ public void setAuthenticationHandler(
}

@Resource
public void setUserConnector(UserConnector userConnector) {
this.userConnector = userConnector;
public void setUserClient(UserClient userClient) {
this.userClient = userClient;
}
}
12 changes: 6 additions & 6 deletions src/main/java/com/mossle/android/rs/AndroidMsgResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import javax.ws.rs.core.MediaType;

import com.mossle.api.tenant.TenantHolder;
import com.mossle.api.user.UserConnector;
import com.mossle.client.user.UserClient;
import com.mossle.api.user.UserDTO;

import com.mossle.core.mapper.JsonMapper;
Expand All @@ -40,7 +40,7 @@ public class AndroidMsgResource {
private JsonMapper jsonMapper = new JsonMapper();
private TenantHolder tenantHolder;
private MsgInfoManager msgInfoManager;
private UserConnector userConnector;
private UserClient userClient;
private PimDeviceManager pimDeviceManager;

@POST
Expand Down Expand Up @@ -72,7 +72,7 @@ public BaseDTO msg(@HeaderParam("sessionId") String sessionId)

if ((msgInfo.getSenderId() != null)
&& (!"".equals(msgInfo.getSenderId()))) {
userDto = userConnector.findById(msgInfo.getSenderId());
userDto = userClient.findById(msgInfo.getSenderId(),tenantHolder.getUserRepoRef());
}

Map<String, Object> map = new HashMap<String, Object>();
Expand Down Expand Up @@ -122,7 +122,7 @@ public BaseDTO view(@HeaderParam("sessionId") String sessionId,

if ((msgInfo.getSenderId() != null)
&& (!"".equals(msgInfo.getSenderId()))) {
userDto = userConnector.findById(msgInfo.getSenderId());
userDto = userClient.findById(msgInfo.getSenderId(),tenantHolder.getUserRepoRef());
}

Map<String, Object> map = new HashMap<String, Object>();
Expand Down Expand Up @@ -159,8 +159,8 @@ public void setTenantHolder(TenantHolder tenantHolder) {
}

@Resource
public void setUserConnector(UserConnector userConnector) {
this.userConnector = userConnector;
public void setUserClient(UserClient userClient) {
this.userClient = userClient;
}

@Resource
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/mossle/android/rs/AndroidPimResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import javax.ws.rs.core.MediaType;

import com.mossle.api.tenant.TenantHolder;
import com.mossle.api.user.UserConnector;
import com.mossle.client.user.UserClient;

import com.mossle.core.mapper.JsonMapper;
import com.mossle.core.util.BaseDTO;
Expand All @@ -37,7 +37,7 @@ public class AndroidPimResource {
private JsonMapper jsonMapper = new JsonMapper();
private TenantHolder tenantHolder;
private PimInfoManager pimInfoManager;
private UserConnector userConnector;
private UserClient userClient;
private PimDeviceManager pimDeviceManager;

@POST
Expand Down Expand Up @@ -93,8 +93,8 @@ public void setTenantHolder(TenantHolder tenantHolder) {
}

@Resource
public void setUserConnector(UserConnector userConnector) {
this.userConnector = userConnector;
public void setUserClient(UserClient userClient) {
this.userClient = userClient;
}

@Resource
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/mossle/android/rs/AndroidTaskResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.mossle.api.process.ProcessConnector;
import com.mossle.api.store.StoreConnector;
import com.mossle.api.tenant.TenantHolder;
import com.mossle.api.user.UserConnector;
import com.mossle.client.user.UserClient;

import com.mossle.bpm.persistence.manager.BpmProcessManager;

Expand Down Expand Up @@ -74,7 +74,7 @@ public class AndroidTaskResource {
private OperationService operationService;
private ModelConnector modelConnector;
private StoreClient storeClient;
private UserConnector userConnector;
private UserClient userClient;
private ProcessConnector processConnector;

@POST
Expand Down Expand Up @@ -114,7 +114,7 @@ public BaseDTO tasks(@HeaderParam("sessionId") String sessionId)
map.put("createTime",
dateFormat.format(humanTaskDto.getCreateTime()));
map.put("assignee", humanTaskDto.getAssignee());
map.put("assigneeDisplayName", userConnector.findById(userId)
map.put("assigneeDisplayName", userClient.findById(userId,tenantHolder.getUserRepoRef())
.getDisplayName());
list.add(map);
}
Expand Down Expand Up @@ -165,7 +165,7 @@ public BaseDTO tasksPersonal(@HeaderParam("sessionId") String sessionId)
map.put("createTime",
dateFormat.format(humanTaskDto.getCreateTime()));
map.put("assignee", humanTaskDto.getAssignee());
map.put("assigneeDisplayName", userConnector.findById(userId)
map.put("assigneeDisplayName", userClient.findById(userId,tenantHolder.getUserRepoRef())
.getDisplayName());
list.add(map);
}
Expand Down Expand Up @@ -215,7 +215,7 @@ public BaseDTO tasksGroup(@HeaderParam("sessionId") String sessionId)
map.put("createTime",
dateFormat.format(humanTaskDto.getCreateTime()));
map.put("assignee", humanTaskDto.getAssignee());
map.put("assigneeDisplayName", userConnector.findById(userId)
map.put("assigneeDisplayName", userClient.findById(userId,tenantHolder.getUserRepoRef())
.getDisplayName());
list.add(map);
}
Expand Down Expand Up @@ -266,7 +266,7 @@ public BaseDTO tasksComplete(@HeaderParam("sessionId") String sessionId)
map.put("createTime",
dateFormat.format(humanTaskDto.getCreateTime()));
map.put("assignee", humanTaskDto.getAssignee());
map.put("assigneeDisplayName", userConnector.findById(userId)
map.put("assigneeDisplayName", userClient.findById(userId,tenantHolder.getUserRepoRef())
.getDisplayName());
list.add(map);
}
Expand Down Expand Up @@ -317,7 +317,7 @@ public BaseDTO tasksDelegate(@HeaderParam("sessionId") String sessionId)
map.put("createTime",
dateFormat.format(humanTaskDto.getCreateTime()));
map.put("assignee", humanTaskDto.getAssignee());
map.put("assigneeDisplayName", userConnector.findById(userId)
map.put("assigneeDisplayName", userClient.findById(userId,tenantHolder.getUserRepoRef())
.getDisplayName());
list.add(map);
}
Expand Down Expand Up @@ -490,8 +490,8 @@ public void setStoreClient(StoreClient storeClient) {
}

@Resource
public void setUserConnector(UserConnector userConnector) {
this.userConnector = userConnector;
public void setUserClient(UserClient userClient) {
this.userClient = userClient;
}

@Resource
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/mossle/android/rs/AndroidUserResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import javax.ws.rs.core.MediaType;

import com.mossle.api.tenant.TenantHolder;
import com.mossle.api.user.UserConnector;
import com.mossle.client.user.UserClient;
import com.mossle.api.user.UserDTO;

import com.mossle.core.mapper.JsonMapper;
Expand All @@ -36,7 +36,7 @@ public class AndroidUserResource {
private JsonMapper jsonMapper = new JsonMapper();
private TenantHolder tenantHolder;
private MsgInfoManager msgInfoManager;
private UserConnector userConnector;
private UserClient userClient;
private PimDeviceManager pimDeviceManager;

@POST
Expand All @@ -58,7 +58,7 @@ public BaseDTO profile(@HeaderParam("sessionId") String sessionId)
}

String userId = pimDevice.getUserId();
UserDTO userDto = userConnector.findById(userId);
UserDTO userDto = userClient.findById(userId, tenantHolder.getUserRepoRef());

Map<String, String> map = new HashMap<String, String>();
map.put("username", userDto.getUsername());
Expand Down Expand Up @@ -87,8 +87,8 @@ public void setTenantHolder(TenantHolder tenantHolder) {
}

@Resource
public void setUserConnector(UserConnector userConnector) {
this.userConnector = userConnector;
public void setUserClient(UserClient userClient) {
this.userClient = userClient;
}

@Resource
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/mossle/api/database/Database.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.mossle.api.database;

import java.io.Closeable;

import javax.sql.DataSource;

public interface Database extends Closeable {
public static final String NAME_DEFAULT = "default";

DataSource getDataSource();

DataSource getDataSource(String name);
}
34 changes: 34 additions & 0 deletions src/main/java/com/mossle/api/database/DatabaseBuilder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.mossle.api.database;

import java.util.Properties;

public abstract class DatabaseBuilder<T extends DatabaseBuilder<T>> {
private Properties properties;
private String defaultPrefix;

public static DatabaseBuilder<?> newBuilder() {
return DatabaseProvider.provider().newBuilder();
}

public Properties getProperties() {
return properties;
}

public DatabaseBuilder<?> setProperties(Properties properties) {
this.properties = properties;

return this;
}

public String getDefaultPrefix() {
return defaultPrefix;
}

public DatabaseBuilder<?> setDefaultPrefix(String defaultPrefix) {
this.defaultPrefix = defaultPrefix;

return this;
}

public abstract Database build();
}
20 changes: 20 additions & 0 deletions src/main/java/com/mossle/api/database/DatabaseProvider.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.mossle.api.database;

public abstract class DatabaseProvider {
public static DatabaseProvider provider() {
DatabaseProvider databaseProvider = DatabaseProviderRegistry
.getDefaultRegistry().provider();

if (databaseProvider == null) {
throw new RuntimeException("cannot find database provider");
}

return databaseProvider;
}

public int getPriority() {
return 5;
}

public abstract DatabaseBuilder newBuilder();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.mossle.api.database;

import java.util.Comparator;

public class DatabaseProviderComparator implements Comparator<DatabaseProvider> {
public int compare(DatabaseProvider o1, DatabaseProvider o2) {
return o1.getPriority() - o2.getPriority();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.mossle.api.database;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.ServiceLoader;

public class DatabaseProviderRegistry {
private static DatabaseProviderRegistry instance;
private List<DatabaseProvider> providers = new ArrayList<DatabaseProvider>();

public static synchronized DatabaseProviderRegistry getDefaultRegistry() {
if (instance == null) {
instance = new DatabaseProviderRegistry();
instance.refreshProviders();
}

return instance;
}

public void refreshProviders() {
ServiceLoader<DatabaseProvider> serviceLoader = ServiceLoader
.load(DatabaseProvider.class);
Iterator<DatabaseProvider> iterator = serviceLoader.iterator();
List<DatabaseProvider> databaseProviders = new ArrayList<DatabaseProvider>();

while (iterator.hasNext()) {
databaseProviders.add(iterator.next());
}

Collections.sort(databaseProviders, new DatabaseProviderComparator());
this.providers = databaseProviders;
}

public DatabaseProvider provider() {
if (providers.isEmpty()) {
return null;
}

return providers.get(0);
}
}
Loading

0 comments on commit 2bf80b6

Please sign in to comment.