Skip to content

Commit 52e3ab5

Browse files
committed
Changes return type for createSubmodelElement
1 parent 7a0b4d2 commit 52e3ab5

File tree

15 files changed

+58
-48
lines changed

15 files changed

+58
-48
lines changed

basyx.submodelrepository/basyx.submodelrepository-backend/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/backend/CrudSubmodelRepository.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,23 @@ public void setSubmodelElementValue(String submodelId, String smeIdShort, Submod
197197
}
198198

199199
@Override
200-
public void createSubmodelElement(String submodelId, SubmodelElement smElement) {
200+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement) {
201201
SubmodelService submodelService = getSubmodelServiceOrThrow(submodelId);
202202

203203
submodelService.createSubmodelElement(smElement);
204204

205205
updateSubmodel(submodelId, submodelService.getSubmodel());
206+
return smElement;
206207
}
207208

208209
@Override
209-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
210+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
210211
SubmodelService submodelService = getSubmodelServiceOrThrow(submodelId);
211212

212213
submodelService.createSubmodelElement(idShortPath, smElement);
213214

214215
updateSubmodel(submodelId, submodelService.getSubmodel());
216+
return smElement;
215217
}
216218

217219
@Override

basyx.submodelrepository/basyx.submodelrepository-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/client/ConnectedSubmodelRepository.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ public void setSubmodelElementValue(String submodelId, String smeIdShort, Submod
196196
}
197197

198198
@Override
199-
public void createSubmodelElement(String submodelId, SubmodelElement smElement) {
200-
getConnectedSubmodelService(submodelId).createSubmodelElement(smElement);
199+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement) {
200+
return getConnectedSubmodelService(submodelId).createSubmodelElement(smElement);
201201
}
202202

203203
@Override
204-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
205-
getConnectedSubmodelService(submodelId).createSubmodelElement(idShortPath, smElement);
204+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
205+
return getConnectedSubmodelService(submodelId).createSubmodelElement(idShortPath, smElement);
206206
}
207207

208208
@Override

basyx.submodelrepository/basyx.submodelrepository-core/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/SubmodelRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public interface SubmodelRepository {
164164
* @param smElement
165165
* the SubmodelElement
166166
*/
167-
public void createSubmodelElement(String submodelId, SubmodelElement smElement);
167+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement);
168168

169169
/**
170170
* Creates a nested SubmodelElement
@@ -176,7 +176,7 @@ public interface SubmodelRepository {
176176
* @param smElement
177177
* the SubmodelElement
178178
*/
179-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException;
179+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException;
180180

