Commit 53bbc1b
authored
Fix/findings on rc (#91)
* Remove validatePackage endpoint and service method
Deleted the validatePackage method from PackageService and its corresponding endpoint from PackageController. This streamlines the API by removing unused or deprecated validation functionality for uploaded ZIP files.
* Update ESMF SDK version and refactor imports
Bump esmf-sdk-version to 2.11.1 in pom.xml. Refactor imports in ModelUtils, ViolationFormatter, and ValidationUtils to use new locations for ProcessingViolation and InvalidSyntaxViolation, and update method signature in ModelUtils to use AspectModelFile.
* Refactor model file handling and validation logic
Replaces usage of StructuredModelsRoot with AspectModelLoader for file deletion. Updates validation and formatting methods to filter aspect model files by 'inmemory' source scheme instead of checking for empty source location.
* Refactor services to use CompletedFileUpload for model input
Service methods now accept CompletedFileUpload and URI instead of raw Turtle strings for aspect model input, improving file handling and consistency. Added MockFileUpload for testing, updated tests and utility methods, and enhanced model grouping logic to support filtering by aspect models.
* Remove FileWriteException and related references
Deleted the FileWriteException class and removed its usage from GlobalExceptionHandler. Also cleaned up unused code in ApplicationSettings, ModelService, ModelUtils, and refactored MockFileUpload to use a record for simplicity.
* Refactor model version handling and update URI scheme
Replaces 'inmemory' URI scheme with 'blob' throughout service and tests. Adds version field to Model, updates grouping logic to extract and assign meta model version, and refines version processing in ModelService to skip non-latest versions and improve file creation logic.
* Refactor aspect model versioning and file handling
Simplifies the process of saving aspect model files by removing the saveAspectModelFiles method and updating logic to use AspectSerializer directly. The applyNamespaceVersionChange method now accepts an errors list and throws a FileHandlingException for missing filenames, improving error reporting and exception handling.
* Refactor model file creation and validation logic
Introduces improved file creation methods in ModelUtils, adds duplicate element checks, and refactors ModelService to use new validation and file creation utilities. Exception handling and violation checks are now more robust and modular.
* Increase logging for native image build in CI
Adds SLF4J simple logger properties to Maven commands in the native image build steps for Mac, Linux, and Windows in the pull request workflow. This change sets the default log level to info and enables info-level logging for org.apache.jena, improving build output visibility.
* Move SLF4J log level config from workflow to pom.xml
Removes SLF4J log level and Apache Jena logger configuration from GitHub Actions workflow and sets them as system properties in the Maven Surefire plugin configuration in the respective pom.xml files. This centralizes logging configuration within the project build files for consistency across environments.
* Move Jena log level config from pom.xml to logback.xml
Removed SLF4J simple logger system properties for org.apache.jena from the Maven plugin configurations in both runtime and service modules. Added explicit logger configuration for org.apache.jena at INFO level in logback.xml to centralize logging configuration.
* Set root logger level to INFO and update logback config
Added logger.levels.root=INFO to all application properties files to explicitly set the root logging level. Removed redundant org.apache.jena logger entry from logback.xml to streamline logging configuration.
* Remove verbose options from native image build config
Eliminated the <verbose> and --verbose options from the native image build configuration in pom.xml to reduce build output verbosity.
* Remove unused GraalVM native-image arguments
Deleted the -H:+ReportExceptionStackTraces and -H:+PrintClassInitialization arguments from the native-image configuration in pom.xml as they are no longer needed.
* Add test logging configuration files
Introduce application-test.properties and logback.xml for configuring logging during tests in aspect-model-editor-service. Sets root logger level to ERROR and defines logback appenders and logger levels for Micronaut components.
* Refactor workspace migration to accept storage path
Updated ModelService and related calls to require an explicit metaModelStoragePath parameter for workspace migration, removing reliance on ApplicationSettings within the service. Adjusted tests, controller, and properties to support this change and improved configuration clarity.
* Normalize file paths for URI creation in tests
Introduced a toUriPath helper method to ensure file paths are converted to URI-compatible format, especially handling Windows path separators. Updated all test usages to apply this normalization when constructing URIs from file paths.
* Fix file path handling for URIs in tests
Introduced a toUriPath helper to ensure file paths are correctly formatted as URI paths, especially on Windows. Updated validateModel and migrateModel test calls to use this helper for consistent cross-platform behavior.
* Switch API requests to multipart form with file upload
Updated multiple Bruno API request definitions to use multipart form data and file upload for aspect models, replacing previous usage of plain text bodies. Added references to new test files in the TestingFiles directory to support file-based testing.
* Update ModelService.java1 parent bd963aa commit 53bbc1b
File tree
58 files changed
+3498
-2923
lines changed- aspect-model-editor-core/src/main/java/org/eclipse/esmf/ame
- config
- exceptions
- aspect-model-editor-runtime
- bruno
- TestingFiles
- src/main/resources
- aspect-model-editor-service/src
- main/java/org/eclipse/esmf/ame/services
- models
- utils
- test
- java/org/eclipse/esmf/ame
- model
- services
- resources
- aspect-model-editor-validation/src/main/java/org/eclipse/esmf/ame/validation
- services
- utils
- aspect-model-editor-web-core/src/main/java/org/eclipse/esmf/ame/exceptions
- aspect-model-editor-web/src/main/java/org/eclipse/esmf/ame/api
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
58 files changed
+3498
-2923
lines changedLines changed: 0 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | 47 | | |
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
22 | 31 | | |
23 | 32 | | |
24 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | 26 | | |
28 | | - | |
29 | | - | |
| 27 | + | |
| 28 | + | |
30 | 29 | | |
31 | 30 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
113 | 121 | | |
114 | 122 | | |
115 | 123 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
0 commit comments