Skip to content
Snippets Groups Projects
Commit 6489d6ea authored by trantzas's avatar trantzas
Browse files

Merge branch 'develop' into 'main' 

Develop

Closes #1

See merge request !3
parents 4f160fab 496ef80e
Branches main
No related tags found
1 merge request!3Develop
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1578 additions and 70 deletions
README.md
+ 51
− 70
View file @ 6489d6ea
# Service Specification importing
```markdown
# Service Specification Uploader
## Overview
The Service Specification Uploader is a Java-based application designed to upload service and resource specifications to a specified server. It supports both physical and logical resource specifications and handles various relationships and attachments.
## Prerequisites
- Java 17
- Maven
- Docker (optional, for containerized deployment)
## Getting started
## Setup
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
## Add your files
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
```
cd existing_repo
git remote add origin https://labs.etsi.org/rep/osl/utilities/service-specification-importing.git
git branch -M main
git push -uf origin main
### Clone the Repository
```sh
git clone https://github.com/your-repo/service-specification-uploader.git
cd service-specification-uploader
```
## Integrate with your tools
- [ ] [Set up project integrations](https://labs.etsi.org/rep/osl/utilities/service-specification-importing/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
### Build the Project
```sh
mvn clean install
```
***
### Configuration
Ensure you have a `config.properties` file in the root directory with the necessary configurations.
# Editing this README
### Running the Application
```sh
java -jar target/servicespecificationuploader.jar --configfile config.properties --servicespecfolderpath /path/to/your/data-folder
```
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
## Docker Deployment
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
### Build Docker Image
```sh
docker build -t service-specification-uploader .
```
## Name
Choose a self-explaining name for your project.
### Run Docker Container
```sh
docker run -v /local/path/to/config.properties:/app/config.properties -v /local/path/to/your-data-folder:/app/data-folder service-specification-uploader /app/data-folder additional-value
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
docker run -v C:\openslice\servicespecificationuploader\src\main\resources\config.properties:/app/config.properties -v C:\openslice\servicespecificationuploader:/app/data-folder servicespecificationuploader "c:\openslice\servicespecificationfetcher\f51cb185-6663-49e8-b195-83deeae32eed
```
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Logging
The application uses SLF4J with Logback for logging. Logs are written to both the console and a file named `app.log`.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
### Logback Configuration
The `logback.xml` file is located in `src/main/resources` and can be customized as needed.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Methods
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
### `postPhysicalResourceSpec`
Uploads a physical resource specification.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
### `postLogicalResourceSpec`
Uploads a logical resource specification.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
### `replaceStrings`
Replaces strings in a JSON node based on a provided mapping.
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
1. Fork the repository.
2. Create a new branch (`git checkout -b feature-branch`).
3. Commit your changes (`git commit -am 'Add new feature'`).
4. Push to the branch (`git push origin feature-branch`).
5. Create a new Pull Request.
## License
For open source projects, say how it is licensed.
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
This project is licensed under the Apache Version 2.0 License.
```
\ No newline at end of file
pom.xml 0 → 100644
+ 100
− 0
View file @ 6489d6ea
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.etsi.osl.util</groupId>
<artifactId>servicespecificationuploader</artifactId>
<version>0.0.1-SNAPSHOT</version>
<!-- Specify the Java version you're using -->
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<!-- Jackson JSON Processor -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.3</version>
</dependency>
<!-- Google Gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<!-- Your custom library dependency -->
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model.tmf</artifactId>
<version>1.0.0</version>
</dependency>
<!-- SnakeYAML -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>
<!-- Commons cli -->
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.9.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Maven Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
<mainClass>org.etsi.osl.util.ServiceSpecificationUploader</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<transformers>
<!-- Ensures that the manifest specifies the main class -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.etsi.osl.util.ServiceSpecificationUploader</mainClass> <!-- Fully Qualified Name -->
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
src/main/java/org/etsi/osl/util/JsonStringReplacer.java 0 → 100644
+ 197
− 0
View file @ 6489d6ea
package org.etsi.osl.util;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.node.*;
import org.yaml.snakeyaml.Yaml;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.util.*;
public class JsonStringReplacer {
// Logger instance
private static final Logger logger = LoggerFactory.getLogger(JsonStringReplacer.class);
// Static variable to hold mappings
private static Map<String, String> mappings = new HashMap<>();
/**
* Sets the YAML file path and loads mappings.
* If the file is missing, it sets mappings to an empty map and continues.
*
* @param yamlFilePath The path to the YAML mappings file.
*/
public static void setYamlFilePath(String yamlFilePath) {
try {
mappings = loadYamlMappings(yamlFilePath);
} catch (FileNotFoundException e) {
// Mappings file is missing; proceed with empty mappings
logger.warn("Mappings file not found: {}. Proceeding without replacements.", yamlFilePath);
mappings = new HashMap<>(); // Ensure mappings is empty
} catch (IOException e) {
// Other I/O errors
logger.error("Error reading mappings file: {}. Proceeding without replacements.", e.getMessage());
mappings = new HashMap<>(); // Ensure mappings is empty
} catch (Exception e) {
// Handle any other exceptions
logger.error("Unexpected error: {}. Proceeding without replacements.", e.getMessage(), e);
mappings = new HashMap<>(); // Ensure mappings is empty
}
}
/**
* Replaces strings in a JSON content based on the loaded mappings.
* If mappings are empty, it returns the original JSON content.
*
* @param jsonContent The input JSON content as a string.
* @return The modified JSON content as a string.
* @throws IOException If an I/O error occurs during processing.
*/
public static String replaceJsonStrings(String jsonContent) throws IOException {
// If mappings are empty, return the original JSON content
if (mappings == null || mappings.isEmpty()) {
logger.info("Mappings are empty. Returning original JSON content.");
return jsonContent;
}
// Create an ObjectMapper for JSON parsing
ObjectMapper mapper = new ObjectMapper();
// Parse the JSON content into a JsonNode
JsonNode rootNode = mapper.readTree(jsonContent);
// Perform string replacements
replaceStrings(rootNode);
// Convert the modified JsonNode back into a JSON string
String result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(rootNode);
logger.debug("Replacements completed successfully.");
return result;
}
/**
* Loads mappings from a YAML file.
*
* @param yamlFilePath The file path to the YAML mappings file.
* @return A Map containing the mappings.
* @throws IOException If an error occurs while reading the YAML file.
*/
private static Map<String, String> loadYamlMappings(String yamlFilePath) throws IOException {
Yaml yaml = new Yaml();
Map<String, String> loadedMappings = new HashMap<>();
try (InputStream inputStream = new FileInputStream(yamlFilePath)) {
Map<String, Object> yamlMaps = yaml.load(inputStream);
if (yamlMaps == null || !yamlMaps.containsKey("mappings")) {
logger.warn("The YAML file does not contain a 'mappings' key. Proceeding without replacements.");
return loadedMappings; // Return empty mappings
}
Object mappingsObj = yamlMaps.get("mappings");
if (mappingsObj instanceof List) {
List<?> mappingsList = (List<?>) mappingsObj;
for (Object item : mappingsList) {
if (item instanceof Map) {
Map<?, ?> mapItem = (Map<?, ?>) item;
Object fromObj = mapItem.get("from");
Object toObj = mapItem.get("to");
if (fromObj instanceof String && toObj instanceof String) {
loadedMappings.put((String) fromObj, (String) toObj);
} else {
logger.warn("Invalid mapping entry: 'from' and 'to' must be strings. Skipping entry.");
}
} else {
logger.warn("Invalid mapping format. Each mapping entry must be a map with 'from' and 'to' keys. Skipping entry.");
}
}
} else if (mappingsObj instanceof Map) {
Map<?, ?> mappingsMap = (Map<?, ?>) mappingsObj;
for (Map.Entry<?, ?> entry : mappingsMap.entrySet()) {
if (entry.getKey() instanceof String && entry.getValue() instanceof String) {
loadedMappings.put((String) entry.getKey(), (String) entry.getValue());
} else {
logger.warn("Invalid mapping entry: keys and values must be strings. Skipping entry.");
}
}
} else {
logger.warn("Unrecognized 'mappings' format in YAML file. Proceeding without replacements.");
}
}
logger.info("Loaded {} mappings from YAML file.", loadedMappings.size());
return loadedMappings;
}
/**
* Recursively replaces strings in a JsonNode based on the loaded mappings.
*
* @param node The JsonNode to process.
*/
private static void replaceStrings(JsonNode node) {
if (node == null || mappings == null || mappings.isEmpty()) {
return;
}
if (node.isObject()) {
ObjectNode objNode = (ObjectNode) node;
Iterator<Map.Entry<String, JsonNode>> fields = objNode.fields();
while (fields.hasNext()) {
Map.Entry<String, JsonNode> entry = fields.next();
JsonNode childNode = entry.getValue();
if (childNode.isTextual()) {
String textValue = childNode.asText();
if (mappings.containsKey(textValue)) {
String replacement = mappings.get(textValue);
objNode.put(entry.getKey(), replacement);
logger.debug("Replaced text '{}' with '{}' in object field '{}'.", textValue, replacement, entry.getKey());
}
} else {
replaceStrings(childNode);
}
}
} else if (node.isArray()) {
ArrayNode arrayNode = (ArrayNode) node;
for (int i = 0; i < arrayNode.size(); i++) {
JsonNode element = arrayNode.get(i);
if (element.isTextual()) {
String textValue = element.asText();
if (mappings.containsKey(textValue)) {
String replacement = mappings.get(textValue);
arrayNode.set(i, new TextNode(replacement));
logger.debug("Replaced text '{}' with '{}' in array index {}.", textValue, replacement, i);
}
} else {
replaceStrings(element);
}
}
}
// Other node types are not modified
}
// Example usage in the main method
public static void main(String[] args) {
String jsonInput = "{ \"greeting\": \"string1\", \"farewell\": \"string2\", \"nested\": { \"message\": \"string3\" }, \"array\": [\"string1\", \"hello\", \"string2\"] }";
String yamlFilePath = "org/etsi/osl/util/mappings.yaml"; // Adjust the path as needed
// Set the YAML path from another class or context
JsonStringReplacer.setYamlFilePath(yamlFilePath);
try {
// Perform the replacement
String result = JsonStringReplacer.replaceJsonStrings(jsonInput);
// Output the modified JSON
System.out.println("Modified JSON:");
System.out.println(result);
} catch (IOException e) {
logger.error("An error occurred during JSON processing: {}", e.getMessage(), e);
}
}
}
src/main/java/org/etsi/osl/util/KeycloakAuthenticator.java 0 → 100644
+ 175
− 0
View file @ 6489d6ea
package org.etsi.osl.util;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.net.URI;
import java.net.URLEncoder;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class KeycloakAuthenticator {
private static final Logger logger = LoggerFactory.getLogger(KeycloakAuthenticator.class.getName());
private final Properties config;
private final HttpClient client;
private final ObjectMapper objectMapper;
private String currentToken;
private long tokenExpiryTime;
private long tokenRefreshBufferSeconds;
/**
* Constructs a KeycloakAuthenticator with the specified configuration file path.
*
* @param configFilePath The file path to the configuration properties file.
* @throws IOException If there is an error loading the configuration file.
*/
public KeycloakAuthenticator(Properties config) throws IOException {
this.config = config;
this.client = HttpClient.newHttpClient();
this.objectMapper = new ObjectMapper();
setTokenRefreshBufferSeconds();
}
/**
* Loads the configuration properties from the specified file path.
*
* @param configFilePath The file path to the configuration properties file.
* @return The token refresh buffer time in seconds.
* @throws IOException If the configuration file cannot be read.
*/
private void setTokenRefreshBufferSeconds() throws IOException {
// Load the token refresh buffer time, defaulting to 60 seconds if not specified
String bufferSecondsStr = this.config.getProperty("token.refresh.buffer.seconds", "60");
long bufferSeconds;
try {
bufferSeconds = Long.parseLong(bufferSecondsStr);
if (bufferSeconds < 0) {
throw new NumberFormatException("Buffer seconds cannot be negative.");
}
} catch (NumberFormatException ex) {
logger.warn("Invalid token.refresh.buffer.seconds value: " + bufferSecondsStr + ". Using default of 60 seconds.");
bufferSeconds = 60;
}
logger.info("Token refresh buffer set to " + bufferSeconds + " seconds.");
this.tokenRefreshBufferSeconds=bufferSeconds;
}
/**
* Retrieves a valid access token. If the current token is expired or not present,
* it authenticates with Keycloak to obtain a new one.
*
* @return A valid access token as a String.
* @throws IOException If an I/O error occurs during authentication.
* @throws InterruptedException If the HTTP request is interrupted.
*/
public synchronized String getToken() throws IOException, InterruptedException {
long currentEpochSeconds = Instant.now().getEpochSecond();
if (currentToken != null && currentEpochSeconds < (tokenExpiryTime - tokenRefreshBufferSeconds)) {
logger.info("Using cached token. Token expires at " + Instant.ofEpochSecond(tokenExpiryTime));
return currentToken;
} else {
logger.info("Cached token is missing or nearing expiration. Authenticating to obtain a new token.");
return authenticateAndGetToken();
}
}
/**
* Authenticates with Keycloak and retrieves a new access token.
*
* @return The new access token as a String.
* @throws IOException If the authentication request fails.
* @throws InterruptedException If the HTTP request is interrupted.
*/
private String authenticateAndGetToken() throws IOException, InterruptedException {
String keycloakUrl = config.getProperty("keycloak.url");
String clientId = config.getProperty("client.id");
String clientSecret = config.getProperty("client.secret");
String username = config.getProperty("username");
String password = config.getProperty("password");
// Validate required properties
if (keycloakUrl == null || clientId == null || username == null || password == null) {
String errorMsg = "Missing required configuration properties.";
logger.error(errorMsg);
throw new IOException(errorMsg);
}
// Build the form data with URL encoding
String form = buildFormData(clientId, clientSecret, username, password);
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(keycloakUrl))
.header("Content-Type", "application/x-www-form-urlencoded")
.POST(HttpRequest.BodyPublishers.ofString(form))
.build();
logger.info("Sending authentication request to Keycloak.");
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() == 200) {
JsonNode responseJson = objectMapper.readTree(response.body());
currentToken = responseJson.get("access_token").asText();
long expiresIn = responseJson.get("expires_in").asLong();
tokenExpiryTime = Instant.now().getEpochSecond() + expiresIn;
logger.info("Authentication successful. Token obtained. Token expires in " + expiresIn + " seconds.");
return currentToken;
} else {
String errorMsg = "Authentication failed: HTTP status " + response.statusCode() + ": " + response.body();
logger.error(errorMsg);
throw new IOException(errorMsg);
}
}
/**
* Builds the URL-encoded form data for the authentication request.
*
* @param clientId The client ID.
* @param clientSecret The client secret (optional).
* @param username The username.
* @param password The password.
* @return The URL-encoded form data as a String.
* @throws IOException If URL encoding fails.
*/
private String buildFormData(String clientId, String clientSecret, String username, String password) throws IOException {
StringBuilder form = new StringBuilder();
form.append("client_id=").append(urlEncode(clientId));
if (clientSecret != null && !clientSecret.isEmpty()) {
form.append("&client_secret=").append(urlEncode(clientSecret));
}
form.append("&username=").append(urlEncode(username));
form.append("&password=").append(urlEncode(password));
form.append("&grant_type=password");
return form.toString();
}
/**
* URL-encodes a string using UTF-8 encoding.
*
* @param value The string to encode.
* @return The URL-encoded string.
* @throws IOException If UTF-8 encoding is not supported.
*/
private String urlEncode(String value) throws IOException {
try {
return URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
} catch (Exception ex) {
logger.error("URL encoding failed for value: " + value, ex);
throw new IOException("URL encoding failed.", ex);
}
}
}
src/main/java/org/etsi/osl/util/ResourceSpecificationPayloadsMaker.java 0 → 100644
+ 60
− 0
View file @ 6489d6ea
package org.etsi.osl.util;
import org.etsi.osl.tmf.common.model.TimePeriod;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
import java.util.ArrayList;
public class ResourceSpecificationPayloadsMaker {
// Change ServiceSpecificationCreate to ResourceSpecificationCreate
public static ResourceSpecificationCreate createResourceSpecDataFromFile(ResourceSpecification resourceSpecFromFile) {
// Parse the JSON file into a ServSpecCr object
ResourceSpecificationCreate newResourceSpec = new ResourceSpecificationCreate();
newResourceSpec.setName(resourceSpecFromFile.getName());
newResourceSpec.setDescription(resourceSpecFromFile.getDescription());
//newServSpec.setAttachment(new ArrayList<>(resourceSpecFromFile.getAttachment()));
newResourceSpec.setIsBundle(resourceSpecFromFile.isIsBundle());
//newServSpec.setRelatedParty(new ArrayList<>(resourceSpecFromFile.getRelatedParty()));
//newServSpec.setResourceSpecification(new ArrayList<>(resourceSpecFromFile.getResourceSpecification()));
//newServSpec.setServiceLevelSpecification(new ArrayList<>(resourceSpecFromFile.getServiceLevelSpecification()));
//newServSpec.setServiceSpecCharacteristic(new ArrayList<>(resourceSpecFromFile.getServiceSpecCharacteristic()));
//newServSpec.setServiceSpecRelationship(new ArrayList<>(resourceSpecFromFile.getServiceSpecRelationship()));
newResourceSpec.setVersion(resourceSpecFromFile.getVersion());
newResourceSpec.setValidFor(new TimePeriod());
if (resourceSpecFromFile.getType() != null) {
newResourceSpec.setType( resourceSpecFromFile.getType() );
}
return newResourceSpec;
}
public static ResourceSpecificationUpdate updateResourceSpecDataFromFile(ResourceSpecification resourceSpecFromFile) {
ResourceSpecificationUpdate newResourceSpecToUpdate = new ResourceSpecificationUpdate();
if (resourceSpecFromFile.getName() != null) {
newResourceSpecToUpdate.setName(resourceSpecFromFile.getName());
}
if (resourceSpecFromFile.getDescription() != null) {
newResourceSpecToUpdate.setDescription(resourceSpecFromFile.getDescription());
}
if (resourceSpecFromFile.isIsBundle() != null) {
newResourceSpecToUpdate.setIsBundle(resourceSpecFromFile.isIsBundle());
}
if (resourceSpecFromFile.getVersion() != null) {
newResourceSpecToUpdate.setVersion(resourceSpecFromFile.getVersion());
}
if (resourceSpecFromFile.getResourceSpecCharacteristic() != null) {
System.out.println("ServiceSpecCharacteristic: " + resourceSpecFromFile.getResourceSpecCharacteristic());
newResourceSpecToUpdate.setResourceSpecificationCharacteristic(new ArrayList<>(resourceSpecFromFile.getResourceSpecCharacteristic()));
}
return newResourceSpecToUpdate;
}
}
\ No newline at end of file
src/main/java/org/etsi/osl/util/ServiceSpecificationPayloadsMaker.java 0 → 100644
+ 188
− 0
View file @ 6489d6ea
package org.etsi.osl.util;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.etsi.osl.tmf.common.model.Any;
import org.etsi.osl.tmf.common.model.ELifecycle;
import org.etsi.osl.tmf.common.model.EValueType;
import org.etsi.osl.tmf.common.model.TimePeriod;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCharacteristic;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCharacteristicValue;
import org.etsi.osl.tmf.scm633.model.*;
public class ServiceSpecificationPayloadsMaker {
public static ServiceSpecificationCreate createServiceSpecDataFromFile(ServiceSpecification serviceSpecFromFile) {
// Parse the JSON file into a ServSpecCr object
ServiceSpecificationCreate newServSpec = new ServiceSpecificationCreate();
newServSpec.setName(serviceSpecFromFile.getName());
newServSpec.setDescription(serviceSpecFromFile.getDescription());
//newServSpec.setAttachment(new ArrayList<>(servSpec.getAttachment()));
newServSpec.setIsBundle(serviceSpecFromFile.isIsBundle());
//newServSpec.setRelatedParty(new ArrayList<>(servSpec.getRelatedParty()));
//newServSpec.setResourceSpecification(new ArrayList<>(servSpec.getResourceSpecification()));
//newServSpec.setServiceLevelSpecification(new ArrayList<>(servSpec.getServiceLevelSpecification()));
//newServSpec.setServiceSpecCharacteristic(new ArrayList<>(servSpec.getServiceSpecCharacteristic()));
//newServSpec.setServiceSpecRelationship(new ArrayList<>(servSpec.getServiceSpecRelationship()));
newServSpec.setVersion(serviceSpecFromFile.getVersion());
newServSpec.setValidFor(new TimePeriod());
if (serviceSpecFromFile.getType() != null) {
newServSpec.setType( serviceSpecFromFile.getType() );
}
return newServSpec;
}
public static ServiceSpecificationUpdate updateServiceSpecDataFromFile(ServiceSpecification serviceSpecFromFile) {
ServiceSpecificationUpdate newServiceSpecToUpdate = new ServiceSpecificationUpdate();
if (serviceSpecFromFile.getName() != null) {
newServiceSpecToUpdate.setName(serviceSpecFromFile.getName());
}
if (serviceSpecFromFile.getDescription() != null) {
newServiceSpecToUpdate.setDescription(serviceSpecFromFile.getDescription());
}
if (serviceSpecFromFile.isIsBundle() != null) {
newServiceSpecToUpdate.setIsBundle(serviceSpecFromFile.isIsBundle());
}
if (serviceSpecFromFile.getVersion() != null) {
newServiceSpecToUpdate.setVersion(serviceSpecFromFile.getVersion());
}
if (serviceSpecFromFile.getServiceSpecCharacteristic() != null) {
System.out.println("ServiceSpecCharacteristic: " + serviceSpecFromFile.getServiceSpecCharacteristic());
newServiceSpecToUpdate.setServiceSpecCharacteristic(new ArrayList<>(serviceSpecFromFile.getServiceSpecCharacteristic()));
}
return newServiceSpecToUpdate;
}
public static ServiceSpecificationUpdate getServiceSpecificationRelationshipsDataFromFile(ServiceSpecification serviceSpecFromFile, ServiceSpecification serviceSpecToPatch) {
ServiceSpecificationUpdate newServiceSpecToUpdate = new ServiceSpecificationUpdate();
if (newServiceSpecToUpdate.getServiceSpecRelationship() != null) {
newServiceSpecToUpdate.setServiceSpecRelationship((List<ServiceSpecRelationship>) serviceSpecFromFile.getServiceSpecRelationship());
}
return newServiceSpecToUpdate;
}
public static ServiceSpecification updateServiceSpecDataFromAPIcall(ServiceSpecification serviceSpecFromFile, ServiceSpecificationUpdate newServiceSpecToUpdate) {
if (newServiceSpecToUpdate.getName() != null) {
serviceSpecFromFile.setName(newServiceSpecToUpdate.getName());
}
if (newServiceSpecToUpdate.getDescription() != null) {
serviceSpecFromFile.setDescription(newServiceSpecToUpdate.getDescription());
}
if (newServiceSpecToUpdate.isIsBundle() != null) {
serviceSpecFromFile.isBundle(newServiceSpecToUpdate.isIsBundle());
}
serviceSpecFromFile.setLastUpdate(OffsetDateTime.now(ZoneOffset.UTC));
if (newServiceSpecToUpdate.getLifecycleStatus() != null) {
serviceSpecFromFile.setLifecycleStatusEnum(ELifecycle.getEnum(newServiceSpecToUpdate.getLifecycleStatus()));
}
if (newServiceSpecToUpdate.getVersion() != null) {
serviceSpecFromFile.setVersion(newServiceSpecToUpdate.getVersion());
}
/**
* Update ServiceSpecCharacteristic list We need to compare by name, since IDs
* will not exist
*/
if (newServiceSpecToUpdate.getServiceSpecCharacteristic() != null) {
// reattach attachments fromDB
Map<String, Boolean> idAddedUpdated = new HashMap<>();
for (ServiceSpecCharacteristic charUpd : newServiceSpecToUpdate.getServiceSpecCharacteristic()) {
boolean nameExists = false;
for (ServiceSpecCharacteristic originalSpecChar : serviceSpecFromFile.getServiceSpecCharacteristic()) {
if (originalSpecChar.getName()!=null && charUpd.getName()!=null && originalSpecChar.getName().equals(charUpd.getName())) {
nameExists = true;
idAddedUpdated.put(originalSpecChar.getName(), true);
originalSpecChar.updateWith(charUpd);
break;
}
}
if (!nameExists) {
serviceSpecFromFile.getServiceSpecCharacteristic().add(new ServiceSpecCharacteristic(charUpd));
if ( charUpd.getName() == null ) {
charUpd.setName( UUID.randomUUID().toString() );
}
idAddedUpdated.put(charUpd.getName(), true);
}
}
List<ServiceSpecCharacteristic> toRemove = new ArrayList<>();
for (ServiceSpecCharacteristic ss : serviceSpecFromFile.getServiceSpecCharacteristic()) {
if (idAddedUpdated.get(ss.getName()) == null) {
toRemove.add(ss);
}
}
for (ServiceSpecCharacteristic serviceSpecCharacteristic : toRemove) {
serviceSpecFromFile.getServiceSpecCharacteristic().remove(serviceSpecCharacteristic);
}
}
return serviceSpecFromFile;
}
private static ServiceSpecCharacteristic copyResourceCharacteristic(ResourceSpecificationCharacteristic sourceChar) {
ServiceSpecCharacteristic serviceSpecCharacteristicItem = new ServiceSpecCharacteristic();
serviceSpecCharacteristicItem.setDescription( sourceChar.getDescription());
serviceSpecCharacteristicItem.valueType( sourceChar.getValueType() );
serviceSpecCharacteristicItem.configurable(sourceChar.isConfigurable());
serviceSpecCharacteristicItem.setMinCardinality( sourceChar.getMinCardinality() );
serviceSpecCharacteristicItem.setMaxCardinality( sourceChar.getMaxCardinality() );
serviceSpecCharacteristicItem.setValidFor( sourceChar.getValidFor() );
for (ResourceSpecificationCharacteristicValue cv : sourceChar.getResourceSpecCharacteristicValue()) {
ServiceSpecCharacteristicValue serviceSpecCharacteristicValueItem = new ServiceSpecCharacteristicValue();
serviceSpecCharacteristicValueItem.setValue( new Any( cv.getValue().getValue(), cv.getValue().getAlias()));
serviceSpecCharacteristicValueItem.isDefault( cv.isIsDefault() );
serviceSpecCharacteristicValueItem.setUnitOfMeasure( cv.getUnitOfMeasure() );
serviceSpecCharacteristicItem.addServiceSpecCharacteristicValueItem(serviceSpecCharacteristicValueItem );
}
return serviceSpecCharacteristicItem;
}
private static ServiceSpecCharacteristic addServiceSpecCharacteristic(ServiceSpecification serviceSpec, String aName, String description, Any any, EValueType eValueType) {
ServiceSpecCharacteristic serviceSpecCharacteristicItem = new ServiceSpecCharacteristic();
serviceSpecCharacteristicItem.setName( aName );
serviceSpecCharacteristicItem.setDescription(description);
serviceSpecCharacteristicItem.valueType( eValueType.getValue() );
serviceSpecCharacteristicItem.configurable(false);
serviceSpecCharacteristicItem.setMinCardinality(1);
serviceSpecCharacteristicItem.setMaxCardinality(1);
ServiceSpecCharacteristicValue serviceSpecCharacteristicValueItem = new ServiceSpecCharacteristicValue();
serviceSpecCharacteristicValueItem.setValue( new Any( any.getValue() , any.getAlias()));
serviceSpecCharacteristicValueItem.isDefault( true );
serviceSpecCharacteristicValueItem.setUnitOfMeasure("N/A");
serviceSpecCharacteristicItem.addServiceSpecCharacteristicValueItem(serviceSpecCharacteristicValueItem );
serviceSpec.addServiceSpecCharacteristicItem(serviceSpecCharacteristicItem );
return serviceSpecCharacteristicItem;
}
}
\ No newline at end of file
src/main/java/org/etsi/osl/util/ServiceSpecificationUploader.java 0 → 100644
+ 753
− 0
View file @ 6489d6ea
This diff is collapsed.
src/main/java/org/etsi/osl/util/mappings.yaml 0 → 100644
+ 7
− 0
View file @ 6489d6ea
mappings:
- from: "string1"
to: "replacement1"
- from: "string2"
to: "replacement2"
- from: "string3"
to: "replacement3"
src/main/java/org/etsi/osl/util/mappings2.yaml 0 → 100644
+ 4
− 0
View file @ 6489d6ea
mappings:
"string1": "replacement1"
"string2": "replacement2"
"string3": "replacement3"
src/main/resources/Dockerfile 0 → 100644
+ 17
− 0
View file @ 6489d6ea
# Select a base image with Java installed
FROM openjdk:17-slim
# Set the working directory
WORKDIR /app
# Copy the executable jar file of the application to the image
COPY servicespecificationuploader-0.0.1-SNAPSHOT.jar /app/servicespecificationuploader.jar
# Set the command that will run when the container starts
# Note: Pass the data folder path as an environment variable or argument during runtime.
# Example command to pass data folder as a runtime argument:
# docker run -v /local/path/to/config.properties:/app/config.properties -v /local/path/to/your-data-folder:/app/data-folder your-image /app/data-folder
# Updated CMD to accept runtime arguments for data folder
ENTRYPOINT ["sh", "-c", "java -jar /app/servicespecificationuploader.jar --configfile /app/config.properties --servicespecfolderpath $0"]
src/main/resources/config.properties 0 → 100644
+ 6
− 0
View file @ 6489d6ea
keycloak.url=http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/token
client.id=osapiWebClientId
client.secret=admin
username=admin
password=admin
targetApiEndpoint.url=http://localhost/tmf-api
src/main/resources/logback.xml 0 → 100644
+ 20
− 0
View file @ 6489d6ea
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>app.log</file>
<append>true</append>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</root>
</configuration>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment