FileSubmodelElement Endpoints #93

M-Damm · 2023-09-25T13:08:12Z

No description provided.

Signed-off-by: Zai Müller-Zhang <[email protected]>

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Add Rest API for file upload Created unit test for file upload Signed-off-by: Zai Müller-Zhang <[email protected]>

Add json file for test Signed-off-by: Zai Müller-Zhang <[email protected]>

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Add json file for test Signed-off-by: Zai Müller-Zhang <[email protected]>

Signed-off-by: Zai Müller-Zhang <[email protected]> Co-authored-by: Danish, Mohammad Ghazanfar Ali<[email protected]>

…recondition failed" if the submodel element is not a file sme. In InMemorySubmodelRepository, delete unused exception. Refactor Http Test

# Conflicts: # basyx.submodelrepository/basyx.submodelrepository-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/InMemorySubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-backend-inmemory/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/TestInMemorySubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-backend-mongodb/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/MongoDBSubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-backend-mongodb/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/MongoDBSubmodelRepositoryFactory.java # basyx.submodelrepository/basyx.submodelrepository-backend-mongodb/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/TestMongoDBSubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-core/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/SubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-feature-mqtt/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/mqtt/MqttSubmodelRepository.java # basyx.submodelrepository/basyx.submodelrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositoryApiHTTPController.java # basyx.submodelrepository/basyx.submodelrepository-http/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java # basyx.submodelrepository/basyx.submodelrepository-http/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelElementsHTTP.java # basyx.submodelservice/basyx.submodelservice-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/InMemorySubmodelService.java # basyx.submodelservice/basyx.submodelservice-http/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/http/SubmodelServiceSubmodelElementsTestSuiteHTTP.java

…modelHTTPTestSuite Signed-off-by: Zai Müller-Zhang <[email protected]>

Signed-off-by: Zai Müller-Zhang <[email protected]>

…e default repository name Signed-off-by: Zai Müller-Zhang <[email protected]>

Signed-off-by: Zai Müller-Zhang <[email protected]>

FischerRene

Please check if you have used the BaSyx Formatter correctly and address the comments.
If you have any questions, feel free to ask.

FischerRene · 2023-09-29T12:47:10Z

.../main/java/org/eclipse/digitaltwin/basyx/core/exceptions/FeatureNotImplementedException.java

What is the benefit of having this class here, if there is not more information inside?

Also missing the copyright notice.

→ I suggest giving this a message at least.

FischerRene · 2023-09-29T12:47:46Z

basyx.submodelrepository/basyx.submodelrepository-backend-inmemory/pom.xml

@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">


Why has this been split into multiple lines?
→ Wrong formatter settings?

FischerRene · 2023-09-29T12:48:42Z

basyx.submodelrepository/basyx.submodelrepository-backend-inmemory/pom.xml

@@ -45,5 +46,13 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tika</groupId>


How might the use of Apache Tika (Apache License 2.0) affect us here?

we also use tika in java 1.

@FrankSchnicke Is this ok to use this dependency for handling file and directory?

FischerRene · 2023-09-29T12:49:13Z

basyx.submodelrepository/basyx.submodelrepository-backend-inmemory/pom.xml

+			<artifactId>tika-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>


Same question regarding also the licensing.

FischerRene · 2023-09-29T12:49:47Z

...c/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/InMemorySubmodelRepository.java

