Skip to content

Commit 79155fe

Browse files
michelu89michelu89
committed
Remove URI parameters from model APIs
Stop passing a URI for aspect model loading across services and controllers. The AspectModelLoader.load calls now use Optional.empty() instead of a URI, and service method signatures were updated to remove URI parameters. Controllers no longer expect a 'uri' header or throw UriNotDefinedException; corresponding imports removed and request handlers simplified. Tests were updated to call the new signatures and to remove URI construction. Minor import adjustments (Optional) were added where needed.
1 parent f1a7627 commit 79155fe

File tree

6 files changed

+85
-134
lines changed

6 files changed

+85
-134
lines changed

‎aspect-model-editor-service/src/main/java/org/eclipse/esmf/ame/services/GenerateService.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
import java.io.ByteArrayOutputStream;
1717
import java.io.IOException;
1818
import java.io.InputStream;
19-
import java.net.URI;
2019
import java.nio.charset.StandardCharsets;
2120
import java.nio.file.Path;
2221
import java.util.HashMap;
2322
import java.util.List;
2423
import java.util.Locale;
2524
import java.util.Map;
25+
import java.util.Optional;
2626

2727
import org.eclipse.esmf.ame.exceptions.FileHandlingException;
2828
import org.eclipse.esmf.ame.exceptions.GenerationException;
@@ -71,9 +71,9 @@ public GenerateService( final AspectModelLoader aspectModelLoader ) {
7171
this.aspectModelLoader = aspectModelLoader;
7272
}
7373

