Merge remote-tracking branch 'origin/CX_R24.05_batch_multi_version_su…

…pport' into CX_R24.05_part_as_planned_multi_version_support
eclipse-tractusx · Apr 30, 2024 · e1f5aec · e1f5aec
2 parents 0d3dd63 + f2a4af9
commit e1f5aec
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/...de-submodules/batch/src/main/java/org/eclipse/tractusx/sde/submodels/batch/BatchV300.java b/...de-submodules/batch/src/main/java/org/eclipse/tractusx/sde/submodels/batch/BatchV300.java
@@ -37,7 +37,7 @@ public void init() {
 
 		String resource = "batch-v3.0.0.json";
 		// this is the path within the jar file
-		InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		InputStream input = BatchV300.class.getResourceAsStream("/resources/" + resource);
 		if (input == null) {
 			// this is how we load file within editor (eg eclipse)
 			input = this.getClass().getClassLoader().getResourceAsStream(resource);

diff --git a/...rmation/src/main/java/org/eclipse/tractusx/sde/submodels/pti/PartTypeInformationV100.java b/...rmation/src/main/java/org/eclipse/tractusx/sde/submodels/pti/PartTypeInformationV100.java
@@ -38,7 +38,7 @@ public void init() {
 
 		String resource = "part-type-information-v1.0.0.json";
 		// this is the path within the jar file
-		InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		InputStream input = PartTypeInformationV100.class.getResourceAsStream("/resources/" + resource);
 		if (input == null) {
 			// this is how we load file within editor (eg eclipse)
 			input = this.getClass().getClassLoader().getResourceAsStream(resource);

diff --git a/...dules/serial-part/src/main/java/org/eclipse/tractusx/sde/submodels/sp/SerialPartV300.java b/...dules/serial-part/src/main/java/org/eclipse/tractusx/sde/submodels/sp/SerialPartV300.java
@@ -38,7 +38,7 @@ public void init() {
 
 		String resource = "serial-part-v3.0.0.json";
 		// this is the path within the jar file
-		InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		InputStream input = SerialPartV300.class.getResourceAsStream("/resources/" + resource);
 		if (input == null) {
 			// this is how we load file within editor (eg eclipse)
 			input = this.getClass().getClassLoader().getResourceAsStream(resource);

diff --git a/...ilt/src/main/java/org/eclipse/tractusx/sde/submodels/slbab/SingleLevelBomAsBuiltV100.java b/...ilt/src/main/java/org/eclipse/tractusx/sde/submodels/slbab/SingleLevelBomAsBuiltV100.java
@@ -38,7 +38,8 @@ public void init() {
 
 		String resource = "single-level-bom-as-built-v1.0.0.json";
 		// this is the path within the jar file
-		InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		//InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		InputStream input = SingleLevelBomAsBuiltV100.class.getResourceAsStream("/resources/" + resource);
 		if (input == null) {
 			// this is how we load file within editor (eg eclipse)
 			input = this.getClass().getClassLoader().getResourceAsStream(resource);

diff --git a/...ilt/src/main/java/org/eclipse/tractusx/sde/submodels/slbab/SingleLevelBomAsBuiltV300.java b/...ilt/src/main/java/org/eclipse/tractusx/sde/submodels/slbab/SingleLevelBomAsBuiltV300.java
@@ -37,7 +37,7 @@ public void init() {
 
 		String resource = "single-level-bom-as-built-v3.0.0.json";
 		// this is the path within the jar file
-		InputStream input = this.getClass().getResourceAsStream("/resources/" + resource);
+		InputStream input = SingleLevelBomAsBuiltV300.class.getResourceAsStream("/resources/" + resource);
 		if (input == null) {
 			// this is how we load file within editor (eg eclipse)
 			input = this.getClass().getClassLoader().getResourceAsStream(resource);