Skip to content

Commit 191eb07

Browse files
committed
Return Instance when she created
1 parent 6e17aa0 commit 191eb07

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

api/src/main/java/fr/epsilon/api/instance/EInstanceModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ public abstract class EInstanceModule {
3838
* Open instance with template name
3939
*
4040
* @param template Template name
41-
* @return Instance opened correctly or not
41+
* @return Instance or null if not opened
4242
*/
43-
public abstract boolean openInstance(String template);
43+
public abstract EInstance openInstance(String template);
4444

4545
/**
4646
* Open instance with template name
4747
*
4848
* @param template Template name
4949
* @param content Content field of instance
50-
* @return Instance opened correctly or not
50+
* @return Instance or null if not opened
5151
*/
52-
public abstract <T> boolean openInstance(String template, T content);
52+
public abstract <T> EInstance openInstance(String template, T content);
5353

5454
/**
5555
* Close instance

common/src/main/java/fr/epsilon/common/instance/InstanceModule.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package fr.epsilon.common.instance;
22

33
import com.google.gson.Gson;
4+
import fr.epsilon.api.instance.EInstance;
45
import fr.epsilon.api.instance.EInstanceModule;
56
import fr.epsilon.api.instance.EType;
67
import fr.epsilon.common.utils.EpsilonEnvironments;
@@ -92,12 +93,12 @@ public CompletableFuture<? extends Instance[]> getInstances(EType type) {
9293
}
9394

9495
@Override
95-
public boolean openInstance(String template) {
96+
public EInstance openInstance(String template) {
9697
return openInstance(template, new Object());
9798
}
9899

99100
@Override
100-
public <T> boolean openInstance(String template, T content) {
101+
public <T> EInstance openInstance(String template, T content) {
101102
MediaType media = MediaType.parse("application/json; charset=utf-8");
102103
RequestBody body = RequestBody.create(gson.toJson(content), media);
103104

@@ -110,14 +111,19 @@ public <T> boolean openInstance(String template, T content) {
110111
Response response = okHttp.newCall(request).execute();
111112
boolean successful = response.isSuccessful();
112113

114+
ResponseBody bodyResponse = response.body();
115+
116+
assert bodyResponse != null;
117+
Instance instance = gson.fromJson(bodyResponse.string(), Instance.class);
118+
113119
response.close();
114120

115-
return successful;
121+
return instance;
116122
} catch (IOException e) {
117123
e.printStackTrace();
118124
}
119125

120-
return false;
126+
return null;
121127
}
122128

123129
@Override

0 commit comments

Comments
 (0)