74-
public byte[] generateHtmlDocument( final CompletedFileUpload aspectModelFile, final URI uri, final String language ) {
74+
public byte[] generateHtmlDocument( final CompletedFileUpload aspectModelFile, final String language ) {
7575
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
76-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
76+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
7777

7878
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
7979

@@ -85,9 +85,9 @@ public byte[] generateHtmlDocument( final CompletedFileUpload aspectModelFile, f
8585
return byteArrayOutputStream.toByteArray();
8686
}
8787

88-
public String jsonSchema( final CompletedFileUpload aspectModelFile, final URI uri, final String language ) {
88+
public String jsonSchema( final CompletedFileUpload aspectModelFile, final String language ) {
8989
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
90-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
90+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
9191

9292
final JsonSchemaGenerationConfig config = JsonSchemaGenerationConfigBuilder.builder().locale(
9393
Locale.forLanguageTag( language ) ).build();
@@ -97,49 +97,49 @@ public String jsonSchema( final CompletedFileUpload aspectModelFile, final URI u
9797
return generator.generateJson();
9898
}
9999

100-
public String sampleJSONPayload( final CompletedFileUpload aspectModelFile, final URI uri ) {
100+
public String sampleJSONPayload( final CompletedFileUpload aspectModelFile ) {
101101
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
102-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
102+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
103103

104104
final AspectModelJsonPayloadGenerator generator = new AspectModelJsonPayloadGenerator( aspectModel.aspect() );
105105

106106
return generator.generateJson();
107107
}
108108

109-
public String generateAASXFile( final CompletedFileUpload aspectModelFile, final URI uri ) {
109+
public String generateAASXFile( final CompletedFileUpload aspectModelFile ) {
110110
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
111-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
111+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
112112

113113
final AspectModelAasGenerator generator = new AspectModelAasGenerator( aspectModel.aspect(),
114114
AasGenerationConfigBuilder.builder().format( AasFileFormat.AASX ).build() );
115115

116116
return new String( generator.getContent() );
117117
}
118118

119-
public String generateAasXmlFile( final CompletedFileUpload aspectModelFile, final URI uri ) {
119+
public String generateAasXmlFile( final CompletedFileUpload aspectModelFile ) {
120120
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
121-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
121+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
122122

123123
final AspectModelAasGenerator generator = new AspectModelAasGenerator( aspectModel.aspect(),
124124
AasGenerationConfigBuilder.builder().format( AasFileFormat.XML ).build() );
125125

126126
return new String( generator.getContent() );
127127
}
128128

129-
public String generateAasJsonFile( final CompletedFileUpload aspectModelFile, final URI uri ) {
129+
public String generateAasJsonFile( final CompletedFileUpload aspectModelFile ) {
130130
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
131-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
131+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
132132

133133
final AspectModelAasGenerator generator = new AspectModelAasGenerator( aspectModel.aspect(),
134134
AasGenerationConfigBuilder.builder().format( AasFileFormat.JSON ).build() );
135135

136136
return new String( generator.getContent() );
137137
}
138138

139-
public String generateYamlOpenApiSpec( final CompletedFileUpload aspectModelFile, final URI uri,
139+
public String generateYamlOpenApiSpec( final CompletedFileUpload aspectModelFile,
140140
final OpenApiSchemaGenerationConfig config ) {
141141
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
142-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
142+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
143143

144144
final String ymlOutput = new AspectModelOpenApiGenerator( aspectModel.aspect(), config ).generateYaml();
145145

@@ -150,11 +150,11 @@ public String generateYamlOpenApiSpec( final CompletedFileUpload aspectModelFile
150150
return ymlOutput;
151151
}
152152

153-
public String generateJsonOpenApiSpec( final CompletedFileUpload aspectModelFile, final URI uri,
153+
public String generateJsonOpenApiSpec( final CompletedFileUpload aspectModelFile,
154154
final OpenApiSchemaGenerationConfig config ) {
155155
try {
156156
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
157-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
157+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
158158

159159
final JsonNode json = new AspectModelOpenApiGenerator( aspectModel.aspect(), config ).getContent();
160160

@@ -176,11 +176,11 @@ public String generateJsonOpenApiSpec( final CompletedFileUpload aspectModelFile
176176
}
177177
}
178178

179-
public byte[] generateAsyncApiSpec( final CompletedFileUpload aspectModelFile, final URI uri, final String language, final String output,
179+
public byte[] generateAsyncApiSpec( final CompletedFileUpload aspectModelFile, final String language, final String output,
180180
final String applicationId, final String channelAddress, final boolean useSemanticVersion,
181181
final boolean writeSeparateFiles ) {
182182
final InputStream inputStream = ModelUtils.openInputStreamFromUpload( aspectModelFile );
183-
final AspectModel aspectModel = aspectModelLoader.load( inputStream, uri );
183+
final AspectModel aspectModel = aspectModelLoader.load( inputStream, Optional.empty() );
184184

185185
final AsyncApiSchemaGenerationConfig config = buildAsyncApiSchemaGenerationConfig( applicationId, channelAddress,
186186
useSemanticVersion, language );

‎aspect-model-editor-service/src/main/java/org/eclipse/esmf/ame/services/ModelService.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.ArrayList;
2222
import java.util.List;
2323
import java.util.Map;
24+
import java.util.Optional;
2425
import java.util.function.Supplier;
2526

2627
import org.eclipse.esmf.ame.exceptions.CreateFileException;
@@ -165,25 +166,25 @@ public void deleteModel( final AspectModelUrn aspectModelUrn ) {
165166
ModelUtils.deleteEmptyFiles( aspectModelFile );
166167
}
167168

168-
public ViolationReport validateModel( final URI uri, final CompletedFileUpload aspectModelFile ) {
169+
public ViolationReport validateModel( final CompletedFileUpload aspectModelFile ) {
169170
final Supplier<AspectModel> aspectModelSupplier = () -> aspectModelLoader.load(
170-
ModelUtils.openInputStreamFromUpload( aspectModelFile ), uri );
171+
ModelUtils.openInputStreamFromUpload( aspectModelFile ), Optional.empty() );
171172
final List<Violation> violations = aspectModelValidator.validateModel( aspectModelSupplier );
172173
final List<ViolationError> violationErrors = ValidationUtils.violationErrors( violations );
173174
return new ViolationReport( violationErrors );
174175
}
175176

176-
public String migrateModel( final URI uri, final CompletedFileUpload aspectModelFile ) {
177-
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), uri );
177+
public String migrateModel( final CompletedFileUpload aspectModelFile ) {
178+
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), Optional.empty() );
178179

179180
return aspectModel.files().stream()
180181
.filter( a -> a.sourceLocation().map( source -> source.getScheme().equals( "blob" ) ).orElse( false ) ).findFirst()
181182
.map( AspectSerializer.INSTANCE::aspectModelFileToString )
182183
.orElseThrow( () -> new InvalidAspectModelException( "No aspect model found to migrate" ) );
183184
}
184185

185-
public String getFormattedModel( final URI uri, final CompletedFileUpload aspectModelFile ) {
186-
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), uri );
186+
public String getFormattedModel( final CompletedFileUpload aspectModelFile ) {
187+
final AspectModel aspectModel = aspectModelLoader.load( ModelUtils.openInputStreamFromUpload( aspectModelFile ), Optional.empty() );
187188

188189
return aspectModel.files().stream()
189190
.filter( a -> a.sourceLocation().map( source -> source.getScheme().equals( "blob" ) ).orElse( false ) ).findFirst()

0 commit comments

Comments
 (0)