Skip to content

Commit a05e07a

Browse files
author
Robin Duda
committed
Minor style fixes / close es client explicitly.
1 parent d819f22 commit a05e07a

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

core/main/java/com/codingchili/core/configuration/CoreStrings.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public abstract class CoreStrings {
137137
public static final String ID_OPTIONS = "options";
138138
public static final String ID_HANDLER = "handler";
139139
public static final String ID_UNDEFINED = "undefined";
140+
public static final String ID_STATISTICS = "statistics";
140141

141142
// Storage constants
142143
public static final String DEFAULT_DB = "db";

core/main/java/com/codingchili/core/protocol/Protocol.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.codingchili.core.protocol;
22

3-
import com.codingchili.core.context.CoreRuntimeException;
43
import io.vertx.core.Future;
54
import io.vertx.core.buffer.Buffer;
65

@@ -44,7 +43,7 @@ public class Protocol<RequestType> {
4443
private Function<Request, String> routeMapper = Request::route;
4544
private boolean emitDocumentation = false;
4645
private Route<RequestType> lastAddedRoute;
47-
private AtomicBoolean dirty = new AtomicBoolean(true);
46+
private final AtomicBoolean dirty = new AtomicBoolean(true);
4847
private Class<?> dataModel;
4948
private Logger logger = new ConsoleLogger(getClass());
5049
private String target = "";

core/main/java/com/codingchili/core/protocol/RoleMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class RoleMap {
1515
public static final String USER = "user";
1616
public static final String PUBLIC = "public";
1717
public static final String UNSET = "unset";
18-
private static Map<String, RoleType> roleMap = new HashMap<>();
18+
private static final Map<String, RoleType> roleMap = new HashMap<>();
1919

2020
static {
2121
put(ADMIN, Role.ADMIN);

core/main/java/com/codingchili/core/storage/ElasticMap.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.stream.Stream;
3131
import java.util.stream.StreamSupport;
3232

33+
import com.codingchili.core.context.ShutdownListener;
3334
import com.codingchili.core.context.StorageContext;
3435
import com.codingchili.core.protocol.Serializer;
3536
import com.codingchili.core.security.Validator;
@@ -54,7 +55,6 @@ public class ElasticMap<Value extends Storable> implements AsyncStorage<Value> {
5455
public ElasticMap(Promise<AsyncStorage<Value>> promise, StorageContext<Value> context) {
5556
this.context = context;
5657
this.index = constructIndexName(context);
57-
5858
try {
5959
client = new RestHighLevelClient(
6060
RestClient.builder(
@@ -64,7 +64,13 @@ public ElasticMap(Promise<AsyncStorage<Value>> promise, StorageContext<Value> co
6464
if (done.succeeded()) {
6565
promise.complete(ElasticMap.this);
6666
} else {
67-
promise.fail(done.cause());
67+
try {
68+
this.client.close();
69+
} catch (Throwable ignored) {
70+
71+
} finally {
72+
promise.fail(done.cause());
73+
}
6874
}
6975
});
7076
} catch (Throwable e) {

0 commit comments

Comments
 (0)