-				.ifPresent(id -> {
-					throw new CollidingIdentifierException(id);
-				});
+		submodelsToCheck.stream().map(submodel -> submodel.getId()).filter(id -> !ids.add(id)).findAny().ifPresent(id -> {


No change to the logic. Might be formatter issue in this file again.

The basyx formatter format these lines into one line. Should we revert this change back or should we insist on basyx format?

FischerRene · 2023-09-29T14:53:14Z

.../java/org/eclipse/digitaltwin/basyx/submodelrepository/MongoDBSubmodelRepositoryFactory.java

JavaDoc for public methods missing.

FischerRene · 2023-09-29T14:54:27Z

...test/java/org/eclipse/digitaltwin/basyx/submodelrepository/core/SubmodelRepositorySuite.java

+	}
+
+	@Test
+	public void deleteFile() throws IOException {


Why does this test throw an IOException?

the method getInputStreamOfFileFromClasspath("SampleJsonFile.json") in this test throws IOException

FischerRene · 2023-09-29T14:56:16Z

...test/java/org/eclipse/digitaltwin/basyx/submodelrepository/core/SubmodelRepositorySuite.java

Testcase for updating a file and checking if that has worked is missing.
→ It's part of the API with setFileValue, so I'd expect an "update" check as well, even if it (right now) has the logic of deleting+creating it again.

FischerRene · 2023-09-29T15:00:50Z

...lipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java

Do we want to add another test case for corrupt files?

What would happen if I try to upload a PDF as an image file for example?

the user takes responsibility for this.

FischerRene · 2023-09-29T15:02:44Z

...ory/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/InMemorySubmodelService.java

Why were these changes made?

Especially the return does not seem to make any difference to me.

Signed-off-by: Zai Müller-Zhang <[email protected]>

- Minor refactoring Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

mdanish98

Approved

M-Damm and others added 15 commits August 11, 2023 09:47

first parts to implement file upload feature

2ee815b

Add partial implementation of getFile for in-memory backend

e5a5f9f

Signed-off-by: Zai Müller-Zhang <[email protected]>

Implements File support for Submodelrepository MongoDB

cbad8ea

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Add In-Memory backend und unit Test.

5f5f222

Add Rest API for file upload Created unit test for file upload Signed-off-by: Zai Müller-Zhang <[email protected]>

Add new Exception for mqtt

371573f

Add json file for test Signed-off-by: Zai Müller-Zhang <[email protected]>

Fixes the File upload issue with HTTP

32d6eed

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Add new Exception for mqtt

ab9280c

Add json file for test Signed-off-by: Zai Müller-Zhang <[email protected]>

Add http unit test for get- set- delete files

d7992a8

Signed-off-by: Zai Müller-Zhang <[email protected]> Co-authored-by: Danish, Mohammad Ghazanfar Ali<[email protected]>

In SubmodelRepositoryApiHTTPController, Change Http status code to "p…

85ca439

…recondition failed" if the submodel element is not a file sme. In InMemorySubmodelRepository, delete unused exception. Refactor Http Test

move unit tests for file upload and download to SubmodelRepositorySub…

240fa1a

…modelHTTPTestSuite Signed-off-by: Zai Müller-Zhang <[email protected]>

Change expected value of the assertion for the setFileValue unit test.

c3aa7e1

Signed-off-by: Zai Müller-Zhang <[email protected]>

Adjust assertion in unit test getDefaultSubmodelRepositoryName()

d8dac1d

Signed-off-by: Zai Müller-Zhang <[email protected]>

Add new cosntructor in MongoDBSubmodelRepositoryFactory which uses th…

37e2e75

…e default repository name Signed-off-by: Zai Müller-Zhang <[email protected]>

Put the private mathod after the unit tests.

4cc720b

Signed-off-by: Zai Müller-Zhang <[email protected]>

FischerRene suggested changes Sep 29, 2023

View reviewed changes

zhangzai123 and others added 5 commits October 6, 2023 15:09

Delete unnecessary exception throw

073e938

Signed-off-by: Zai Müller-Zhang <[email protected]>

add @autowire=false to the constructor

008bffe

Signed-off-by: Zai Müller-Zhang <[email protected]>

Handles correct closing of input streams

1bf4134

- Minor refactoring Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

Merge remote-tracking branch 'upstream/main'

b6a21e2

Refactors code

fd010e0

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>

mdanish98 approved these changes Oct 9, 2023

View reviewed changes

FrankSchnicke merged commit 07fa3d7 into eclipse-basyx:main Oct 10, 2023
1 check passed

FrankSchnicke mentioned this pull request Oct 13, 2023

Attachment Endpoints -> Submodel Repository #109

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FileSubmodelElement Endpoints #93

FileSubmodelElement Endpoints #93

M-Damm commented Sep 25, 2023

FischerRene left a comment

FischerRene Sep 29, 2023

FischerRene Sep 29, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

zhangzai123 Oct 4, 2023

FischerRene Sep 29, 2023

mdanish98 left a comment

FileSubmodelElement Endpoints #93

FileSubmodelElement Endpoints #93

Conversation

M-Damm commented Sep 25, 2023

FischerRene left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mdanish98 left a comment

Choose a reason for hiding this comment