181181
/**
182182
* Deletes a SubmodelElement

basyx.submodelrepository/basyx.submodelrepository-core/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/core/SubmodelRepositorySubmodelServiceWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ public void setSubmodelElementValue(String idShortPath, SubmodelElementValue val
8686
}
8787

8888
@Override
89-
public void createSubmodelElement(SubmodelElement submodelElement) {
90-
repoApi.createSubmodelElement(submodelId, submodelElement);
89+
public SubmodelElement createSubmodelElement(SubmodelElement submodelElement) {
90+
return repoApi.createSubmodelElement(submodelId, submodelElement);
9191
}
9292

9393
@Override
94-
public void createSubmodelElement(String idShortPath, SubmodelElement submodelElement)
94+
public SubmodelElement createSubmodelElement(String idShortPath, SubmodelElement submodelElement)
9595
throws ElementDoesNotExistException {
96-
repoApi.createSubmodelElement(submodelId, idShortPath, submodelElement);
96+
return repoApi.createSubmodelElement(submodelId, idShortPath, submodelElement);
9797

9898
}
9999

basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/AuthorizedSubmodelRepository.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,21 @@ public void setSubmodelElementValue(String submodelId, String smeIdShortPath, Su
155155
}
156156

157157
@Override
158-
public void createSubmodelElement(String submodelId, SubmodelElement smElement) {
158+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement) {
159159
boolean isAuthorized = permissionResolver.hasPermission(Action.UPDATE, new SubmodelTargetInformation(getIdAsList(submodelId), getIdAsList(ALL_ALLOWED_WILDCARD)));
160160

161161
throwExceptionIfInsufficientPermission(isAuthorized);
162162

163-
decorated.createSubmodelElement(submodelId, smElement);
163+
return decorated.createSubmodelElement(submodelId, smElement);
164164
}
165165

166166
@Override
167-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
167+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
168168
boolean isAuthorized = permissionResolver.hasPermission(Action.UPDATE, new SubmodelTargetInformation(getIdAsList(submodelId), getIdAsList(idShortPath)));
169169

170170
throwExceptionIfInsufficientPermission(isAuthorized);
171171

172-
decorated.createSubmodelElement(submodelId, idShortPath, smElement);
172+
return decorated.createSubmodelElement(submodelId, idShortPath, smElement);
173173
}
174174

175175
@Override

basyx.submodelrepository/basyx.submodelrepository-feature-mqtt/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/mqtt/MqttSubmodelRepository.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,19 @@ public void setSubmodelElementValue(String submodelId, String idShortPath, Submo
9999
}
100100

101101
@Override
102-
public void createSubmodelElement(String submodelId, SubmodelElement smElement) {
102+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement) {
103103
decorated.createSubmodelElement(submodelId, smElement);
104104
SubmodelElement submodelElement = decorated.getSubmodelElement(submodelId, smElement.getIdShort());
105105
submodelElementCreated(submodelElement, getName(), submodelId, smElement.getIdShort());
106+
return submodelElement;
106107
}
107108

108109
@Override
109-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
110+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
110111
decorated.createSubmodelElement(submodelId, idShortPath, smElement);
111112
SubmodelElement submodelElement = decorated.getSubmodelElement(submodelId, idShortPath);
112113
submodelElementCreated(submodelElement, getName(), submodelId, idShortPath);
114+
return submodelElement;
113115
}
114116

115117
@Override

basyx.submodelrepository/basyx.submodelrepository-feature-operation-delegation/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/operation/delegation/OperationDelegationSubmodelRepository.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ public void setSubmodelElementValue(String submodelId, String smeIdShort, Submod
117117
}
118118

119119
@Override
120-
public void createSubmodelElement(String submodelId, SubmodelElement smElement) {
121-
decorated.createSubmodelElement(submodelId, smElement);
120+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement smElement) {
121+
return decorated.createSubmodelElement(submodelId, smElement);
122122
}
123123

124124
@Override
125-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
126-
decorated.createSubmodelElement(submodelId, idShortPath, smElement);
125+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement smElement) throws ElementDoesNotExistException {
126+
return decorated.createSubmodelElement(submodelId, idShortPath, smElement);
127127
}
128128

129129
@Override

basyx.submodelrepository/basyx.submodelrepository-feature-registry-integration/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/registry/integration/RegistryIntegrationSubmodelRepository.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ public void setSubmodelElementValue(String submodelId, String idShortPath, Submo
134134
}
135135

136136
@Override
137-
public void createSubmodelElement(String submodelId, SubmodelElement submodelElement) {
138-
decorated.createSubmodelElement(submodelId, submodelElement);
137+
public SubmodelElement createSubmodelElement(String submodelId, SubmodelElement submodelElement) {
138+
return decorated.createSubmodelElement(submodelId, submodelElement);
139139
}
140140

141141
@Override
142-
public void createSubmodelElement(String submodelId, String idShortPath, SubmodelElement submodelElement) throws ElementDoesNotExistException {
143-
decorated.createSubmodelElement(submodelId, idShortPath, submodelElement);
142+
public SubmodelElement createSubmodelElement(String submodelId, String idShortPath, SubmodelElement submodelElement) throws ElementDoesNotExistException {
143+
return decorated.createSubmodelElement(submodelId, idShortPath, submodelElement);
144144
}
145145

146146
@Override

basyx.submodelrepository/basyx.submodelrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositoryApiHTTPController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ public ResponseEntity<SubmodelElement> getSubmodelElementByPathSubmodelRepo(Base
175175

176176
@Override
177177
public ResponseEntity<SubmodelElement> postSubmodelElementByPathSubmodelRepo(Base64UrlEncodedIdentifier submodelIdentifier, String idShortPath, @Valid SubmodelElement body, @Valid String level, @Valid String extent) {
178-
repository.createSubmodelElement(submodelIdentifier.getIdentifier(), idShortPath, body);
179-
return new ResponseEntity<SubmodelElement>(HttpStatus.CREATED);
178+
SubmodelElement createdSME = repository.createSubmodelElement(submodelIdentifier.getIdentifier(), idShortPath, body);
179+
return new ResponseEntity<SubmodelElement>(createdSME, HttpStatus.CREATED);
180180
}
181181

182182
@Override
183183
public ResponseEntity<SubmodelElement> postSubmodelElementSubmodelRepo(Base64UrlEncodedIdentifier submodelIdentifier, @Valid SubmodelElement body) {
184-
repository.createSubmodelElement(submodelIdentifier.getIdentifier(), body);
185-
return new ResponseEntity<SubmodelElement>(body, HttpStatus.CREATED);
184+
SubmodelElement createdSME = repository.createSubmodelElement(submodelIdentifier.getIdentifier(), body);
185+
return new ResponseEntity<SubmodelElement>(createdSME, HttpStatus.CREATED);
186186
}
187187

188188
@Override

basyx.submodelservice/basyx.submodelservice-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/InMemorySubmodelService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,13 @@ public void setSubmodelElementValue(String idShort, SubmodelElementValue value)
123123
}
124124

125125
@Override
126-
public void createSubmodelElement(SubmodelElement submodelElement) throws CollidingIdentifierException {
126+
public SubmodelElement createSubmodelElement(SubmodelElement submodelElement) throws CollidingIdentifierException {
127127
throwIfSubmodelElementExists(submodelElement.getIdShort());
128128

129129
List<SubmodelElement> smElements = submodel.getSubmodelElements();
130130
smElements.add(submodelElement);
131131
submodel.setSubmodelElements(smElements);
132+
return submodelElement;
132133
}
133134

134135
private void throwIfSubmodelElementExists(String submodelElementId) {
@@ -141,7 +142,7 @@ private void throwIfSubmodelElementExists(String submodelElementId) {
141142
}
142143

143144
@Override
144-
public void createSubmodelElement(String idShortPath, SubmodelElement submodelElement) throws ElementDoesNotExistException, CollidingIdentifierException {
145+
public SubmodelElement createSubmodelElement(String idShortPath, SubmodelElement submodelElement) throws ElementDoesNotExistException, CollidingIdentifierException {
145146
throwIfSubmodelElementExists(getFullIdShortPath(idShortPath, submodelElement.getIdShort()));
146147

147148
SubmodelElement parentSme = parser.getSubmodelElementFromIdShortPath(idShortPath);
@@ -150,15 +151,14 @@ public void createSubmodelElement(String idShortPath, SubmodelElement submodelEl
150151
List<SubmodelElement> submodelElements = list.getValue();
151152
submodelElements.add(submodelElement);
152153
list.setValue(submodelElements);
153-
return;
154154
}
155155
if (parentSme instanceof SubmodelElementCollection) {
156156
SubmodelElementCollection collection = (SubmodelElementCollection) parentSme;
157157
List<SubmodelElement> submodelElements = collection.getValue();
158158
submodelElements.add(submodelElement);
159159
collection.setValue(submodelElements);
160-
return;
161160
}
161+
return submodelElement;
162162
}
163163

164164
@Override

0 commit comments

Comments
 (0)